diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-11-15 01:25:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 01:25:44 +0800 |
| commit | 05de07496fe3f9089b4c96b0594b234afc436304 (patch) | |
| tree | 9baaf5ffa81aa05cdfb08dd888899b931a716896 /packages/0x.js | |
| parent | 247b4686fad239a461ade557e511a41091364e44 (diff) | |
| parent | ab9dc66b8fd072aa4b8555126d0727af47dda059 (diff) | |
| download | dexon-sol-tools-05de07496fe3f9089b4c96b0594b234afc436304.tar dexon-sol-tools-05de07496fe3f9089b4c96b0594b234afc436304.tar.gz dexon-sol-tools-05de07496fe3f9089b4c96b0594b234afc436304.tar.bz2 dexon-sol-tools-05de07496fe3f9089b4c96b0594b234afc436304.tar.lz dexon-sol-tools-05de07496fe3f9089b4c96b0594b234afc436304.tar.xz dexon-sol-tools-05de07496fe3f9089b4c96b0594b234afc436304.tar.zst dexon-sol-tools-05de07496fe3f9089b4c96b0594b234afc436304.zip | |
Merge pull request #220 from 0xProject/feature/addTsLintPackage
Add TSLint Config package
Diffstat (limited to 'packages/0x.js')
| -rw-r--r-- | packages/0x.js/package.json | 9 | ||||
| -rw-r--r-- | packages/0x.js/src/utils/abi_decoder.ts | 2 | ||||
| -rw-r--r-- | packages/0x.js/tslint.json | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 15dc05ed1..112164fe7 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -76,20 +76,20 @@ "sinon": "^4.0.0", "source-map-support": "^0.5.0", "truffle-hdwallet-provider": "^0.0.3", - "tslint": "~5.5.0", - "tslint-config-0xproject": "^0.0.2", "typedoc": "~0.8.0", "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "~2.6.1", "web3-provider-engine": "^13.0.1", "web3-typescript-typings": "^0.7.1", - "webpack": "^3.1.0" + "webpack": "^3.1.0", + "@0xproject/tslint-config": "0.0.2" }, "dependencies": { - "@0xproject/assert": "0.0.3", "0x-json-schemas": "^0.6.1", + "@0xproject/assert": "0.0.3", "bignumber.js": "~4.1.0", + "bn.js": "4.11.8", "compare-versions": "^3.0.1", "es6-promisify": "^5.0.0", "ethereumjs-abi": "^0.6.4", @@ -99,6 +99,7 @@ "js-sha3": "^0.6.1", "lodash": "^4.17.4", "publish-release": "^1.3.3", + "tslint": "5.8.0", "uuid": "^3.1.0", "web3": "^0.20.0" } diff --git a/packages/0x.js/src/utils/abi_decoder.ts b/packages/0x.js/src/utils/abi_decoder.ts index 840ad9be0..df0fb2d6f 100644 --- a/packages/0x.js/src/utils/abi_decoder.ts +++ b/packages/0x.js/src/utils/abi_decoder.ts @@ -34,7 +34,7 @@ export class AbiDecoder { value = this.padZeros(new BigNumber(value).toString(16)); } else if (param.type === SolidityTypes.Uint256 || param.type === SolidityTypes.Uint8 || - param.type === SolidityTypes.Uint ) { + param.type === SolidityTypes.Uint) { value = new BigNumber(value); } decodedParams[param.name] = value; diff --git a/packages/0x.js/tslint.json b/packages/0x.js/tslint.json index 5842a872a..a07795151 100644 --- a/packages/0x.js/tslint.json +++ b/packages/0x.js/tslint.json @@ -1,5 +1,5 @@ { "extends": [ - "tslint-config-0xproject" + "@0xproject/tslint-config" ] } |