diff options
| author | F. Eugene Aumson <feuGeneA@users.noreply.github.com> | 2018-09-12 07:00:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 07:00:11 +0800 |
| commit | cbb5a425dfb45d1dfda3579548d6b3f70dfca166 (patch) | |
| tree | 8751979ad70ed0eb61dfda5a954bb9e1bc3d5c3b /packages/types | |
| parent | 800dd5fb4f0ab21388440a46aef21cd0cf0801c3 (diff) | |
| parent | 45b68832aa3eb5c09db33140468ab737114be9e3 (diff) | |
| download | dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.gz dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.bz2 dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.lz dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.xz dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.tar.zst dexon-sol-tools-cbb5a425dfb45d1dfda3579548d6b3f70dfca166.zip | |
Merge branch 'development' into sol-doc
Diffstat (limited to 'packages/types')
| -rw-r--r-- | packages/types/CHANGELOG.json | 9 | ||||
| -rw-r--r-- | packages/types/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | packages/types/package.json | 6 | ||||
| -rw-r--r-- | packages/types/src/index.ts | 3 |
4 files changed, 18 insertions, 5 deletions
diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index 0bd9e3b37..008ff8ff4 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,12 +1,17 @@ [ { - "version": "1.0.1-rc.7", + "version": "1.0.1", "changes": [ { "note": "Add AssetProxyOwner revert reasons", "pr": 1041 + }, + { + "note": "Add MultiSigWalletWithTimeLock revert reasons", + "pr": 1050 } - ] + ], + "timestamp": 1536142250 }, { "version": "1.0.1-rc.6", diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index 299dcac88..759a93fb0 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -5,6 +5,11 @@ Edit the package's CHANGELOG.json file only. CHANGELOG +## v1.0.1 - _September 5, 2018_ + + * Add AssetProxyOwner revert reasons (#1041) + * Add MultiSigWalletWithTimeLock revert reasons (#1050) + ## v1.0.1-rc.6 - _August 27, 2018_ * Add WalletError and ValidatorError revert reasons (#1012) diff --git a/packages/types/package.json b/packages/types/package.json index 362c8f639..15f0a54b4 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/types", - "version": "1.0.1-rc.6", + "version": "1.0.1", "engines": { "node": ">=6.12" }, @@ -22,7 +22,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/types/README.md", "devDependencies": { - "@0xproject/tslint-config": "^1.0.6", + "@0xproject/tslint-config": "^1.0.7", "copyfiles": "^2.0.0", "make-promises-safe": "^1.1.0", "shx": "^0.2.2", @@ -32,7 +32,7 @@ "dependencies": { "@types/node": "^8.0.53", "bignumber.js": "~4.1.0", - "ethereum-types": "^1.0.5" + "ethereum-types": "^1.0.6" }, "publishConfig": { "access": "public" diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index a22f44c08..e2333d5d0 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -227,6 +227,9 @@ export enum RevertReason { InvalidFunctionSelector = 'INVALID_FUNCTION_SELECTOR', InvalidAssetProxy = 'INVALID_ASSET_PROXY', UnregisteredAssetProxy = 'UNREGISTERED_ASSET_PROXY', + TxFullyConfirmed = 'TX_FULLY_CONFIRMED', + TxNotFullyConfirmed = 'TX_NOT_FULLY_CONFIRMED', + TimeLockIncomplete = 'TIME_LOCK_INCOMPLETE', } export enum StatusCodes { |