diff options
author | Fabio Berger <me@fabioberger.com> | 2018-08-17 06:10:12 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-08-17 06:10:12 +0800 |
commit | 0337b5a40104ef83ebd527184785def7f399d573 (patch) | |
tree | 1fcbd0effd3ad4a88e99a41082825818e3f02302 /packages/types | |
parent | e47e9c5b34a2c189b6913c4c7082cb7ec256617f (diff) | |
parent | 72752bcb68bac29ff5897ed57de357ad7af09abe (diff) | |
download | dexon-0x-contracts-0337b5a40104ef83ebd527184785def7f399d573.tar.gz dexon-0x-contracts-0337b5a40104ef83ebd527184785def7f399d573.tar.zst dexon-0x-contracts-0337b5a40104ef83ebd527184785def7f399d573.zip |
Merge development
Diffstat (limited to 'packages/types')
-rw-r--r-- | packages/types/package.json | 4 | ||||
-rw-r--r-- | packages/types/src/index.ts | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/packages/types/package.json b/packages/types/package.json index 9ee0bf0c9..8d5eb1123 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -24,11 +24,11 @@ "homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md", "devDependencies": { "@0xproject/tslint-config": "^1.0.5", - "copyfiles": "^1.2.0", + "copyfiles": "^2.0.0", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", "tslint": "5.11.0", - "typescript": "2.9.2" + "typescript": "3.0.1" }, "dependencies": { "@types/node": "^8.0.53", diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index fa634420d..04480d093 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -62,8 +62,7 @@ export interface ValidatorSignature { export enum ExchangeContractErrs { OrderFillExpired = 'ORDER_FILL_EXPIRED', OrderCancelExpired = 'ORDER_CANCEL_EXPIRED', - OrderCancelAmountZero = 'ORDER_CANCEL_AMOUNT_ZERO', - OrderAlreadyCancelledOrFilled = 'ORDER_ALREADY_CANCELLED_OR_FILLED', + OrderCancelled = 'ORDER_CANCELLED', OrderFillAmountZero = 'ORDER_FILL_AMOUNT_ZERO', OrderRemainingFillAmountZero = 'ORDER_REMAINING_FILL_AMOUNT_ZERO', OrderFillRoundingError = 'ORDER_FILL_ROUNDING_ERROR', |