diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-05-25 01:56:31 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-05-25 04:59:30 +0800 |
commit | 92b0efff5abaac8bea468a1b3f897d004ec9c542 (patch) | |
tree | 61e976aa42b78e7eea12f73fb2ccc4a5ad1f9ceb /packages/types | |
parent | 62431fee8e0c79a61f7ebb7677e6c88f0ae95116 (diff) | |
download | dexon-sol-tools-92b0efff5abaac8bea468a1b3f897d004ec9c542.tar.gz dexon-sol-tools-92b0efff5abaac8bea468a1b3f897d004ec9c542.tar.zst dexon-sol-tools-92b0efff5abaac8bea468a1b3f897d004ec9c542.zip |
Migrate migrations to v2
Diffstat (limited to 'packages/types')
-rw-r--r-- | packages/types/src/index.ts | 30 |
1 files changed, 15 insertions, 15 deletions
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 { |