From b3056cd0ab36ef6c27c39ff8f6b4166499fefad3 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 10:33:37 +0200 Subject: [PATCH 01/11] Add ABI/API package.json --- js/src/abi/package.json | 29 +++++++++++++++++++++++++++++ js/src/api/package.json | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 js/src/abi/package.json create mode 100644 js/src/api/package.json diff --git a/js/src/abi/package.json b/js/src/abi/package.json new file mode 100644 index 000000000..b09f52c03 --- /dev/null +++ b/js/src/abi/package.json @@ -0,0 +1,29 @@ +{ + "name": "@parity/abi", + "description": "The Parity ABI library", + "version": "0.0.0", + "main": "index.js", + "author": "Parity Team ", + "maintainers": [ + "Jaco Greeff" + ], + "contributors": [], + "license": "GPL-3.0", + "repository": { + "type": "git", + "url": "git+https://github.com/paritytech/parity.git" + }, + "keywords": [ + "Ethereum", + "ABI", + "Parity" + ], + "scripts": { + }, + "devDependencies": { + }, + "dependencies": { + "bignumber.js": "~2.3.0", + "js-sha3": "~0.5.2" + } +} diff --git a/js/src/api/package.json b/js/src/api/package.json new file mode 100644 index 000000000..acbd37001 --- /dev/null +++ b/js/src/api/package.json @@ -0,0 +1,34 @@ +{ + "name": "@parity/api", + "description": "The Parity Promise-based API library for interfacing with Ethereum over RPC", + "version": "0.0.0", + "main": "index.js", + "author": "Parity Team ", + "maintainers": [ + "Jaco Greeff" + ], + "contributors": [], + "license": "GPL-3.0", + "repository": { + "type": "git", + "url": "git+https://github.com/paritytech/parity.git" + }, + "keywords": [ + "Ethereum", + "API", + "RPC", + "Parity", + "Promise" + ], + "scripts": { + }, + "devDependencies": { + }, + "dependencies": { + "@parity/abi": "file:../abi", + "bignumber.js": "~2.3.0", + "eventemitter3": "2.0.2", + "js-sha3": "~0.5.2", + "node-fetch": "~1.6.3" + } +} From 4568300d9bda79692384ffd1706b0882f8e75d8a Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 10:34:00 +0200 Subject: [PATCH 02/11] Use @parity/abi --- js/src/api/contract/contract.js | 2 +- js/src/api/util/encode.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/api/contract/contract.js b/js/src/api/contract/contract.js index 2156b8af1..77c9568a9 100644 --- a/js/src/api/contract/contract.js +++ b/js/src/api/contract/contract.js @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import Abi from '~/abi'; +import Abi from '@parity/abi'; let nextSubscriptionId = 0; diff --git a/js/src/api/util/encode.js b/js/src/api/util/encode.js index f18fbbe2b..e936faa38 100644 --- a/js/src/api/util/encode.js +++ b/js/src/api/util/encode.js @@ -14,8 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import Abi from '~/abi'; -import Func from '~/abi/spec/function'; +import Abi from '@parity/abi'; +import Func from '@parity/abi/spec/function'; import { abiDecode } from './decode'; import { cleanupValue } from './format'; From 0d9e849162baae82b458e4d258e59229828b8278 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 10:34:23 +0200 Subject: [PATCH 03/11] Build with @parity/(abi|api) packages --- js/package.json | 2 ++ js/webpack/app.js | 8 +++++++- js/webpack/libraries.js | 8 +++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/js/package.json b/js/package.json index ac1731b91..64d2a24cf 100644 --- a/js/package.json +++ b/js/package.json @@ -158,6 +158,8 @@ "yargs": "6.6.0" }, "dependencies": { + "@parity/abi": "file:src/abi", + "@parity/api": "file:src/api", "@parity/wordlist": "1.0.1", "base32.js": "0.1.0", "bignumber.js": "3.0.1", diff --git a/js/webpack/app.js b/js/webpack/app.js index ded5c4468..6d61f7518 100644 --- a/js/webpack/app.js +++ b/js/webpack/app.js @@ -65,9 +65,15 @@ module.exports = { exclude: /(node_modules)/, use: [ 'happypack/loader?id=babel-js' ] }, + // duplicated for clarity since the number of @parity modules will increase { test: /\.js$/, - include: /node_modules\/(material-chip-input|ethereumjs-tx|@parity\/wordlist)/, + include: /node_modules\/@parity\/(abi|api|wordlist)/, + use: 'babel-loader' + }, + { + test: /\.js$/, + include: /node_modules\/(material-chip-input|ethereumjs-tx)/, use: 'babel-loader' }, { diff --git a/js/webpack/libraries.js b/js/webpack/libraries.js index 1fcb39eba..ff41132be 100644 --- a/js/webpack/libraries.js +++ b/js/webpack/libraries.js @@ -58,9 +58,15 @@ module.exports = { 'babel-loader?cacheDirectory=true' ] }, + // duplicated for clarity since the number of @parity modules will increase { test: /\.js$/, - include: /node_modules\/(ethereumjs-tx|@parity\/wordlist)/, + include: /node_modules\/@parity\/(abi|api|wordlist)/, + use: 'babel-loader' + }, + { + test: /\.js$/, + include: /node_modules\/ethereumjs-tx/, use: 'babel-loader' }, { From 94c8cceb42e20e5ab8a8173c7f37fc07f18f2bcf Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 10:41:06 +0200 Subject: [PATCH 04/11] Add @parity/jsonrpc --- js/package.json | 1 + js/src/api/api.spec.js | 4 ++-- js/src/api/package.json | 1 + js/src/jsonrpc/package.json | 27 +++++++++++++++++++++++++++ js/webpack/app.js | 2 +- js/webpack/libraries.js | 2 +- 6 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 js/src/jsonrpc/package.json diff --git a/js/package.json b/js/package.json index 64d2a24cf..924191ee3 100644 --- a/js/package.json +++ b/js/package.json @@ -160,6 +160,7 @@ "dependencies": { "@parity/abi": "file:src/abi", "@parity/api": "file:src/api", + "@parity/jsonrpc": "file:src/jsonrpc", "@parity/wordlist": "1.0.1", "base32.js": "0.1.0", "bignumber.js": "3.0.1", diff --git a/js/src/api/api.spec.js b/js/src/api/api.spec.js index 1c5ebf514..aa18333a0 100644 --- a/js/src/api/api.spec.js +++ b/js/src/api/api.spec.js @@ -14,13 +14,13 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . +import ethereumRpc from '@parity/jsonrpc'; + import { TEST_HTTP_URL, endpointTest } from '../../test/mockRpc'; import util from './util'; import Api from './api'; -import ethereumRpc from '../jsonrpc/'; - describe('api/Api', () => { describe('constructor', () => { it('requires defined/non-null transport object', () => { diff --git a/js/src/api/package.json b/js/src/api/package.json index acbd37001..f544ffe4f 100644 --- a/js/src/api/package.json +++ b/js/src/api/package.json @@ -26,6 +26,7 @@ }, "dependencies": { "@parity/abi": "file:../abi", + "@parity/jsonrpc": "file:../jsonrpc", "bignumber.js": "~2.3.0", "eventemitter3": "2.0.2", "js-sha3": "~0.5.2", diff --git a/js/src/jsonrpc/package.json b/js/src/jsonrpc/package.json new file mode 100644 index 000000000..d148126c0 --- /dev/null +++ b/js/src/jsonrpc/package.json @@ -0,0 +1,27 @@ +{ + "name": "@parity/jsonrpc", + "description": "JSON and JS interface defintions for RPC", + "version": "0.0.0", + "main": "index.js", + "author": "Parity Team ", + "maintainers": [ + "Jaco Greeff" + ], + "contributors": [], + "license": "GPL-3.0", + "repository": { + "type": "git", + "url": "git+https://github.com/paritytech/parity.git" + }, + "keywords": [ + "Ethereum", + "RPC", + "Parity" + ], + "scripts": { + }, + "devDependencies": { + }, + "dependencies": { + } +} diff --git a/js/webpack/app.js b/js/webpack/app.js index 6d61f7518..e849ad825 100644 --- a/js/webpack/app.js +++ b/js/webpack/app.js @@ -68,7 +68,7 @@ module.exports = { // duplicated for clarity since the number of @parity modules will increase { test: /\.js$/, - include: /node_modules\/@parity\/(abi|api|wordlist)/, + include: /node_modules\/@parity\/(abi|api|jsonrpc|wordlist)/, use: 'babel-loader' }, { diff --git a/js/webpack/libraries.js b/js/webpack/libraries.js index ff41132be..0c151b828 100644 --- a/js/webpack/libraries.js +++ b/js/webpack/libraries.js @@ -61,7 +61,7 @@ module.exports = { // duplicated for clarity since the number of @parity modules will increase { test: /\.js$/, - include: /node_modules\/@parity\/(abi|api|wordlist)/, + include: /node_modules\/@parity\/(abi|api|jsonrpc|wordlist)/, use: 'babel-loader' }, { From 8b144bedd1af0770221bcdaa41f66bdbc51f6484 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 11:17:58 +0200 Subject: [PATCH 05/11] Shared build rules --- js/webpack/app.js | 15 ++++----------- js/webpack/libraries.js | 15 ++++----------- js/webpack/npm.js | 10 +++++----- js/webpack/rules/es6.js | 21 +++++++++++++++++++++ js/webpack/rules/parity.js | 21 +++++++++++++++++++++ 5 files changed, 55 insertions(+), 27 deletions(-) create mode 100644 js/webpack/rules/es6.js create mode 100644 js/webpack/rules/parity.js diff --git a/js/webpack/app.js b/js/webpack/app.js index e849ad825..ba8e9a765 100644 --- a/js/webpack/app.js +++ b/js/webpack/app.js @@ -25,6 +25,8 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin'); const ServiceWorkerWebpackPlugin = require('serviceworker-webpack-plugin'); const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin'); +const rulesEs6 = require('./rules/es6'); +const rulesParity = require('./rules/parity'); const Shared = require('./shared'); const DAPPS = require('../src/views/Dapps/builtin.json'); @@ -60,22 +62,13 @@ module.exports = { module: { rules: [ + rulesParity, + rulesEs6, { test: /\.js$/, exclude: /(node_modules)/, use: [ 'happypack/loader?id=babel-js' ] }, - // duplicated for clarity since the number of @parity modules will increase - { - test: /\.js$/, - include: /node_modules\/@parity\/(abi|api|jsonrpc|wordlist)/, - use: 'babel-loader' - }, - { - test: /\.js$/, - include: /node_modules\/(material-chip-input|ethereumjs-tx)/, - use: 'babel-loader' - }, { test: /\.json$/, use: [ 'json-loader' ] diff --git a/js/webpack/libraries.js b/js/webpack/libraries.js index 0c151b828..d9ddaf53c 100644 --- a/js/webpack/libraries.js +++ b/js/webpack/libraries.js @@ -18,6 +18,8 @@ const path = require('path'); +const rulesEs6 = require('./rules/es6'); +const rulesParity = require('./rules/parity'); const Shared = require('./shared'); const DEST = process.env.BUILD_DEST || '.build'; @@ -49,6 +51,8 @@ module.exports = { module: { rules: [ + rulesParity, + rulesEs6, { test: /\.js$/, exclude: /node_modules/, @@ -58,17 +62,6 @@ module.exports = { 'babel-loader?cacheDirectory=true' ] }, - // duplicated for clarity since the number of @parity modules will increase - { - test: /\.js$/, - include: /node_modules\/@parity\/(abi|api|jsonrpc|wordlist)/, - use: 'babel-loader' - }, - { - test: /\.js$/, - include: /node_modules\/ethereumjs-tx/, - use: 'babel-loader' - }, { test: /\.json$/, use: [ 'json-loader' ] diff --git a/js/webpack/npm.js b/js/webpack/npm.js index 2230bf90f..94d8cdc1e 100644 --- a/js/webpack/npm.js +++ b/js/webpack/npm.js @@ -18,6 +18,8 @@ const path = require('path'); const CopyWebpackPlugin = require('copy-webpack-plugin'); const packageJson = require('../package.json'); +const rulesEs6 = require('./rules/es6'); +const rulesParity = require('./rules/parity'); const Shared = require('./shared'); const ENV = process.env.NODE_ENV || 'development'; @@ -26,6 +28,7 @@ const isProd = ENV === 'production'; const LIBRARY = process.env.LIBRARY; if (!LIBRARY) { + console.error('$LIBRARY environment variable not defined'); process.exit(-1); } @@ -57,6 +60,8 @@ module.exports = { /babel-polyfill/ ], rules: [ + rulesParity, + rulesEs6, { test: /(\.jsx|\.js)$/, // use: [ 'happypack/loader?id=js' ], @@ -65,11 +70,6 @@ module.exports = { 'babel-loader?cacheDirectory=true' ], exclude: /node_modules/ - }, - { - test: /\.js$/, - include: /node_modules\/(ethereumjs-tx|@parity\/wordlist)/, - use: 'babel-loader' } ] }, diff --git a/js/webpack/rules/es6.js b/js/webpack/rules/es6.js new file mode 100644 index 000000000..8e485424e --- /dev/null +++ b/js/webpack/rules/es6.js @@ -0,0 +1,21 @@ +// Copyright 2015-2017 Parity Technologies (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 . + +module.exports = { + test: /\.js$/, + include: /node_modules\/(material-chip-input|ethereumjs-tx)/, + use: 'babel-loader' +}; diff --git a/js/webpack/rules/parity.js b/js/webpack/rules/parity.js new file mode 100644 index 000000000..6897b218e --- /dev/null +++ b/js/webpack/rules/parity.js @@ -0,0 +1,21 @@ +// Copyright 2015-2017 Parity Technologies (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 . + +module.exports = { + test: /\.js$/, + include: /node_modules\/@parity\/(abi|api|jsonrpc|wordlist)/, + use: 'babel-loader' +}; From 8a46a4b5675a758a10034fac58f0d47e7d3926ef Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 11:24:49 +0200 Subject: [PATCH 06/11] Move API dependencies --- js/package.json | 4 +--- js/src/abi/package.json | 4 ++-- js/src/api/package.json | 9 ++++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/js/package.json b/js/package.json index 924191ee3..908a5fbd6 100644 --- a/js/package.json +++ b/js/package.json @@ -148,6 +148,7 @@ "stylelint": "7.9.0", "stylelint-config-standard": "16.0.0", "to-source": "2.0.3", + "uglify-js": "2.8.16", "url-loader": "0.5.7", "webpack": "2.2.1", "webpack-bundle-size-analyzer": "2.5.0", @@ -179,7 +180,6 @@ "geopattern": "1.2.3", "isomorphic-fetch": "2.2.1", "js-sha3": "0.5.5", - "keythereum": "0.4.6", "lodash": "4.17.2", "loglevel": "1.4.1", "marked": "0.3.6", @@ -217,13 +217,11 @@ "redux-thunk": "2.1.0", "rlp": "2.0.0", "scryptsy": "2.0.0", - "secp256k1": "3.2.5", "solc": "ngotchac/solc-js", "store": "1.3.20", "sw-toolbox": "^3.6.0", "u2f-api": "0.0.9", "u2f-api-polyfill": "0.4.3", - "uglify-js": "2.8.16", "useragent.js": "0.5.6", "utf8": "2.1.2", "valid-url": "1.0.9", diff --git a/js/src/abi/package.json b/js/src/abi/package.json index b09f52c03..7567370fe 100644 --- a/js/src/abi/package.json +++ b/js/src/abi/package.json @@ -23,7 +23,7 @@ "devDependencies": { }, "dependencies": { - "bignumber.js": "~2.3.0", - "js-sha3": "~0.5.2" + "bignumber.js": "3.0.1", + "js-sha3": "0.5.5" } } diff --git a/js/src/api/package.json b/js/src/api/package.json index f544ffe4f..bb0898704 100644 --- a/js/src/api/package.json +++ b/js/src/api/package.json @@ -27,9 +27,12 @@ "dependencies": { "@parity/abi": "file:../abi", "@parity/jsonrpc": "file:../jsonrpc", - "bignumber.js": "~2.3.0", + "bignumber.js": "3.0.1", + "ethereumjs-tx": "1.2.5", "eventemitter3": "2.0.2", - "js-sha3": "~0.5.2", - "node-fetch": "~1.6.3" + "js-sha3": "0.5.5", + "keythereum": "0.4.6", + "node-fetch": "1.6.3", + "secp256k1": "3.2.5" } } From bb628bca8830aa693eb033f53e7d4d545c54f81f Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 11:42:32 +0200 Subject: [PATCH 07/11] Add missing npm aliasses --- js/webpack/npm.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/webpack/npm.js b/js/webpack/npm.js index 94d8cdc1e..33951fee4 100644 --- a/js/webpack/npm.js +++ b/js/webpack/npm.js @@ -76,7 +76,9 @@ module.exports = { resolve: { alias: { - '~': path.resolve(__dirname, '../src') + '~': path.resolve(__dirname, '../src'), + 'secp256k1': path.resolve(__dirname, '../node_modules/secp256k1/js'), + 'keythereum': path.resolve(__dirname, '../node_modules/keythereum/dist/keythereum') }, modules: [ path.resolve('./src'), From 887b7b50909d2a4f77f4568d556b8ee942d234bd Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 11:48:42 +0200 Subject: [PATCH 08/11] Update maintainers --- js/src/abi/package.json | 3 ++- js/src/api/package.json | 3 ++- js/src/jsonrpc/package.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/js/src/abi/package.json b/js/src/abi/package.json index 7567370fe..946d15e57 100644 --- a/js/src/abi/package.json +++ b/js/src/abi/package.json @@ -5,7 +5,8 @@ "main": "index.js", "author": "Parity Team ", "maintainers": [ - "Jaco Greeff" + "Jaco Greeff", + "Nicolas Gotchac" ], "contributors": [], "license": "GPL-3.0", diff --git a/js/src/api/package.json b/js/src/api/package.json index bb0898704..91042501c 100644 --- a/js/src/api/package.json +++ b/js/src/api/package.json @@ -5,7 +5,8 @@ "main": "index.js", "author": "Parity Team ", "maintainers": [ - "Jaco Greeff" + "Jaco Greeff", + "Nicolas Gotchac" ], "contributors": [], "license": "GPL-3.0", diff --git a/js/src/jsonrpc/package.json b/js/src/jsonrpc/package.json index d148126c0..1bdc7596a 100644 --- a/js/src/jsonrpc/package.json +++ b/js/src/jsonrpc/package.json @@ -5,7 +5,8 @@ "main": "index.js", "author": "Parity Team ", "maintainers": [ - "Jaco Greeff" + "Jaco Greeff", + "Maciej Hirsz" ], "contributors": [], "license": "GPL-3.0", From 75d9fa3fe94ab044b799bc3ef7c6822d2913d9c4 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 11:56:13 +0200 Subject: [PATCH 09/11] mocha babel ignores (@parity modules) --- js/test/babel.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/js/test/babel.js b/js/test/babel.js index c9c1d9dae..95a988d42 100644 --- a/js/test/babel.js +++ b/js/test/babel.js @@ -14,4 +14,6 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -require('babel-register')(); +require('babel-register')({ + ignore: /node_modules\/(?!@parity\/(abi|api|jsonrpc))/ +}); From 11bcfa05e37ec237f57c13f6c48565fc22049b08 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 12:03:07 +0200 Subject: [PATCH 10/11] Update remaining ../abi to @parity/abi --- js/src/api/contract/contract.spec.js | 3 ++- js/src/api/format/output.js | 3 ++- js/src/api/util/decode.js | 4 ++-- js/src/api/util/index.js | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/js/src/api/contract/contract.spec.js b/js/src/api/contract/contract.spec.js index bd8b0fbda..53889e320 100644 --- a/js/src/api/contract/contract.spec.js +++ b/js/src/api/contract/contract.spec.js @@ -17,9 +17,10 @@ import BigNumber from 'bignumber.js'; import sinon from 'sinon'; +import Abi from '@parity/abi'; + import { TEST_HTTP_URL, mockHttp } from '../../../test/mockRpc'; -import Abi from '../../abi'; import { sha3 } from '../util/sha3'; import Api from '../api'; diff --git a/js/src/api/format/output.js b/js/src/api/format/output.js index df40b59a0..ddb8b79f8 100644 --- a/js/src/api/format/output.js +++ b/js/src/api/format/output.js @@ -16,7 +16,8 @@ import BigNumber from 'bignumber.js'; -import { toChecksumAddress } from '../../abi/util/address'; +import { toChecksumAddress } from '@parity/abi/util/address'; + import { isString } from '../util/types'; export function outAccountInfo (infos) { diff --git a/js/src/api/util/decode.js b/js/src/api/util/decode.js index 926a5a8a1..995118a72 100644 --- a/js/src/api/util/decode.js +++ b/js/src/api/util/decode.js @@ -16,8 +16,8 @@ import { isHex } from './types'; -import Func from '../../abi/spec/function'; -import { fromParamType, toParamType } from '../../abi/spec/paramType/format'; +import Func from '@parity/abi/spec/function'; +import { fromParamType, toParamType } from '@parity/abi/spec/paramType/format'; export function decodeCallData (data) { if (!isHex(data)) { diff --git a/js/src/api/util/index.js b/js/src/api/util/index.js index cc8fc9b93..d174c3431 100644 --- a/js/src/api/util/index.js +++ b/js/src/api/util/index.js @@ -14,7 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import { isAddress as isAddressValid, toChecksumAddress } from '../../abi/util/address'; +import { isAddress as isAddressValid, toChecksumAddress } from '@parity/abi/util/address'; + import { abiDecode, decodeCallData, decodeMethodInput, methodToAbi } from './decode'; import { abiEncode, abiUnencode, abiSignature, encodeMethodCallAbi } from './encode'; import { bytesToHex, hexToAscii, asciiToHex, cleanupValue } from './format'; From 89e5601ec034c7f8898112d3a87e80bb540dac26 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 20 Apr 2017 15:47:20 +0200 Subject: [PATCH 11/11] blockies dep -> api --- js/package.json | 1 - js/src/api/package.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/js/package.json b/js/package.json index 908a5fbd6..4424c9129 100644 --- a/js/package.json +++ b/js/package.json @@ -165,7 +165,6 @@ "@parity/wordlist": "1.0.1", "base32.js": "0.1.0", "bignumber.js": "3.0.1", - "blockies": "0.0.2", "brace": "0.9.0", "bytes": "2.4.0", "debounce": "1.0.0", diff --git a/js/src/api/package.json b/js/src/api/package.json index 91042501c..0856c9170 100644 --- a/js/src/api/package.json +++ b/js/src/api/package.json @@ -29,6 +29,7 @@ "@parity/abi": "file:../abi", "@parity/jsonrpc": "file:../jsonrpc", "bignumber.js": "3.0.1", + "blockies": "0.0.2", "ethereumjs-tx": "1.2.5", "eventemitter3": "2.0.2", "js-sha3": "0.5.5",