From 9b3680780fab26543331524870eba75eea08a426 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 7 Feb 2018 14:41:40 +0100 Subject: Rename expiration to expirationUnixTimestampSec --- packages/website/ts/redux/dispatcher.ts | 4 ++-- packages/website/ts/redux/reducer.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/website/ts/redux') diff --git a/packages/website/ts/redux/dispatcher.ts b/packages/website/ts/redux/dispatcher.ts index 87415b285..ba54347b1 100644 --- a/packages/website/ts/redux/dispatcher.ts +++ b/packages/website/ts/redux/dispatcher.ts @@ -5,9 +5,9 @@ import { ActionTypes, AssetToken, BlockchainErrs, - Order, ProviderType, ScreenWidths, + SerializedOrder, Side, SideToAssetToken, SignatureData, @@ -49,7 +49,7 @@ export class Dispatcher { type: ActionTypes.UpdateOrderSalt, }); } - public updateUserSuppliedOrderCache(order: Order) { + public updateUserSuppliedOrderCache(order: SerializedOrder) { this._dispatch({ data: order, type: ActionTypes.UpdateUserSuppliedOrderCache, diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts index 7b0b03dae..8c640fdb7 100644 --- a/packages/website/ts/redux/reducer.ts +++ b/packages/website/ts/redux/reducer.ts @@ -6,9 +6,9 @@ import { Action, ActionTypes, BlockchainErrs, - Order, ProviderType, ScreenWidths, + SerializedOrder, Side, SideToAssetToken, SignatureData, @@ -40,7 +40,7 @@ export interface State { userAddress: string; userEtherBalance: BigNumber; // Note: cache of supplied orderJSON in fill order step. Do not use for anything else. - userSuppliedOrderCache: Order; + userSuppliedOrderCache: SerializedOrder; // Docs docsVersion: string; -- cgit v1.2.3 From 3c7ebe2697f728b6f90d837cc202e5c1ed1a2182 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 7 Feb 2018 16:11:51 +0100 Subject: Remove unused types and take their names --- packages/website/ts/redux/dispatcher.ts | 4 ++-- packages/website/ts/redux/reducer.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/website/ts/redux') diff --git a/packages/website/ts/redux/dispatcher.ts b/packages/website/ts/redux/dispatcher.ts index ba54347b1..87415b285 100644 --- a/packages/website/ts/redux/dispatcher.ts +++ b/packages/website/ts/redux/dispatcher.ts @@ -5,9 +5,9 @@ import { ActionTypes, AssetToken, BlockchainErrs, + Order, ProviderType, ScreenWidths, - SerializedOrder, Side, SideToAssetToken, SignatureData, @@ -49,7 +49,7 @@ export class Dispatcher { type: ActionTypes.UpdateOrderSalt, }); } - public updateUserSuppliedOrderCache(order: SerializedOrder) { + public updateUserSuppliedOrderCache(order: Order) { this._dispatch({ data: order, type: ActionTypes.UpdateUserSuppliedOrderCache, diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts index 8c640fdb7..7b0b03dae 100644 --- a/packages/website/ts/redux/reducer.ts +++ b/packages/website/ts/redux/reducer.ts @@ -6,9 +6,9 @@ import { Action, ActionTypes, BlockchainErrs, + Order, ProviderType, ScreenWidths, - SerializedOrder, Side, SideToAssetToken, SignatureData, @@ -40,7 +40,7 @@ export interface State { userAddress: string; userEtherBalance: BigNumber; // Note: cache of supplied orderJSON in fill order step. Do not use for anything else. - userSuppliedOrderCache: SerializedOrder; + userSuppliedOrderCache: Order; // Docs docsVersion: string; -- cgit v1.2.3 From 8fba0477a69317c19b3446c76a17cb3adbf447d7 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 7 Feb 2018 20:58:19 +0100 Subject: Remove hash from signatureData --- packages/website/ts/redux/dispatcher.ts | 8 ++++---- packages/website/ts/redux/reducer.ts | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'packages/website/ts/redux') diff --git a/packages/website/ts/redux/dispatcher.ts b/packages/website/ts/redux/dispatcher.ts index 87415b285..925f2aa29 100644 --- a/packages/website/ts/redux/dispatcher.ts +++ b/packages/website/ts/redux/dispatcher.ts @@ -1,3 +1,4 @@ +import { ECSignature } from '0x.js'; import { BigNumber } from '@0xproject/utils'; import { Dispatch } from 'redux'; import { State } from 'ts/redux/reducer'; @@ -10,7 +11,6 @@ import { ScreenWidths, Side, SideToAssetToken, - SignatureData, Token, TokenByAddress, } from 'ts/types'; @@ -148,10 +148,10 @@ export class Dispatcher { type: ActionTypes.ForceTokenStateRefetch, }); } - public updateSignatureData(signatureData: SignatureData) { + public updateECSignature(ecSignature: ECSignature) { this._dispatch({ - data: signatureData, - type: ActionTypes.UpdateOrderSignatureData, + data: ecSignature, + type: ActionTypes.UpdateOrderECSignature, }); } public updateUserEtherBalance(balance: BigNumber) { diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts index 7b0b03dae..cab8cbfe6 100644 --- a/packages/website/ts/redux/reducer.ts +++ b/packages/website/ts/redux/reducer.ts @@ -1,4 +1,4 @@ -import { ZeroEx } from '0x.js'; +import { ECSignature, ZeroEx } from '0x.js'; import { BigNumber } from '@0xproject/utils'; import * as _ from 'lodash'; import * as moment from 'moment'; @@ -29,7 +29,7 @@ export interface State { orderExpiryTimestamp: BigNumber; orderFillAmount: BigNumber; orderTakerAddress: string; - orderSignatureData: SignatureData; + orderECSignature: ECSignature; orderSalt: BigNumber; nodeVersion: string; screenWidth: ScreenWidths; @@ -59,8 +59,7 @@ const INITIAL_STATE: State = { networkId: undefined, orderExpiryTimestamp: utils.initialOrderExpiryUnixTimestampSec(), orderFillAmount: undefined, - orderSignatureData: { - hash: '', + orderECSignature: { r: '', s: '', v: 27, @@ -188,10 +187,10 @@ export function reducer(state: State = INITIAL_STATE, action: Action) { lastForceTokenStateRefetch: moment().unix(), }; - case ActionTypes.UpdateOrderSignatureData: { + case ActionTypes.UpdateOrderECSignature: { return { ...state, - orderSignatureData: action.data, + orderECSignature: action.data, }; } -- cgit v1.2.3 From 1233c33116a389f34ac90768c5ef43c8bbfbf514 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 8 Feb 2018 16:23:20 +0100 Subject: Address feedback --- packages/website/ts/redux/reducer.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages/website/ts/redux') diff --git a/packages/website/ts/redux/reducer.ts b/packages/website/ts/redux/reducer.ts index cab8cbfe6..c2a21dc07 100644 --- a/packages/website/ts/redux/reducer.ts +++ b/packages/website/ts/redux/reducer.ts @@ -11,7 +11,6 @@ import { ScreenWidths, Side, SideToAssetToken, - SignatureData, TokenByAddress, } from 'ts/types'; import { utils } from 'ts/utils/utils'; @@ -64,7 +63,7 @@ const INITIAL_STATE: State = { s: '', v: 27, }, - orderTakerAddress: '', + orderTakerAddress: ZeroEx.NULL_ADDRESS, orderSalt: ZeroEx.generatePseudoRandomSalt(), nodeVersion: undefined, screenWidth: utils.getScreenWidth(), -- cgit v1.2.3