diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-23 04:02:21 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-23 04:02:21 +0800 |
| commit | 2b793f372abc444702406539588f2101d9dc5307 (patch) | |
| tree | 5d407c63d4fc5ebaa9537bf0bca2346c684a1a82 /packages/contracts/src/utils/constants.ts | |
| parent | 9119ee14b6d49b2c339b786f92913ff8a93ff610 (diff) | |
| parent | 4cfeb6b8ace9c1613ac0581bd6ea52ff183701f9 (diff) | |
| download | dexon-0x-contracts-2b793f372abc444702406539588f2101d9dc5307.tar.gz dexon-0x-contracts-2b793f372abc444702406539588f2101d9dc5307.tar.zst dexon-0x-contracts-2b793f372abc444702406539588f2101d9dc5307.zip | |
Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep
* v2-prototype:
Fix tslint issues
Add `are` to boolean naming conventions
Fix tslint
Fix the tsutils version, fixing ts typings issue
Rename some variables in multi_sig_with_time_lock.ts
Remove extra awaitTransactionMinedAsync calls
Update artifacts
Update yarn.lock
Fix warnings in Metacoin
Upgrade UglifyJS to include ES6 support
Add CancelOrder and MatchOrder types
Add missing return types
Ignore classnames linter rule
Apply changes to test/exchange/match_orders.ts
Fix some unhandled promise rejections
Add awaitTransactionMinedAsync after every sent transaction
Add missing blockchainLifecycle calls to contracts tests
# Conflicts:
# packages/contracts/src/utils/exchange_wrapper.ts
# packages/contracts/test/asset_proxy/proxies.ts
# packages/contracts/test/exchange/dispatcher.ts
# packages/contracts/test/multi_sig_with_time_lock.ts
Diffstat (limited to 'packages/contracts/src/utils/constants.ts')
| -rw-r--r-- | packages/contracts/src/utils/constants.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/contracts/src/utils/constants.ts b/packages/contracts/src/utils/constants.ts index e45e51c04..41968f547 100644 --- a/packages/contracts/src/utils/constants.ts +++ b/packages/contracts/src/utils/constants.ts @@ -20,6 +20,7 @@ export const constants = { INVALID_OPCODE: 'invalid opcode', REVERT: 'revert', TESTRPC_NETWORK_ID: 50, + AWAIT_TRANSACTION_MINED_MS: 100, MAX_ETHERTOKEN_WITHDRAW_GAS: 43000, MAX_TOKEN_TRANSFERFROM_GAS: 80000, MAX_TOKEN_APPROVE_GAS: 60000, |