Initial new UI source code import (#2607)

* address -> name mappings * expanding, loading all coin details * send use only actual BasicCoin tokens registered (any reg) * sending token & accounts * form styling updates * send form layout in place * coin send working as expected * api subscriptions on multiple addresses * bring in events * simplify * basic events display in-place, functionally complete * basic functionality in-place * fix horrible event address issue * rwork display of events slightly * test TLA availability * table for owner -> tokens * fix signature lookup address * fix signature lookup address * basic overview styling * txhash links * page layout adjustments * background import * adjust colors * no global registration, simplify color selection * updated styling * connection dialog for "busy connecting" * initial token connection - WIP * init token updates take place * basic test for manual token * rework connection display * allow updates of the secure token * first stab at making the build build * update runner tags * fix linting issues * skip tests requiring network (should be e2e, TODO) * re-enable javascript tag/runner * release push does the trick * push to any branch, CI name * javscript-test runner as well * swap dependencies build requires test * revert stages swap * retrieve images associated with tokens * remove js build deps order * null image when hash = 0x0 * 6x64 images (hashes for registries) * don't pass tokens as prop to IdentityIcon * check images against content hash pictures * cleanup signer after connection changes * fix naming typo * display unknownImages for balances (not available as content hash) * unknownImage for transfer dialog * basic githubhint layout * single input for commit/filename * ethcore_hashContent call * lookup hash * registration in place * fixes * events is using a proper table * pass value through as-is * stop wrongly using main app IdentityIcon * NEVER export class instance functions * alignment back to normal * typo in definition * set & get images working (mostly) * show content retrieval info * set exitcode via || * use javascript:latest images * disable npm progress bar * rename phase I * rename phase II * only send build output to GitHub on major branches * also run the build step as part of the test (until comprehensive) * ci-specific build (no webpack progress) * allow for account creation via recovery phrase * display account uuid (where available), closes #2546 * connection dialog now shows up in dapps as well, closes #2538 * token images show up as expected * IdentityName component added and deployed * fix padding tests * adjust tests to map to stricter 0x-prefixed hex * render names via common component for the address -> name * split lint into seperate script (early exit) * test phases changed to lint, test & pack * pack part of test phase * remove files marked for deletion (cleanup) * Signer cleanups, start moving in the direction of the rest * add personal signer methods * basic signer request subscription * don't poll blockNumber when not connected * missing return, creating massive ws queue backlogs * ΞTH -> ETH * fix failing tests * registry uses setAddress to actually set addresses now * bytes mapping operates on lowerCase hex strings * sha3 ids for each application * add dappreg to list of contracts * adjust alignment of queries * show gas estimation log * abi with payable for register function * add key as required * image retrieval from dappreg * use proper Image urls * embed and link apps from Parity, retrieved via /api/apps * filter apps that has been replaced * proxy entry for parity-utils * add basiccoin abi * add support for fallback abi type * capture constructor paramaters * merge master into js * move images to assets/images/ * add font assets * import fonts as part of build * don't inline woff files * Revert "merge master into js" This reverts commit cfcfa81bd26f1b3cbc748d3afa1eb5c670b363fe. * remove unused npm packages * information on gas estimates (like almost everywhere else) * don't pass gas & gasPrice to estimation * display account passwordhint when available * signer subscriptions based on polling & function trapping * pending requests retrieved via jsapi * update signer middleware * remove all web3 instances * remove web3 package * last web3 dependencies removed * no need to toChecksumAddress - api takes care of it * expand description for personal_confirmRequest * Signer conversion from web3 -> parity.js completed * explicit in no return * green circle background * remove generated background * convert /api/* paths to localhost:8080/api/* paths (hard-coded, temporary) * change dapps to load from localhost:8080/ui/* * remove dangling web3 files * update manager test for signer * /api/ping -> / * additional token images * additional token images * add missing styles.css for 8180 error pages * cater for txhash returning null/empty object * adjust output directories * Release merge with origin with ours strategy * additional token images * cater for development server * s/localhost/127.0.0.1/ (cater for origin) * Fix address selection for contract deployment * Adjust z-index for error overlay * better text on unique background pattern * fix signer rejections * Don't allow gavcoin transfer with no balance * fix txhash rendering in signer * remove unnecessary ParityBackground * script to update js-precompiled * Redirect from :8080 to :8180 * Remove extra return * Dapp logo images
2016-10-18 11:52:56 +02:00
parent 6c7af57529
commit 1e6a2cb378
969 changed files with 57315 additions and 0 deletions
--- a/js/src/api/rpc/db/db.js
+++ b/js/src/api/rpc/db/db.js
@@ -0,0 +1,43 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { inHex } from '../../format/input';
+
+export default class Db {
+  constructor (transport) {
+    this._transport = transport;
+  }
+
+  getHex (dbName, keyName) {
+    return this._transport
+      .execute('db_getHex', dbName, keyName);
+  }
+
+  getString (dbName, keyName) {
+    return this._transport
+      .execute('db_getString', dbName, keyName);
+  }
+
+  putHex (dbName, keyName, hexData) {
+    return this._transport
+      .execute('db_putHex', dbName, keyName, inHex(hexData));
+  }
+
+  putString (dbName, keyName, stringData) {
+    return this._transport
+      .execute('db_putString', dbName, keyName, stringData);
+  }
+}
--- a/js/src/api/rpc/db/db.spec.js
+++ b/js/src/api/rpc/db/db.spec.js
@@ -0,0 +1,38 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
+
+import Http from '../../transport/http';
+import Db from './db';
+
+const instance = new Db(new Http(TEST_HTTP_URL));
+
+describe('api/rpc/Db', () => {
+  let scope;
+
+  describe('putHex', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'db_putHex', reply: { result: [] } }]);
+    });
+
+    it('formats the inputs correctly', () => {
+      return instance.putHex('db', 'key', '1234').then(() => {
+        expect(scope.body.db_putHex.params).to.deep.equal(['db', 'key', '0x1234']);
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/db/index.js
+++ b/js/src/api/rpc/db/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './db';
--- a/js/src/api/rpc/eth/eth.e2e.js
+++ b/js/src/api/rpc/eth/eth.e2e.js
@@ -0,0 +1,170 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { createHttpApi } from '../../../../test/e2e/ethapi';
+import { isAddress } from '../../../../test/types';
+
+describe('ethapi.eth', () => {
+  const ethapi = createHttpApi();
+  const address = '0x63cf90d3f0410092fc0fca41846f596223979195';
+
+  let latestBlockNumber;
+  let latestBlockHash;
+
+  describe('accounts', () => {
+    it('returns the available accounts', () => {
+      return ethapi.eth.accounts().then((accounts) => {
+        accounts.forEach((account) => {
+          expect(isAddress(account)).to.be.true;
+        });
+      });
+    });
+  });
+
+  describe('blockNumber', () => {
+    it('returns the current blockNumber', () => {
+      return ethapi.eth.blockNumber().then((blockNumber) => {
+        latestBlockNumber = blockNumber;
+        expect(blockNumber.gt(0xabcde)).to.be.true;
+      });
+    });
+  });
+
+  describe('coinbase', () => {
+    it('returns the coinbase', () => {
+      return ethapi.eth.coinbase().then((coinbase) => {
+        expect(isAddress(coinbase)).to.be.true;
+      });
+    });
+  });
+
+  describe('gasPrice', () => {
+    it('returns the current gasPrice', () => {
+      return ethapi.eth.gasPrice().then((gasPrice) => {
+        expect(gasPrice.gt(0)).to.be.true;
+      });
+    });
+  });
+
+  describe('getBalance', () => {
+    it('returns the balance for latest block', () => {
+      return ethapi.eth.getBalance(address).then((balance) => {
+        expect(balance.gt(0)).to.be.true;
+      });
+    });
+
+    it('returns the balance for a very early block', () => {
+      const atBlock = '0x65432';
+      const atValue = '18e07120a6e164fee1b';
+
+      return ethapi.eth
+        .getBalance(address, atBlock)
+        .then((balance) => {
+          expect(balance.toString(16)).to.equal(atValue);
+        })
+        .catch((error) => {
+          // Parity doesn't support pruned-before-block balance lookups
+          expect(error.message).to.match(/not supported/);
+        });
+    });
+
+    it('returns the balance for a recent/out-of-pruning-range block', () => {
+      return ethapi.eth
+        .getBalance(address, latestBlockNumber.minus(1000))
+        .then((balance) => {
+          expect(balance.gt(0)).to.be.true;
+        });
+    });
+  });
+
+  describe('getBlockByNumber', () => {
+    it('returns the latest block', () => {
+      return ethapi.eth.getBlockByNumber().then((block) => {
+        expect(block).to.be.ok;
+      });
+    });
+
+    it('returns a block by blockNumber', () => {
+      return ethapi.eth.getBlockByNumber(latestBlockNumber).then((block) => {
+        latestBlockHash = block.hash;
+        expect(block).to.be.ok;
+      });
+    });
+
+    it('returns a block by blockNumber (full)', () => {
+      return ethapi.eth.getBlockByNumber(latestBlockNumber, true).then((block) => {
+        expect(block).to.be.ok;
+      });
+    });
+  });
+
+  describe('getBlockByHash', () => {
+    it('returns the specified block', () => {
+      return ethapi.eth.getBlockByHash(latestBlockHash).then((block) => {
+        expect(block).to.be.ok;
+        expect(block.hash).to.equal(latestBlockHash);
+      });
+    });
+
+    it('returns the specified block (full)', () => {
+      return ethapi.eth.getBlockByHash(latestBlockHash, true).then((block) => {
+        expect(block).to.be.ok;
+        expect(block.hash).to.equal(latestBlockHash);
+      });
+    });
+  });
+
+  describe('getBlockTransactionCountByHash', () => {
+    it('returns the transactions of the specified hash', () => {
+      return ethapi.eth.getBlockTransactionCountByHash(latestBlockHash).then((count) => {
+        expect(count).to.be.ok;
+        expect(count.gte(0)).to.be.true;
+      });
+    });
+  });
+
+  describe('getBlockTransactionCountByNumber', () => {
+    it('returns the transactions of latest', () => {
+      return ethapi.eth.getBlockTransactionCountByNumber().then((count) => {
+        expect(count).to.be.ok;
+        expect(count.gte(0)).to.be.true;
+      });
+    });
+
+    it('returns the transactions of a specified number', () => {
+      return ethapi.eth.getBlockTransactionCountByNumber(latestBlockNumber).then((count) => {
+        expect(count).to.be.ok;
+        expect(count.gte(0)).to.be.true;
+      });
+    });
+  });
+
+  describe('getTransactionCount', () => {
+    it('returns the count for an address', () => {
+      return ethapi.eth.getTransactionCount(address).then((count) => {
+        expect(count).to.be.ok;
+        expect(count.gte(0x1000c2)).to.be.ok;
+      });
+    });
+
+    it('returns the count for an address at specified blockNumber', () => {
+      return ethapi.eth.getTransactionCount(address, latestBlockNumber).then((count) => {
+        expect(count).to.be.ok;
+        expect(count.gte(0x1000c2)).to.be.ok;
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/eth/eth.js
+++ b/js/src/api/rpc/eth/eth.js
@@ -0,0 +1,329 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { inAddress, inBlockNumber, inData, inFilter, inHex, inNumber16, inOptions } from '../../format/input';
+import { outAddress, outBlock, outLog, outNumber, outReceipt, outTransaction } from '../../format/output';
+
+export default class Eth {
+  constructor (transport) {
+    this._transport = transport;
+  }
+
+  accounts () {
+    return this._transport
+      .execute('eth_accounts')
+      .then((accounts) => (accounts || []).map(outAddress));
+  }
+
+  blockNumber () {
+    return this._transport
+      .execute('eth_blockNumber')
+      .then(outNumber);
+  }
+
+  call (options, blockNumber = 'latest') {
+    return this._transport
+      .execute('eth_call', inOptions(options), inBlockNumber(blockNumber));
+  }
+
+  checkRequest (requestId) {
+    return this._transport
+      .execute('eth_checkRequest', inNumber16(requestId));
+  }
+
+  coinbase () {
+    return this._transport
+      .execute('eth_coinbase')
+      .then(outAddress);
+  }
+
+  compileLLL (code) {
+    return this._transport
+      .execute('eth_compileLLL', inData(code));
+  }
+
+  compileSerpent (code) {
+    return this._transport
+      .execute('eth_compileSerpent', inData(code));
+  }
+
+  compileSolidity (code) {
+    return this._transport
+      .execute('eth_compileSolidity', inData(code));
+  }
+
+  estimateGas (options) {
+    return this._transport
+      .execute('eth_estimateGas', inOptions(options))
+      .then(outNumber);
+  }
+
+  fetchQueuedTransactions () {
+    return this._transport
+      .execute('eth_fetchQueuedTransactions');
+  }
+
+  flush () {
+    return this._transport
+      .execute('eth_flush');
+  }
+
+  gasPrice () {
+    return this._transport
+      .execute('eth_gasPrice')
+      .then(outNumber);
+  }
+
+  getBalance (address, blockNumber = 'latest') {
+    return this._transport
+      .execute('eth_getBalance', inAddress(address), inBlockNumber(blockNumber))
+      .then(outNumber);
+  }
+
+  getBlockByHash (hash, full = false) {
+    return this._transport
+      .execute('eth_getBlockByHash', inHex(hash), full)
+      .then(outBlock);
+  }
+
+  getBlockByNumber (blockNumber = 'latest', full = false) {
+    return this._transport
+      .execute('eth_getBlockByNumber', inBlockNumber(blockNumber), full)
+      .then(outBlock);
+  }
+
+  getBlockTransactionCountByHash (hash) {
+    return this._transport
+      .execute('eth_getBlockTransactionCountByHash', inHex(hash))
+      .then(outNumber);
+  }
+
+  getBlockTransactionCountByNumber (blockNumber = 'latest') {
+    return this._transport
+      .execute('eth_getBlockTransactionCountByNumber', inBlockNumber(blockNumber))
+      .then(outNumber);
+  }
+
+  getCode (address, blockNumber = 'latest') {
+    return this._transport
+      .execute('eth_getCode', inAddress(address), inBlockNumber(blockNumber));
+  }
+
+  getCompilers () {
+    return this._transport
+      .execute('eth_getCompilers');
+  }
+
+  getFilterChanges (filterId) {
+    return this._transport
+      .execute('eth_getFilterChanges', inNumber16(filterId))
+      .then((logs) => logs.map(outLog));
+  }
+
+  getFilterChangesEx (filterId) {
+    return this._transport
+      .execute('eth_getFilterChangesEx', inNumber16(filterId));
+  }
+
+  getFilterLogs (filterId) {
+    return this._transport
+      .execute('eth_getFilterLogs', inNumber16(filterId))
+      .then((logs) => logs.map(outLog));
+  }
+
+  getFilterLogsEx (filterId) {
+    return this._transport
+      .execute('eth_getFilterLogsEx', inNumber16(filterId));
+  }
+
+  getLogs (options) {
+    return this._transport
+      .execute('eth_getLogs', inFilter(options));
+  }
+
+  getLogsEx (options) {
+    return this._transport
+      .execute('eth_getLogsEx', inFilter(options));
+  }
+
+  getStorageAt (address, index = 0, blockNumber = 'latest') {
+    return this._transport
+      .execute('eth_getStorageAt', inAddress(address), inNumber16(index), inBlockNumber(blockNumber));
+  }
+
+  getTransactionByBlockHashAndIndex (hash, index = 0) {
+    return this._transport
+      .execute('eth_getTransactionByBlockHashAndIndex', inHex(hash), inNumber16(index))
+      .then(outTransaction);
+  }
+
+  getTransactionByBlockNumberAndIndex (blockNumber = 'latest', index = 0) {
+    return this._transport
+      .execute('eth_getTransactionByBlockNumberAndIndex', inBlockNumber(blockNumber), inNumber16(index))
+      .then(outTransaction);
+  }
+
+  getTransactionByHash (hash) {
+    return this._transport
+      .execute('eth_getTransactionByHash', inHex(hash))
+      .then(outTransaction);
+  }
+
+  getTransactionCount (address, blockNumber = 'latest') {
+    return this._transport
+      .execute('eth_getTransactionCount', inAddress(address), inBlockNumber(blockNumber))
+      .then(outNumber);
+  }
+
+  getTransactionReceipt (txhash) {
+    return this._transport
+      .execute('eth_getTransactionReceipt', inHex(txhash))
+      .then(outReceipt);
+  }
+
+  getUncleByBlockHashAndIndex (hash, index = 0) {
+    return this._transport
+      .execute('eth_getUncleByBlockHashAndIndex', inHex(hash), inNumber16(index));
+  }
+
+  getUncleByBlockNumberAndIndex (blockNumber = 'latest', index = 0) {
+    return this._transport
+      .execute('eth_getUncleByBlockNumberAndIndex', inBlockNumber(blockNumber), inNumber16(index));
+  }
+
+  getUncleCountByBlockHash (hash) {
+    return this._transport
+      .execute('eth_getUncleCountByBlockHash', inHex(hash))
+      .then(outNumber);
+  }
+
+  getUncleCountByBlockNumber (blockNumber = 'latest') {
+    return this._transport
+      .execute('eth_getUncleCountByBlockNumber', inBlockNumber(blockNumber))
+      .then(outNumber);
+  }
+
+  getWork () {
+    return this._transport
+      .execute('eth_getWork');
+  }
+
+  hashrate () {
+    return this._transport
+      .execute('eth_hashrate')
+      .then(outNumber);
+  }
+
+  inspectTransaction () {
+    return this._transport
+      .execute('eth_inspectTransaction');
+  }
+
+  mining () {
+    return this._transport
+      .execute('eth_mining');
+  }
+
+  newBlockFilter () {
+    return this._transport
+      .execute('eth_newBlockFilter');
+  }
+
+  newFilter (options) {
+    return this._transport
+      .execute('eth_newFilter', inFilter(options));
+  }
+
+  newFilterEx (options) {
+    return this._transport
+      .execute('eth_newFilterEx', inFilter(options));
+  }
+
+  newPendingTransactionFilter () {
+    return this._transport
+      .execute('eth_newPendingTransactionFilter');
+  }
+
+  notePassword () {
+    return this._transport
+      .execute('eth_notePassword');
+  }
+
+  pendingTransactions () {
+    return this._transport
+      .execute('eth_pendingTransactions');
+  }
+
+  postTransaction (options) {
+    return this._transport
+      .execute('eth_postTransaction', inOptions(options));
+  }
+
+  protocolVersion () {
+    return this._transport
+      .execute('eth_protocolVersion');
+  }
+
+  register () {
+    return this._transport
+      .execute('eth_register');
+  }
+
+  sendRawTransaction (data) {
+    return this._transport
+      .execute('eth_sendRawTransaction', inData(data));
+  }
+
+  sendTransaction (options) {
+    return this._transport
+      .execute('eth_sendTransaction', inOptions(options));
+  }
+
+  sign () {
+    return this._transport
+      .execute('eth_sign');
+  }
+
+  signTransaction () {
+    return this._transport
+      .execute('eth_signTransaction');
+  }
+
+  submitHashrate (hashrate, clientId) {
+    return this._transport
+      .execute('eth_submitHashrate', inNumber16(hashrate), clientId);
+  }
+
+  submitWork (nonce, powHash, mixDigest) {
+    return this._transport
+      .execute('eth_submitWork', inNumber16(nonce), powHash, mixDigest);
+  }
+
+  syncing () {
+    return this._transport
+      .execute('eth_syncing');
+  }
+
+  uninstallFilter (filterId) {
+    return this._transport
+      .execute('eth_uninstallFilter', inHex(filterId));
+  }
+
+  unregister () {
+    return this._transport
+      .execute('eth_unregister');
+  }
+}
--- a/js/src/api/rpc/eth/eth.spec.js
+++ b/js/src/api/rpc/eth/eth.spec.js
@@ -0,0 +1,474 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
+import { isBigNumber } from '../../../../test/types';
+
+import Http from '../../transport/http';
+import Eth from './eth';
+
+const instance = new Eth(new Http(TEST_HTTP_URL));
+
+describe('rpc/Eth', () => {
+  const address = '0x63Cf90D3f0410092FC0fca41846f596223979195';
+  let scope;
+
+  describe('accounts', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_accounts', reply: { result: [address.toLowerCase()] } }]);
+    });
+
+    it('returns a list of accounts, formatted', () => {
+      return instance.accounts().then((accounts) => {
+        expect(accounts).to.deep.equal([address]);
+      });
+    });
+  });
+
+  describe('blockNumber', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_blockNumber', reply: { result: '0x123456' } }]);
+    });
+
+    it('returns the current blockNumber, formatted', () => {
+      return instance.blockNumber().then((blockNumber) => {
+        expect(isBigNumber(blockNumber)).to.be.true;
+        expect(blockNumber.toString(16)).to.equal('123456');
+      });
+    });
+  });
+
+  describe('call', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_call', reply: { result: [] } }]);
+    });
+
+    it('formats the input options & blockNumber', () => {
+      return instance.call({ data: '12345678' }, 'earliest').then(() => {
+        expect(scope.body.eth_call.params).to.deep.equal([{ data: '0x12345678' }, 'earliest']);
+      });
+    });
+
+    it('provides a latest blockNumber when not specified', () => {
+      return instance.call({ data: '12345678' }).then(() => {
+        expect(scope.body.eth_call.params).to.deep.equal([{ data: '0x12345678' }, 'latest']);
+      });
+    });
+  });
+
+  describe('coinbase', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_coinbase', reply: { result: address.toLowerCase() } }]);
+    });
+
+    it('returns the coinbase, formatted', () => {
+      return instance.coinbase().then((account) => {
+        expect(account).to.deep.equal(address);
+      });
+    });
+  });
+
+  ['LLL', 'Serpent', 'Solidity'].forEach((type) => {
+    const method = `compile${type}`;
+
+    describe(method, () => {
+      beforeEach(() => {
+        scope = mockHttp([{ method: `eth_${method}`, reply: { result: '0x123' } }]);
+      });
+
+      it('formats the input as data, returns the output', () => {
+        return instance[method]('0xabcdef').then((result) => {
+          expect(scope.body[`eth_${method}`].params).to.deep.equal(['0xabcdef']);
+          expect(result).to.equal('0x123');
+        });
+      });
+    });
+  });
+
+  describe('estimateGas', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_estimateGas', reply: { result: '0x123' } }]);
+    });
+
+    it('converts the options correctly', () => {
+      return instance.estimateGas({ gas: 21000 }).then(() => {
+        expect(scope.body.eth_estimateGas.params).to.deep.equal([{ gas: '0x5208' }]);
+      });
+    });
+
+    it('returns the gas used', () => {
+      return instance.estimateGas({}).then((gas) => {
+        expect(isBigNumber(gas)).to.be.true;
+        expect(gas.toString(16)).to.deep.equal('123');
+      });
+    });
+  });
+
+  describe('gasPrice', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_gasPrice', reply: { result: '0x123' } }]);
+    });
+
+    it('returns the fomratted price', () => {
+      return instance.gasPrice().then((price) => {
+        expect(isBigNumber(price)).to.be.true;
+        expect(price.toString(16)).to.deep.equal('123');
+      });
+    });
+  });
+
+  describe('getBalance', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getBalance', reply: { result: '0x123' } }]);
+    });
+
+    it('passes in the address (default blockNumber)', () => {
+      return instance.getBalance(address).then(() => {
+        expect(scope.body.eth_getBalance.params).to.deep.equal([address.toLowerCase(), 'latest']);
+      });
+    });
+
+    it('passes in the address & blockNumber', () => {
+      return instance.getBalance(address, 0x456).then(() => {
+        expect(scope.body.eth_getBalance.params).to.deep.equal([address.toLowerCase(), '0x456']);
+      });
+    });
+
+    it('returns the balance', () => {
+      return instance.getBalance(address, 0x123).then((balance) => {
+        expect(isBigNumber(balance)).to.be.true;
+        expect(balance.toString(16)).to.deep.equal('123');
+      });
+    });
+  });
+
+  describe('getBlockByHash', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getBlockByHash', reply: { result: { miner: address.toLowerCase() } } }]);
+    });
+
+    it('formats the input hash as a hash, default full', () => {
+      return instance.getBlockByHash('1234').then(() => {
+        expect(scope.body.eth_getBlockByHash.params).to.deep.equal(['0x1234', false]);
+      });
+    });
+
+    it('formats the input hash as a hash, full true', () => {
+      return instance.getBlockByHash('1234', true).then(() => {
+        expect(scope.body.eth_getBlockByHash.params).to.deep.equal(['0x1234', true]);
+      });
+    });
+
+    it('formats the output into block', () => {
+      return instance.getBlockByHash('1234').then((block) => {
+        expect(block.miner).to.equal(address);
+      });
+    });
+  });
+
+  describe('getBlockByNumber', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getBlockByNumber', reply: { result: { miner: address.toLowerCase() } } }]);
+    });
+
+    it('assumes blockNumber latest & full false', () => {
+      return instance.getBlockByNumber().then(() => {
+        expect(scope.body.eth_getBlockByNumber.params).to.deep.equal(['latest', false]);
+      });
+    });
+
+    it('uses input blockNumber & full false', () => {
+      return instance.getBlockByNumber('0x1234').then(() => {
+        expect(scope.body.eth_getBlockByNumber.params).to.deep.equal(['0x1234', false]);
+      });
+    });
+
+    it('formats the input blockNumber, full true', () => {
+      return instance.getBlockByNumber(0x1234, true).then(() => {
+        expect(scope.body.eth_getBlockByNumber.params).to.deep.equal(['0x1234', true]);
+      });
+    });
+
+    it('formats the output into block', () => {
+      return instance.getBlockByNumber(0x1234).then((block) => {
+        expect(block.miner).to.equal(address);
+      });
+    });
+  });
+
+  describe('getBlockTransactionCountByHash', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getBlockTransactionCountByHash', reply: { result: '0x123' } }]);
+    });
+
+    it('formats input hash properly', () => {
+      return instance.getBlockTransactionCountByHash('abcdef').then(() => {
+        expect(scope.body.eth_getBlockTransactionCountByHash.params).to.deep.equal(['0xabcdef']);
+      });
+    });
+
+    it('formats the output number', () => {
+      return instance.getBlockTransactionCountByHash('0x1234').then((count) => {
+        expect(isBigNumber(count)).to.be.true;
+        expect(count.toString(16)).to.equal('123');
+      });
+    });
+  });
+
+  describe('getBlockTransactionCountByNumber', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getBlockTransactionCountByNumber', reply: { result: '0x123' } }]);
+    });
+
+    it('specified blockNumber latest when none specified', () => {
+      return instance.getBlockTransactionCountByNumber().then(() => {
+        expect(scope.body.eth_getBlockTransactionCountByNumber.params).to.deep.equal(['latest']);
+      });
+    });
+
+    it('formats input blockNumber properly', () => {
+      return instance.getBlockTransactionCountByNumber(0xabcdef).then(() => {
+        expect(scope.body.eth_getBlockTransactionCountByNumber.params).to.deep.equal(['0xabcdef']);
+      });
+    });
+
+    it('formats the output number', () => {
+      return instance.getBlockTransactionCountByNumber('0x1234').then((count) => {
+        expect(isBigNumber(count)).to.be.true;
+        expect(count.toString(16)).to.equal('123');
+      });
+    });
+  });
+
+  describe('getCode', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getCode', reply: { result: '0x1234567890' } }]);
+    });
+
+    it('passes in the address (default blockNumber)', () => {
+      return instance.getCode(address).then(() => {
+        expect(scope.body.eth_getCode.params).to.deep.equal([address.toLowerCase(), 'latest']);
+      });
+    });
+
+    it('passes in the address & blockNumber', () => {
+      return instance.getCode(address, 0x456).then(() => {
+        expect(scope.body.eth_getCode.params).to.deep.equal([address.toLowerCase(), '0x456']);
+      });
+    });
+
+    it('returns the code', () => {
+      return instance.getCode(address, 0x123).then((code) => {
+        expect(code).to.equal('0x1234567890');
+      });
+    });
+  });
+
+  describe('getStorageAt', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getStorageAt', reply: { result: '0x1234567890' } }]);
+    });
+
+    it('passes in the address (default index& blockNumber)', () => {
+      return instance.getStorageAt(address).then(() => {
+        expect(scope.body.eth_getStorageAt.params).to.deep.equal([address.toLowerCase(), '0x0', 'latest']);
+      });
+    });
+
+    it('passes in the address, index & blockNumber', () => {
+      return instance.getStorageAt(address, 15, 0x456).then(() => {
+        expect(scope.body.eth_getStorageAt.params).to.deep.equal([address.toLowerCase(), '0xf', '0x456']);
+      });
+    });
+
+    it('returns the storage', () => {
+      return instance.getStorageAt(address, 0x123).then((storage) => {
+        expect(storage).to.equal('0x1234567890');
+      });
+    });
+  });
+
+  describe('getTransactionByBlockHashAndIndex', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getTransactionByBlockHashAndIndex', reply: { result: { to: address.toLowerCase() } } }]);
+    });
+
+    it('passes in the hash (default index)', () => {
+      return instance.getTransactionByBlockHashAndIndex('12345').then(() => {
+        expect(scope.body.eth_getTransactionByBlockHashAndIndex.params).to.deep.equal(['0x12345', '0x0']);
+      });
+    });
+
+    it('passes in the hash & specified index', () => {
+      return instance.getTransactionByBlockHashAndIndex('6789', 0x456).then(() => {
+        expect(scope.body.eth_getTransactionByBlockHashAndIndex.params).to.deep.equal(['0x6789', '0x456']);
+      });
+    });
+
+    it('returns the formatted transaction', () => {
+      return instance.getTransactionByBlockHashAndIndex('6789', 0x123).then((tx) => {
+        expect(tx).to.deep.equal({ to: address });
+      });
+    });
+  });
+
+  describe('getTransactionByBlockNumberAndIndex', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getTransactionByBlockNumberAndIndex', reply: { result: { to: address.toLowerCase() } } }]);
+    });
+
+    it('passes in the default parameters', () => {
+      return instance.getTransactionByBlockNumberAndIndex().then(() => {
+        expect(scope.body.eth_getTransactionByBlockNumberAndIndex.params).to.deep.equal(['latest', '0x0']);
+      });
+    });
+
+    it('passes in the blockNumber & specified index', () => {
+      return instance.getTransactionByBlockNumberAndIndex('0x6789', 0x456).then(() => {
+        expect(scope.body.eth_getTransactionByBlockNumberAndIndex.params).to.deep.equal(['0x6789', '0x456']);
+      });
+    });
+
+    it('returns the formatted transaction', () => {
+      return instance.getTransactionByBlockNumberAndIndex('0x6789', 0x123).then((tx) => {
+        expect(tx).to.deep.equal({ to: address });
+      });
+    });
+  });
+
+  describe('getTransactionByHash', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getTransactionByHash', reply: { result: { to: address.toLowerCase() } } }]);
+    });
+
+    it('passes in the hash', () => {
+      return instance.getTransactionByHash('12345').then(() => {
+        expect(scope.body.eth_getTransactionByHash.params).to.deep.equal(['0x12345']);
+      });
+    });
+
+    it('returns the formatted transaction', () => {
+      return instance.getTransactionByHash('6789').then((tx) => {
+        expect(tx).to.deep.equal({ to: address });
+      });
+    });
+  });
+
+  describe('getTransactionCount', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getTransactionCount', reply: { result: '0x123' } }]);
+    });
+
+    it('passes in the address (default blockNumber)', () => {
+      return instance.getTransactionCount(address).then(() => {
+        expect(scope.body.eth_getTransactionCount.params).to.deep.equal([address.toLowerCase(), 'latest']);
+      });
+    });
+
+    it('passes in the address & blockNumber', () => {
+      return instance.getTransactionCount(address, 0x456).then(() => {
+        expect(scope.body.eth_getTransactionCount.params).to.deep.equal([address.toLowerCase(), '0x456']);
+      });
+    });
+
+    it('returns the count, formatted', () => {
+      return instance.getTransactionCount(address, 0x123).then((count) => {
+        expect(isBigNumber(count)).to.be.true;
+        expect(count.toString(16)).to.equal('123');
+      });
+    });
+  });
+
+  describe('getUncleByBlockHashAndIndex', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getUncleByBlockHashAndIndex', reply: { result: [] } }]);
+    });
+
+    it('passes in the hash (default index)', () => {
+      return instance.getUncleByBlockHashAndIndex('12345').then(() => {
+        expect(scope.body.eth_getUncleByBlockHashAndIndex.params).to.deep.equal(['0x12345', '0x0']);
+      });
+    });
+
+    it('passes in the hash & specified index', () => {
+      return instance.getUncleByBlockHashAndIndex('6789', 0x456).then(() => {
+        expect(scope.body.eth_getUncleByBlockHashAndIndex.params).to.deep.equal(['0x6789', '0x456']);
+      });
+    });
+  });
+
+  describe('getUncleByBlockNumberAndIndex', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getUncleByBlockNumberAndIndex', reply: { result: [] } }]);
+    });
+
+    it('passes in the default parameters', () => {
+      return instance.getUncleByBlockNumberAndIndex().then(() => {
+        expect(scope.body.eth_getUncleByBlockNumberAndIndex.params).to.deep.equal(['latest', '0x0']);
+      });
+    });
+
+    it('passes in the blockNumber & specified index', () => {
+      return instance.getUncleByBlockNumberAndIndex('0x6789', 0x456).then(() => {
+        expect(scope.body.eth_getUncleByBlockNumberAndIndex.params).to.deep.equal(['0x6789', '0x456']);
+      });
+    });
+  });
+
+  describe('getUncleCountByBlockHash', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getUncleCountByBlockHash', reply: { result: '0x123' } }]);
+    });
+
+    it('passes in the hash', () => {
+      return instance.getUncleCountByBlockHash('12345').then(() => {
+        expect(scope.body.eth_getUncleCountByBlockHash.params).to.deep.equal(['0x12345']);
+      });
+    });
+
+    it('formats the output number', () => {
+      return instance.getUncleCountByBlockHash('0x1234').then((count) => {
+        expect(isBigNumber(count)).to.be.true;
+        expect(count.toString(16)).to.equal('123');
+      });
+    });
+  });
+
+  describe('getUncleCountByBlockNumber', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'eth_getUncleCountByBlockNumber', reply: { result: '0x123' } }]);
+    });
+
+    it('passes in the default parameters', () => {
+      return instance.getUncleCountByBlockNumber().then(() => {
+        expect(scope.body.eth_getUncleCountByBlockNumber.params).to.deep.equal(['latest']);
+      });
+    });
+
+    it('passes in the blockNumber', () => {
+      return instance.getUncleCountByBlockNumber('0x6789').then(() => {
+        expect(scope.body.eth_getUncleCountByBlockNumber.params).to.deep.equal(['0x6789']);
+      });
+    });
+
+    it('formats the output number', () => {
+      return instance.getUncleCountByBlockNumber('0x1234').then((count) => {
+        expect(isBigNumber(count)).to.be.true;
+        expect(count.toString(16)).to.equal('123');
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/eth/index.js
+++ b/js/src/api/rpc/eth/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './eth';
--- a/js/src/api/rpc/ethcore/ethcore.e2e.js
+++ b/js/src/api/rpc/ethcore/ethcore.e2e.js
@@ -0,0 +1,61 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { createHttpApi } from '../../../../test/e2e/ethapi';
+
+describe('ethapi.ethcore', () => {
+  const ethapi = createHttpApi();
+
+  describe('gasFloorTarget', () => {
+    it('returns and translates the target', () => {
+      return ethapi.ethcore.gasFloorTarget().then((value) => {
+        expect(value.gt(0)).to.be.true;
+      });
+    });
+  });
+
+  describe('netChain', () => {
+    it('returns and the chain', () => {
+      return ethapi.ethcore.netChain().then((value) => {
+        expect(value).to.equal('morden');
+      });
+    });
+  });
+
+  describe('netPort', () => {
+    it('returns and translates the port', () => {
+      return ethapi.ethcore.netPort().then((value) => {
+        expect(value.gt(0)).to.be.true;
+      });
+    });
+  });
+
+  describe('transactionsLimit', () => {
+    it('returns and translates the limit', () => {
+      return ethapi.ethcore.transactionsLimit().then((value) => {
+        expect(value.gt(0)).to.be.true;
+      });
+    });
+  });
+
+  describe('rpcSettings', () => {
+    it('returns and translates the settings', () => {
+      return ethapi.ethcore.rpcSettings().then((value) => {
+        expect(value).to.be.ok;
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/ethcore/ethcore.js
+++ b/js/src/api/rpc/ethcore/ethcore.js
@@ -0,0 +1,168 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { inAddress, inData, inNumber16 } from '../../format/input';
+import { outAddress, outNumber, outPeers } from '../../format/output';
+
+export default class Ethcore {
+  constructor (transport) {
+    this._transport = transport;
+  }
+
+  acceptNonReservedPeers () {
+    return this._transport
+      .execute('ethcore_acceptNonReservedPeers');
+  }
+
+  addReservedPeer (encode) {
+    return this._transport
+      .execute('ethcore_addReservedPeer', encode);
+  }
+
+  defaultExtraData () {
+    return this._transport
+      .execute('ethcore_defaultExtraData');
+  }
+
+  devLogs () {
+    return this._transport
+      .execute('ethcore_devLogs');
+  }
+
+  devLogsLevels () {
+    return this._transport
+      .execute('ethcore_devLogsLevels');
+  }
+
+  dropNonReservedPeers () {
+    return this._transport
+      .execute('ethcore_dropNonReservedPeers');
+  }
+
+  extraData () {
+    return this._transport
+      .execute('ethcore_extraData');
+  }
+
+  gasFloorTarget () {
+    return this._transport
+      .execute('ethcore_gasFloorTarget')
+      .then(outNumber);
+  }
+
+  generateSecretPhrase () {
+    return this._transport
+      .execute('ethcore_generateSecretPhrase');
+  }
+
+  hashContent (url) {
+    return this._transport
+      .execute('ethcore_hashContent', url);
+  }
+
+  minGasPrice () {
+    return this._transport
+      .execute('ethcore_minGasPrice')
+      .then(outNumber);
+  }
+
+  netChain () {
+    return this._transport
+      .execute('ethcore_netChain');
+  }
+
+  netPeers () {
+    return this._transport
+      .execute('ethcore_netPeers')
+      .then(outPeers);
+  }
+
+  netMaxPeers () {
+    return this._transport
+      .execute('ethcore_netMaxPeers')
+      .then(outNumber);
+  }
+
+  netPort () {
+    return this._transport
+      .execute('ethcore_netPort')
+      .then(outNumber);
+  }
+
+  nodeName () {
+    return this._transport
+      .execute('ethcore_nodeName');
+  }
+
+  phraseToAddress (phrase) {
+    return this._transport
+      .execute('ethcore_phraseToAddress', phrase)
+      .then(outAddress);
+  }
+
+  registryAddress () {
+    return this._transport
+      .execute('ethcore_registryAddress')
+      .then(outAddress);
+  }
+
+  removeReservedPeer (encode) {
+    return this._transport
+      .execute('ethcore_removeReservedPeer', encode);
+  }
+
+  rpcSettings () {
+    return this._transport
+      .execute('ethcore_rpcSettings');
+  }
+
+  setAuthor (address) {
+    return this._transport
+      .execute('ethcore_setAuthor', inAddress(address));
+  }
+
+  setExtraData (data) {
+    return this._transport
+      .execute('ethcore_setExtraData', inData(data));
+  }
+
+  setGasFloorTarget (quantity) {
+    return this._transport
+      .execute('ethcore_setGasFloorTarget', inNumber16(quantity));
+  }
+
+  setMinGasPrice (quantity) {
+    return this._transport
+      .execute('ethcore_setMinGasPrice', inNumber16(quantity));
+  }
+
+  setTransactionsLimit (quantity) {
+    return this._transport
+      .execute('ethcore_setTransactionsLimit', inNumber16(quantity));
+  }
+
+  transactionsLimit () {
+    return this._transport
+      .execute('ethcore_transactionsLimit')
+      .then(outNumber);
+  }
+
+  unsignedTransactionsCount () {
+    return this._transport
+      .execute('ethcore_unsignedTransactionsCount')
+      .then(outNumber);
+  }
+}
--- a/js/src/api/rpc/ethcore/ethcore.spec.js
+++ b/js/src/api/rpc/ethcore/ethcore.spec.js
@@ -0,0 +1,92 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
+import { isBigNumber } from '../../../../test/types';
+
+import Http from '../../transport/http';
+import Ethcore from './ethcore';
+
+const instance = new Ethcore(new Http(TEST_HTTP_URL));
+
+describe('api/rpc/Ethcore', () => {
+  describe('gasFloorTarget', () => {
+    it('returns the gasfloor, formatted', () => {
+      mockHttp([{ method: 'ethcore_gasFloorTarget', reply: { result: '0x123456' } }]);
+
+      return instance.gasFloorTarget().then((count) => {
+        expect(isBigNumber(count)).to.be.true;
+        expect(count.eq(0x123456)).to.be.true;
+      });
+    });
+  });
+
+  describe('minGasPrice', () => {
+    it('returns the min gasprice, formatted', () => {
+      mockHttp([{ method: 'ethcore_minGasPrice', reply: { result: '0x123456' } }]);
+
+      return instance.minGasPrice().then((count) => {
+        expect(isBigNumber(count)).to.be.true;
+        expect(count.eq(0x123456)).to.be.true;
+      });
+    });
+  });
+
+  describe('netMaxPeers', () => {
+    it('returns the max peers, formatted', () => {
+      mockHttp([{ method: 'ethcore_netMaxPeers', reply: { result: 25 } }]);
+
+      return instance.netMaxPeers().then((count) => {
+        expect(isBigNumber(count)).to.be.true;
+        expect(count.eq(25)).to.be.true;
+      });
+    });
+  });
+
+  describe('newPeers', () => {
+    it('returns the peer structure, formatted', () => {
+      mockHttp([{ method: 'ethcore_netPeers', reply: { result: { active: 123, connected: 456, max: 789 } } }]);
+
+      return instance.netPeers().then((peers) => {
+        expect(peers.active.eq(123)).to.be.true;
+        expect(peers.connected.eq(456)).to.be.true;
+        expect(peers.max.eq(789)).to.be.true;
+      });
+    });
+  });
+
+  describe('netPort', () => {
+    it('returns the connected port, formatted', () => {
+      mockHttp([{ method: 'ethcore_netPort', reply: { result: 33030 } }]);
+
+      return instance.netPort().then((count) => {
+        expect(isBigNumber(count)).to.be.true;
+        expect(count.eq(33030)).to.be.true;
+      });
+    });
+  });
+
+  describe('transactionsLimit', () => {
+    it('returns the tx limit, formatted', () => {
+      mockHttp([{ method: 'ethcore_transactionsLimit', reply: { result: 1024 } }]);
+
+      return instance.transactionsLimit().then((count) => {
+        expect(isBigNumber(count)).to.be.true;
+        expect(count.eq(1024)).to.be.true;
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/ethcore/index.js
+++ b/js/src/api/rpc/ethcore/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './ethcore';
--- a/js/src/api/rpc/index.js
+++ b/js/src/api/rpc/index.js
@@ -0,0 +1,24 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export Db from './db';
+export Eth from './eth';
+export Ethcore from './ethcore';
+export Net from './net';
+export Personal from './personal';
+export Shh from './shh';
+export Trace from './trace';
+export Web3 from './web3';
--- a/js/src/api/rpc/net/index.js
+++ b/js/src/api/rpc/net/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './net';
--- a/js/src/api/rpc/net/net.e2e.js
+++ b/js/src/api/rpc/net/net.e2e.js
@@ -0,0 +1,46 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { createHttpApi } from '../../../../test/e2e/ethapi';
+import { isBoolean } from '../../../../test/types';
+
+describe('ethapi.net', () => {
+  const ethapi = createHttpApi();
+
+  describe('listening', () => {
+    it('returns the listening status', () => {
+      return ethapi.net.listening().then((status) => {
+        expect(isBoolean(status)).to.be.true;
+      });
+    });
+  });
+
+  describe('peerCount', () => {
+    it('returns the peer count', () => {
+      return ethapi.net.peerCount().then((count) => {
+        expect(count.gte(0)).to.be.true;
+      });
+    });
+  });
+
+  describe('version', () => {
+    it('returns the version', () => {
+      return ethapi.net.version().then((version) => {
+        expect(version).to.be.ok;
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/net/net.js
+++ b/js/src/api/rpc/net/net.js
@@ -0,0 +1,39 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { outNumber } from '../../format/output';
+
+export default class Net {
+  constructor (transport) {
+    this._transport = transport;
+  }
+
+  listening () {
+    return this._transport
+      .execute('net_listening');
+  }
+
+  peerCount () {
+    return this._transport
+      .execute('net_peerCount')
+      .then(outNumber);
+  }
+
+  version () {
+    return this._transport
+      .execute('net_version');
+  }
+}
--- a/js/src/api/rpc/net/net.spec.js
+++ b/js/src/api/rpc/net/net.spec.js
@@ -0,0 +1,36 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
+import { isBigNumber } from '../../../../test/types';
+
+import Http from '../../transport/http';
+import Net from './net';
+
+const instance = new Net(new Http(TEST_HTTP_URL));
+
+describe('api/rpc/Net', () => {
+  describe('peerCount', () => {
+    it('returns the connected peers, formatted', () => {
+      mockHttp([{ method: 'net_peerCount', reply: { result: '0x123456' } }]);
+
+      return instance.peerCount().then((count) => {
+        expect(isBigNumber(count)).to.be.true;
+        expect(count.eq(0x123456)).to.be.true;
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/personal/index.js
+++ b/js/src/api/rpc/personal/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './personal';
--- a/js/src/api/rpc/personal/personal.e2e.js
+++ b/js/src/api/rpc/personal/personal.e2e.js
@@ -0,0 +1,53 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { createHttpApi } from '../../../../test/e2e/ethapi';
+import { isAddress, isBoolean } from '../../../../test/types';
+
+describe.skip('ethapi.personal', () => {
+  const ethapi = createHttpApi();
+  const password = 'P@55word';
+  let address;
+
+  describe('newAccount', () => {
+    it('creates a new account', () => {
+      return ethapi.personal.newAccount(password).then((_address) => {
+        address = _address;
+        expect(isAddress(address)).to.be.ok;
+      });
+    });
+  });
+
+  describe('listAccounts', () => {
+    it('has the newly-created account', () => {
+      return ethapi.personal.listAccounts(password).then((accounts) => {
+        expect(accounts.filter((_address) => _address === address)).to.deep.equal([address]);
+        accounts.forEach((account) => {
+          expect(isAddress(account)).to.be.true;
+        });
+      });
+    });
+  });
+
+  describe('unlockAccount', () => {
+    it('unlocks the newly-created account', () => {
+      return ethapi.personal.unlockAccount(address, password).then((result) => {
+        expect(isBoolean(result)).to.be.true;
+        expect(result).to.be.true;
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/personal/personal.js
+++ b/js/src/api/rpc/personal/personal.js
@@ -0,0 +1,112 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { inAddress, inNumber10, inNumber16, inOptions } from '../../format/input';
+import { outAccountInfo, outAddress, outSignerRequest } from '../../format/output';
+
+export default class Personal {
+  constructor (transport) {
+    this._transport = transport;
+  }
+
+  accountsInfo () {
+    return this._transport
+      .execute('personal_accountsInfo')
+      .then(outAccountInfo);
+  }
+
+  confirmRequest (requestId, options, password) {
+    return this._transport
+      .execute('personal_confirmRequest', inNumber16(requestId), options, password);
+  }
+
+  generateAuthorizationToken () {
+    return this._transport
+      .execute('personal_generateAuthorizationToken');
+  }
+
+  listAccounts () {
+    return this._transport
+      .execute('personal_listAccounts')
+      .then((accounts) => (accounts || []).map(outAddress));
+  }
+
+  listGethAccounts () {
+    return this._transport
+      .execute('personal_listGethAccounts')
+      .then((accounts) => (accounts || []).map(outAddress));
+  }
+
+  importGethAccounts (accounts) {
+    return this._transport
+      .execute('personal_importGethAccounts', (accounts || []).map(inAddress))
+      .then((accounts) => (accounts || []).map(outAddress));
+  }
+
+  newAccount (password) {
+    return this._transport
+      .execute('personal_newAccount', password)
+      .then(outAddress);
+  }
+
+  newAccountFromPhrase (phrase, password) {
+    return this._transport
+      .execute('personal_newAccountFromPhrase', phrase, password)
+      .then(outAddress);
+  }
+
+  newAccountFromWallet (json, password) {
+    return this._transport
+      .execute('personal_newAccountFromWallet', json, password)
+      .then(outAddress);
+  }
+
+  rejectRequest (requestId) {
+    return this._transport
+      .execute('personal_rejectRequest', inNumber16(requestId));
+  }
+
+  requestsToConfirm () {
+    return this._transport
+      .execute('personal_requestsToConfirm')
+      .then((requests) => (requests || []).map(outSignerRequest));
+  }
+
+  setAccountName (address, name) {
+    return this._transport
+      .execute('personal_setAccountName', inAddress(address), name);
+  }
+
+  setAccountMeta (address, meta) {
+    return this._transport
+      .execute('personal_setAccountMeta', inAddress(address), JSON.stringify(meta));
+  }
+
+  signAndSendTransaction (options, password) {
+    return this._transport
+      .execute('personal_signAndSendTransaction', inOptions(options), password);
+  }
+
+  signerEnabled () {
+    return this._transport
+      .execute('personal_signerEnabled');
+  }
+
+  unlockAccount (account, password, duration = 1) {
+    return this._transport
+      .execute('personal_unlockAccount', inAddress(account), password, inNumber10(duration));
+  }
+}
--- a/js/src/api/rpc/personal/personal.spec.js
+++ b/js/src/api/rpc/personal/personal.spec.js
@@ -0,0 +1,97 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
+
+import Http from '../../transport/http';
+import Personal from './personal';
+
+const instance = new Personal(new Http(TEST_HTTP_URL));
+
+describe('rpc/Personal', () => {
+  const account = '0x63cf90d3f0410092fc0fca41846f596223979195';
+  const checksum = '0x63Cf90D3f0410092FC0fca41846f596223979195';
+  let scope;
+
+  describe('accountsInfo', () => {
+    it('retrieves the available account info', () => {
+      scope = mockHttp([{ method: 'personal_accountsInfo', reply: {
+        result: {
+          '0x63cf90d3f0410092fc0fca41846f596223979195': {
+            name: 'name', uuid: 'uuid', meta: '{"data":"data"}'
+          }
+        }
+      } }]);
+
+      return instance.accountsInfo().then((result) => {
+        expect(result).to.deep.equal({
+          '0x63Cf90D3f0410092FC0fca41846f596223979195': {
+            name: 'name', uuid: 'uuid', meta: {
+              data: 'data'
+            }
+          }
+        });
+      });
+    });
+  });
+
+  describe('listAccounts', () => {
+    it('retrieves a list of available accounts', () => {
+      scope = mockHttp([{ method: 'personal_listAccounts', reply: { result: [account] } }]);
+
+      return instance.listAccounts().then((result) => {
+        expect(result).to.deep.equal([checksum]);
+      });
+    });
+
+    it('returns an empty list when none available', () => {
+      scope = mockHttp([{ method: 'personal_listAccounts', reply: { result: null } }]);
+
+      return instance.listAccounts().then((result) => {
+        expect(result).to.deep.equal([]);
+      });
+    });
+  });
+
+  describe('newAccount', () => {
+    it('passes the password, returning the address', () => {
+      scope = mockHttp([{ method: 'personal_newAccount', reply: { result: account } }]);
+
+      return instance.newAccount('password').then((result) => {
+        expect(scope.body.personal_newAccount.params).to.deep.equal(['password']);
+        expect(result).to.equal(checksum);
+      });
+    });
+  });
+
+  describe('unlockAccount', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'personal_unlockAccount', reply: { result: [] } }]);
+    });
+
+    it('passes account, password & duration', () => {
+      return instance.unlockAccount(account, 'password', 0xf).then(() => {
+        expect(scope.body.personal_unlockAccount.params).to.deep.equal([account, 'password', 15]);
+      });
+    });
+
+    it('provides a default duration when not specified', () => {
+      return instance.unlockAccount(account, 'password').then(() => {
+        expect(scope.body.personal_unlockAccount.params).to.deep.equal([account, 'password', 1]);
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/shh/index.js
+++ b/js/src/api/rpc/shh/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './shh';
--- a/js/src/api/rpc/shh/shh.js
+++ b/js/src/api/rpc/shh/shh.js
@@ -0,0 +1,71 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default class Personal {
+  constructor (transport) {
+    this._transport = transport;
+  }
+
+  addToGroup (identity) {
+    return this._transport
+      .execute('shh_addToGroup', identity);
+  }
+
+  getFilterChanges (filterId) {
+    return this._transport
+      .execute('shh_getFilterChanges', filterId);
+  }
+
+  getMessages (filterId) {
+    return this._transport
+      .execute('shh_getMessages', filterId);
+  }
+
+  hasIdentity (identity) {
+    return this._transport
+      .execute('shh_hasIdentity', identity);
+  }
+
+  newFilter (options) {
+    return this._transport
+      .execute('shh_newFilter', options);
+  }
+
+  newGroup () {
+    return this._transport
+      .execute('shh_newGroup');
+  }
+
+  newIdentity () {
+    return this._transport
+      .execute('shh_newIdentity');
+  }
+
+  post (options) {
+    return this._transport
+      .execute('shh_post', options);
+  }
+
+  uninstallFilter (filterId) {
+    return this._transport
+      .execute('shh_uninstallFilter', filterId);
+  }
+
+  version () {
+    return this._transport
+      .execute('shh_version');
+  }
+}
--- a/js/src/api/rpc/trace/index.js
+++ b/js/src/api/rpc/trace/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './trace';
--- a/js/src/api/rpc/trace/trace.e2e.js
+++ b/js/src/api/rpc/trace/trace.e2e.js
@@ -0,0 +1,35 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { createHttpApi } from '../../../../test/e2e/ethapi';
+
+describe('ethapi.trace', () => {
+  const ethapi = createHttpApi();
+
+  describe('block', () => {
+    it('returns the latest block', () => {
+      return ethapi.trace.block().then((block) => {
+        expect(block).to.be.ok;
+      });
+    });
+
+    it('returns a specified block', () => {
+      return ethapi.trace.block('0x65432').then((block) => {
+        expect(block).to.be.ok;
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/trace/trace.js
+++ b/js/src/api/rpc/trace/trace.js
@@ -0,0 +1,43 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { inBlockNumber, inHex, inNumber16 } from '../../format/input';
+
+export default class Trace {
+  constructor (transport) {
+    this._transport = transport;
+  }
+
+  filter (filterObj) {
+    return this._transport
+      .execute('trace_filter', filterObj);
+  }
+
+  get (txHash, position) {
+    return this._transport
+      .execute('trace_get', inHex(txHash), inNumber16(position));
+  }
+
+  transaction (txHash) {
+    return this._transport
+      .execute('trace_transaction', inHex(txHash));
+  }
+
+  block (blockNumber = 'latest') {
+    return this._transport
+      .execute('trace_block', inBlockNumber(blockNumber));
+  }
+}
--- a/js/src/api/rpc/trace/trace.spec.js
+++ b/js/src/api/rpc/trace/trace.spec.js
@@ -0,0 +1,44 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
+
+import Http from '../../transport/http';
+import Trace from './trace';
+
+const instance = new Trace(new Http(TEST_HTTP_URL));
+
+describe('api/rpc/Trace', () => {
+  let scope;
+
+  describe('block', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'trace_block', reply: { result: [] } }]);
+    });
+
+    it('assumes latest blockNumber when not specified', () => {
+      return instance.block().then(() => {
+        expect(scope.body.trace_block.params).to.deep.equal(['latest']);
+      });
+    });
+
+    it('passed specified blockNumber', () => {
+      return instance.block(0x123).then(() => {
+        expect(scope.body.trace_block.params).to.deep.equal(['0x123']);
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/web3/index.js
+++ b/js/src/api/rpc/web3/index.js
@@ -0,0 +1,17 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+export default from './web3';
--- a/js/src/api/rpc/web3/web3.e2e.js
+++ b/js/src/api/rpc/web3/web3.e2e.js
@@ -0,0 +1,44 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { createHttpApi } from '../../../../test/e2e/ethapi';
+import { isHexNumber } from '../../../../test/types';
+
+describe('ethapi.web3', () => {
+  const ethapi = createHttpApi();
+
+  describe('clientVersion', () => {
+    it('returns the client version', () => {
+      return ethapi.web3.clientVersion().then((version) => {
+        const [client] = version.split('/');
+
+        expect(client === 'Parity' || client === 'Geth').to.be.ok;
+      });
+    });
+  });
+
+  describe('sha3', () => {
+    it('returns a keccak256 sha', () => {
+      const sha = '0xa7916fac4f538170f7cd12c148552e2cba9fcd72329a2dd5b07a6fa906488ddf';
+      const hexStr = 'baz()'.split('').map((char) => char.charCodeAt(0).toString(16)).join('');
+
+      return ethapi.web3.sha3(`0x${hexStr}`).then((hash) => {
+        expect(isHexNumber(hash)).to.be.true;
+        expect(hash).to.equal(sha);
+      });
+    });
+  });
+});
--- a/js/src/api/rpc/web3/web3.js
+++ b/js/src/api/rpc/web3/web3.js
@@ -0,0 +1,33 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { inHex } from '../../format/input';
+
+export default class Web3 {
+  constructor (transport) {
+    this._transport = transport;
+  }
+
+  clientVersion () {
+    return this._transport
+      .execute('web3_clientVersion');
+  }
+
+  sha3 (hexStr) {
+    return this._transport
+      .execute('web3_sha3', inHex(hexStr));
+  }
+}
--- a/js/src/api/rpc/web3/web3.spec.js
+++ b/js/src/api/rpc/web3/web3.spec.js
@@ -0,0 +1,38 @@
+// Copyright 2015, 2016 Ethcore (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
+
+import Http from '../../transport/http';
+import Web3 from './web3';
+
+const instance = new Web3(new Http(TEST_HTTP_URL));
+
+describe('api/rpc/Web3', () => {
+  let scope;
+
+  describe('sha3', () => {
+    beforeEach(() => {
+      scope = mockHttp([{ method: 'web3_sha3', reply: { result: [] } }]);
+    });
+
+    it('formats the inputs correctly', () => {
+      return instance.sha3('1234').then(() => {
+        expect(scope.body.web3_sha3.params).to.deep.equal(['0x1234']);
+      });
+    });
+  });
+});