Merge branch 'development' into sol-doc

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",

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)

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"

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 {