aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-10-16 23:58:24 +0800
committerFabio Berger <me@fabioberger.com>2018-10-16 23:58:24 +0800
commitc333d093b585fa0250a6973f2d396eb3cf227334 (patch)
treea00b3d77fb78c744ee0fee2b57ef25ce775b087d /packages/0x.js
parent1cfcc82ea9869e14c1a1b78e1376c89fdbeb91f4 (diff)
parent72f5719b3412da7840a7b85e4dce512ecbaece4d (diff)
downloaddexon-sol-tools-c333d093b585fa0250a6973f2d396eb3cf227334.tar
dexon-sol-tools-c333d093b585fa0250a6973f2d396eb3cf227334.tar.gz
dexon-sol-tools-c333d093b585fa0250a6973f2d396eb3cf227334.tar.bz2
dexon-sol-tools-c333d093b585fa0250a6973f2d396eb3cf227334.tar.lz
dexon-sol-tools-c333d093b585fa0250a6973f2d396eb3cf227334.tar.xz
dexon-sol-tools-c333d093b585fa0250a6973f2d396eb3cf227334.tar.zst
dexon-sol-tools-c333d093b585fa0250a6973f2d396eb3cf227334.zip
merge development
Diffstat (limited to 'packages/0x.js')
-rw-r--r--packages/0x.js/CHANGELOG.json9
-rw-r--r--packages/0x.js/package.json4
-rw-r--r--packages/0x.js/src/globals.d.ts6
-rw-r--r--packages/0x.js/src/index.ts24
-rw-r--r--packages/0x.js/typedoc-tsconfig.json2
5 files changed, 28 insertions, 17 deletions
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 6dfcc3d33..4efd8f035 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -15,6 +15,15 @@
"note":
"Removed `SignerType` (including `SignerType.Metamask`). Please use the `MetamaskSubprovider` to wrap `web3.currentProvider`.",
"pr": 1102
+ },
+ {
+ "note":
+ "Updated to use new modularized artifacts and the latest version of @0xproject/contract-wrappers",
+ "pr": 1105
+ },
+ {
+ "note": "Make web3-provider-engine types a 'dependency' so it's available to users of the library",
+ "pr": 1105
}
]
},
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 1a57edd45..a78457e22 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -42,7 +42,9 @@
},
"license": "Apache-2.0",
"devDependencies": {
+ "@0xproject/contract-addresses": "^1.0.0",
"@0xproject/abi-gen": "^1.0.13",
+ "@0xproject/abi-gen-wrappers": "^1.0.0",
"@0xproject/dev-utils": "^1.0.12",
"@0xproject/migrations": "^1.0.14",
"@0xproject/monorepo-scripts": "^1.0.11",
@@ -51,7 +53,6 @@
"@types/mocha": "^2.2.42",
"@types/node": "*",
"@types/sinon": "^2.2.2",
- "@types/web3-provider-engine": "^14.0.0",
"awesome-typescript-loader": "^5.2.1",
"chai": "^4.0.1",
"chai-as-promised": "^7.1.0",
@@ -83,6 +84,7 @@
"@0xproject/typescript-typings": "^3.0.2",
"@0xproject/utils": "^2.0.2",
"@0xproject/web3-wrapper": "^3.0.3",
+ "@types/web3-provider-engine": "^14.0.0",
"ethereum-types": "^1.0.11",
"ethers": "~4.0.4",
"lodash": "^4.17.5",
diff --git a/packages/0x.js/src/globals.d.ts b/packages/0x.js/src/globals.d.ts
deleted file mode 100644
index 94e63a32d..000000000
--- a/packages/0x.js/src/globals.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare module '*.json' {
- const json: any;
- /* tslint:disable */
- export default json;
- /* tslint:enable */
-}
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 6eb1fd8ee..7fd48da37 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -1,3 +1,5 @@
+export { ContractAddresses } from '@0xproject/contract-addresses';
+
export { assetDataUtils, signatureUtils, generatePseudoRandomSalt, orderHashUtils } from '@0xproject/order-utils';
export {
@@ -18,6 +20,16 @@ export {
TransactionOpts,
OrderStatus,
OrderInfo,
+ EventCallback,
+ DecodedLogEvent,
+ TransactionEncoder,
+ BalanceAndAllowance,
+ OrderAndTraderInfo,
+ TraderInfo,
+ ValidateOrderFillableOpts,
+} from '@0xproject/contract-wrappers';
+
+export {
WETH9Events,
WETH9WithdrawalEventArgs,
WETH9ApprovalEventArgs,
@@ -38,16 +50,9 @@ export {
ExchangeSignatureValidatorApprovalEventArgs,
ExchangeFillEventArgs,
ExchangeCancelEventArgs,
- ExchangeEvents,
- EventCallback,
- DecodedLogEvent,
ExchangeEventArgs,
- TransactionEncoder,
- BalanceAndAllowance,
- OrderAndTraderInfo,
- TraderInfo,
- ValidateOrderFillableOpts,
-} from '@0xproject/contract-wrappers';
+ ExchangeEvents,
+} from '@0xproject/abi-gen-wrappers';
export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher';
@@ -78,6 +83,7 @@ export {
ERC721AssetData,
SignatureType,
OrderRelevantState,
+ Stats,
} from '@0xproject/types';
export {
diff --git a/packages/0x.js/typedoc-tsconfig.json b/packages/0x.js/typedoc-tsconfig.json
index c9b0af1ae..a4c669cb6 100644
--- a/packages/0x.js/typedoc-tsconfig.json
+++ b/packages/0x.js/typedoc-tsconfig.json
@@ -3,5 +3,5 @@
"compilerOptions": {
"outDir": "lib"
},
- "include": ["./src/**/*", "./test/**/*"]
+ "include": ["./src/**/*"]
}