aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-03-28 02:16:13 +0800
committerFabio Berger <me@fabioberger.com>2018-03-28 02:16:13 +0800
commit005376276098a4e6cb832eaf5b5dbc07118e1f50 (patch)
tree543a431a5fd2a17f3b3582cfb0910f8c85357ac1 /packages/0x.js
parenteb89ef79eba3d044e10b8e52e20927bb88241ac2 (diff)
parent066d13f5b7260d28b13195c4f9aed48b4ae96cc3 (diff)
downloaddexon-sol-tools-005376276098a4e6cb832eaf5b5dbc07118e1f50.tar
dexon-sol-tools-005376276098a4e6cb832eaf5b5dbc07118e1f50.tar.gz
dexon-sol-tools-005376276098a4e6cb832eaf5b5dbc07118e1f50.tar.bz2
dexon-sol-tools-005376276098a4e6cb832eaf5b5dbc07118e1f50.tar.lz
dexon-sol-tools-005376276098a4e6cb832eaf5b5dbc07118e1f50.tar.xz
dexon-sol-tools-005376276098a4e6cb832eaf5b5dbc07118e1f50.tar.zst
dexon-sol-tools-005376276098a4e6cb832eaf5b5dbc07118e1f50.zip
merge developmentx
Diffstat (limited to 'packages/0x.js')
-rw-r--r--packages/0x.js/README.md9
-rw-r--r--packages/0x.js/package.json7
-rw-r--r--packages/0x.js/test/0x.js_test.ts2
-rw-r--r--packages/0x.js/tsconfig.json6
4 files changed, 8 insertions, 16 deletions
diff --git a/packages/0x.js/README.md b/packages/0x.js/README.md
index 2d0394726..5b17dac8b 100644
--- a/packages/0x.js/README.md
+++ b/packages/0x.js/README.md
@@ -20,11 +20,10 @@ import { ZeroEx } from '0x.js';
If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
-```
-"include": [
- "./node_modules/web3-typescript-typings/index.d.ts",
- "./node_modules/ethers-typescript-typings/index.d.ts"
-]
+```json
+"compilerOptions": {
+ "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+}
```
#### UMD:
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 5f5b32aac..49d96235c 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -68,9 +68,7 @@
"awesome-typescript-loader": "^3.1.3",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
- "chai-as-promised-typescript-typings": "^0.0.12",
"chai-bignumber": "^2.0.1",
- "chai-typescript-typings": "^0.0.6",
"copyfiles": "^1.2.0",
"dirty-chai": "^2.0.1",
"json-loader": "^0.5.4",
@@ -99,18 +97,17 @@
"@0xproject/types": "^0.4.1",
"@0xproject/utils": "^0.4.3",
"@0xproject/web3-wrapper": "^0.3.1",
+ "@0xproject/typescript-typings": "^0.0.1",
"bintrees": "^1.0.2",
"bn.js": "^4.11.8",
"ethereumjs-abi": "^0.6.4",
"ethereumjs-blockstream": "^2.0.6",
"ethereumjs-util": "^5.1.1",
"ethers-contracts": "^2.2.1",
- "ethers-typescript-typings": "^0.0.4",
"js-sha3": "^0.7.0",
"lodash": "^4.17.4",
"uuid": "^3.1.0",
- "web3": "^0.20.0",
- "web3-typescript-typings": "^0.10.2"
+ "web3": "^0.20.0"
},
"publishConfig": {
"access": "public"
diff --git a/packages/0x.js/test/0x.js_test.ts b/packages/0x.js/test/0x.js_test.ts
index d61847d1d..8ba2e53f7 100644
--- a/packages/0x.js/test/0x.js_test.ts
+++ b/packages/0x.js/test/0x.js_test.ts
@@ -216,7 +216,7 @@ describe('ZeroEx library', () => {
s: '0x050aa3cc1f2c435e67e114cdce54b9527b4f50548342401bc5d2b77adbdacb02',
};
stubs = [
- Sinon.stub((zeroEx as any)._web3Wrapper, 'signTransactionAsync').returns(Promise.resolve(signature)),
+ Sinon.stub((zeroEx as any)._web3Wrapper, 'signMessageAsync').returns(Promise.resolve(signature)),
Sinon.stub(ZeroEx, 'isValidSignature').returns(true),
];
diff --git a/packages/0x.js/tsconfig.json b/packages/0x.js/tsconfig.json
index a6b5c71c2..ddf5a910e 100644
--- a/packages/0x.js/tsconfig.json
+++ b/packages/0x.js/tsconfig.json
@@ -8,10 +8,6 @@
"./src/**/*",
"./test/**/*",
"../../node_modules/types-bn/index.d.ts",
- "../../node_modules/types-ethereumjs-util/index.d.ts",
- "../../node_modules/ethers-typescript-typings/index.d.ts",
- "../../node_modules/web3-typescript-typings/index.d.ts",
- "../../node_modules/chai-typescript-typings/index.d.ts",
- "../../node_modules/chai-as-promised-typescript-typings/index.d.ts"
+ "../../node_modules/types-ethereumjs-util/index.d.ts"
]
}