diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-23 02:58:50 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-23 02:58:50 +0800 |
| commit | 4cfeb6b8ace9c1613ac0581bd6ea52ff183701f9 (patch) | |
| tree | a507d3fe9435829ebc802d5b3c0412fe655a52cd /packages/contracts/src | |
| parent | 9373451ca8c19ac2ab20db792fd049ccf284f1f2 (diff) | |
| parent | cde85243d6eaf9376f499aa1cc28bd393130c2b9 (diff) | |
| download | dexon-sol-tools-4cfeb6b8ace9c1613ac0581bd6ea52ff183701f9.tar dexon-sol-tools-4cfeb6b8ace9c1613ac0581bd6ea52ff183701f9.tar.gz dexon-sol-tools-4cfeb6b8ace9c1613ac0581bd6ea52ff183701f9.tar.bz2 dexon-sol-tools-4cfeb6b8ace9c1613ac0581bd6ea52ff183701f9.tar.lz dexon-sol-tools-4cfeb6b8ace9c1613ac0581bd6ea52ff183701f9.tar.xz dexon-sol-tools-4cfeb6b8ace9c1613ac0581bd6ea52ff183701f9.tar.zst dexon-sol-tools-4cfeb6b8ace9c1613ac0581bd6ea52ff183701f9.zip | |
Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-prototype
* 'v2-prototype' of github.com:0xProject/0x-monorepo:
Rename some variables in multi_sig_with_time_lock.ts
Remove extra awaitTransactionMinedAsync calls
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
Diffstat (limited to 'packages/contracts/src')
| -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 3fd2a0a3b..b876bf6b5 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, |