diff options
Diffstat (limited to 'packages/types')
-rw-r--r-- | packages/types/CHANGELOG.json | 9 | ||||
-rw-r--r-- | packages/types/package.json | 2 | ||||
-rw-r--r-- | packages/types/src/index.ts | 30 |
3 files changed, 25 insertions, 16 deletions
diff --git a/packages/types/CHANGELOG.json b/packages/types/CHANGELOG.json index 8abc5bd99..6acfbb98a 100644 --- a/packages/types/CHANGELOG.json +++ b/packages/types/CHANGELOG.json @@ -1,5 +1,14 @@ [ { + "version": "0.8.0", + "changes": [ + { + "note": "Change the order type to v2 format", + "pr": 618 + } + ] + }, + { "version": "0.7.0", "changes": [ { diff --git a/packages/types/package.json b/packages/types/package.json index 0968c6b7a..d9afe5afc 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/types", - "version": "0.7.0", + "version": "0.7.1", "engines": { "node": ">=6.12" }, diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 055c47e0a..7831f580e 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -282,22 +282,26 @@ export interface RawLogEntry { } export interface Order { - maker: string; - taker: string; + senderAddress: string; + makerAddress: string; + takerAddress: string; makerFee: BigNumber; takerFee: BigNumber; - makerTokenAmount: BigNumber; - takerTokenAmount: BigNumber; - makerTokenAddress: string; - takerTokenAddress: string; + makerAssetAmount: BigNumber; + takerAssetAmount: BigNumber; + makerAssetData: string; + takerAssetData: string; salt: BigNumber; - exchangeContractAddress: string; - feeRecipient: string; - expirationUnixTimestampSec: BigNumber; + feeRecipientAddress: string; + expirationTimeSeconds: BigNumber; } -export interface SignedOrder extends Order { - ecSignature: ECSignature; +export interface SignedOrder extends UnsignedOrder { + signature: string; +} + +export interface UnsignedOrder extends Order { + exchangeAddress: string; } /** @@ -349,10 +353,6 @@ export interface Artifact { }; } -export type OrderAddresses = [string, string, string, string, string]; - -export type OrderValues = [BigNumber, BigNumber, BigNumber, BigNumber, BigNumber, BigNumber]; - export type DoneCallback = (err?: Error) => void; export interface OrderRelevantState { |