diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-11-12 00:14:09 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-11-12 00:14:09 +0800 |
| commit | c6f97f20fb7ada5135350c9120bfe203f78c0970 (patch) | |
| tree | 9028936fd1ad8acb56625e0b4c633a88c18a5212 /src/types.ts | |
| parent | b66600338e0057baa6964328bdf337a905aa5ff9 (diff) | |
| parent | 76b66872d8f797ee3b0efe0fa2ca914cf44ee46c (diff) | |
| download | dexon-sol-tools-c6f97f20fb7ada5135350c9120bfe203f78c0970.tar dexon-sol-tools-c6f97f20fb7ada5135350c9120bfe203f78c0970.tar.gz dexon-sol-tools-c6f97f20fb7ada5135350c9120bfe203f78c0970.tar.bz2 dexon-sol-tools-c6f97f20fb7ada5135350c9120bfe203f78c0970.tar.lz dexon-sol-tools-c6f97f20fb7ada5135350c9120bfe203f78c0970.tar.xz dexon-sol-tools-c6f97f20fb7ada5135350c9120bfe203f78c0970.tar.zst dexon-sol-tools-c6f97f20fb7ada5135350c9120bfe203f78c0970.zip | |
Merge branch 'development' into orderWatcher
* development:
0.22.6
Add new changes to CHANGELOG
use util fn
no race, reject from interval cb and clear
allow timeout for await transaction mined
# Conflicts:
# src/types.ts
Diffstat (limited to 'src/types.ts')
| -rw-r--r-- | src/types.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/types.ts b/src/types.ts index 411ff3bfd..160b71fda 100644 --- a/src/types.ts +++ b/src/types.ts @@ -17,6 +17,7 @@ export enum ZeroExError { NoNetworkId = 'NO_NETWORK_ID', SubscriptionNotFound = 'SUBSCRIPTION_NOT_FOUND', SubscriptionAlreadyPresent = 'SUBSCRIPTION_ALREADY_PRESENT', + TransactionMiningTimeout = 'TRANSACTION_MINING_TIMEOUT', } export enum InternalZeroExError { |