diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-05-24 01:19:10 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-05-24 01:19:10 +0800 |
| commit | 0a725415a48ebc2f23578baa410f56f88bc77cee (patch) | |
| tree | c4a618bb0700560d23b7839b60ba2203e46433f9 /packages/website/ts/redux | |
| parent | 48e66954470ffb1b547e377d3edbed5d2cf7fc6b (diff) | |
| parent | af0d9439d4f4e05fce8018665e375cf2db07184c (diff) | |
| download | dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.gz dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.bz2 dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.lz dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.xz dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.tar.zst dexon-sol-tools-0a725415a48ebc2f23578baa410f56f88bc77cee.zip | |
Merge branch 'v2-prototype' into feature/truffle-sol-cov
Diffstat (limited to 'packages/website/ts/redux')
| -rw-r--r-- | packages/website/ts/redux/dispatcher.ts | 2 | ||||
| -rw-r--r-- | packages/website/ts/redux/reducer.ts | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/packages/website/ts/redux/dispatcher.ts b/packages/website/ts/redux/dispatcher.ts index 981522360..340b80d49 100644 --- a/packages/website/ts/redux/dispatcher.ts +++ b/packages/website/ts/redux/dispatcher.ts @@ -1,4 +1,4 @@ -import { ECSignature } from '0x.js'; +import { ECSignature } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import { Dispatch } from 'redux'; import { State } from 'ts/redux/reducer'; diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts index bb8f1472b..fba6afa5d 100644 --- a/packages/website/ts/redux/reducer.ts +++ b/packages/website/ts/redux/reducer.ts @@ -1,4 +1,5 @@ -import { ECSignature, ZeroEx } from '0x.js'; +import { constants, generatePseudoRandomSalt } from '@0xproject/order-utils'; +import { ECSignature } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as _ from 'lodash'; import * as moment from 'moment'; @@ -65,8 +66,8 @@ const INITIAL_STATE: State = { s: '', v: 27, }, - orderTakerAddress: ZeroEx.NULL_ADDRESS, - orderSalt: ZeroEx.generatePseudoRandomSalt(), + orderTakerAddress: constants.NULL_ADDRESS, + orderSalt: generatePseudoRandomSalt(), nodeVersion: undefined, screenWidth: utils.getScreenWidth(), shouldBlockchainErrDialogBeOpen: false, |