diff options
author | Brandon Millman <brandon.millman@gmail.com> | 2018-02-07 07:36:00 +0800 |
---|---|---|
committer | Brandon Millman <brandon.millman@gmail.com> | 2018-02-07 07:36:00 +0800 |
commit | 36a49966eb4d5b78192cb5fa76c98755ef092f8b (patch) | |
tree | 7100b22aa1c4ac824bd054fefdae53e9df0aab9a /packages/0x.js/src/order_watcher | |
parent | f818d06b43ae9279c4ee022685e3bcb9f27ba2fd (diff) | |
parent | 548246c05f128d23d701d9b738ce53deaf783f63 (diff) | |
download | dexon-sol-tools-36a49966eb4d5b78192cb5fa76c98755ef092f8b.tar dexon-sol-tools-36a49966eb4d5b78192cb5fa76c98755ef092f8b.tar.gz dexon-sol-tools-36a49966eb4d5b78192cb5fa76c98755ef092f8b.tar.bz2 dexon-sol-tools-36a49966eb4d5b78192cb5fa76c98755ef092f8b.tar.lz dexon-sol-tools-36a49966eb4d5b78192cb5fa76c98755ef092f8b.tar.xz dexon-sol-tools-36a49966eb4d5b78192cb5fa76c98755ef092f8b.tar.zst dexon-sol-tools-36a49966eb4d5b78192cb5fa76c98755ef092f8b.zip |
Merge branch 'development' into feature/testnet-faucets/order-dispenser
* development:
Attribute the origins of NonceTracker
Move BlockParamLiteral to shared types package
Fixes
Move BlockParam and BlockParamLiteral to shared types
Rename called to something more readable
Newline prettier/lint
Yarn.lock
Refactor tests for reuse of the fixture subprovider
Remove re-fetch of transaction count on error
Disable linter for multiple class declarations
Remove double declaration
Enable CIRCLECI and declare web3
Test faucets to use new NonceTracker
Update changelog
Readability and prettier
Prettify
Nonce tracker subprovider Caches the nonce when a request to getTransactionCount is made and increments the pending nonce after successful transactions
Diffstat (limited to 'packages/0x.js/src/order_watcher')
-rw-r--r-- | packages/0x.js/src/order_watcher/event_watcher.ts | 4 | ||||
-rw-r--r-- | packages/0x.js/src/order_watcher/order_state_watcher.ts | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/0x.js/src/order_watcher/event_watcher.ts b/packages/0x.js/src/order_watcher/event_watcher.ts index 5d05bfb60..e67b93251 100644 --- a/packages/0x.js/src/order_watcher/event_watcher.ts +++ b/packages/0x.js/src/order_watcher/event_watcher.ts @@ -3,7 +3,9 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; import * as Web3 from 'web3'; -import { BlockParamLiteral, EventWatcherCallback, ZeroExError } from '../types'; +import { BlockParamLiteral } from '@0xproject/types'; + +import { EventWatcherCallback, ZeroExError } from '../types'; import { assert } from '../utils/assert'; const DEFAULT_EVENT_POLLING_INTERVAL_MS = 200; diff --git a/packages/0x.js/src/order_watcher/order_state_watcher.ts b/packages/0x.js/src/order_watcher/order_state_watcher.ts index 1ad1a90b1..a9b3eba68 100644 --- a/packages/0x.js/src/order_watcher/order_state_watcher.ts +++ b/packages/0x.js/src/order_watcher/order_state_watcher.ts @@ -1,5 +1,5 @@ import { schemas } from '@0xproject/json-schemas'; -import { LogWithDecodedArgs } from '@0xproject/types'; +import { BlockParamLiteral, LogWithDecodedArgs } from '@0xproject/types'; import { AbiDecoder, intervalUtils } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as _ from 'lodash'; @@ -11,7 +11,6 @@ import { BalanceAndProxyAllowanceLazyStore } from '../stores/balance_proxy_allow import { OrderFilledCancelledLazyStore } from '../stores/order_filled_cancelled_lazy_store'; import { ApprovalContractEventArgs, - BlockParamLiteral, ContractEventArgs, DepositContractEventArgs, EtherTokenEvents, |