diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-03-07 03:23:48 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-04-21 04:56:16 +0800 |
commit | cd8f8e1e4acc00e9e31265050456a4c98d79a7d4 (patch) | |
tree | 575786d2085af08cdcae09f91a727714df2b9c70 /packages/contracts/src/utils/types.ts | |
parent | ed43d8d08b9a6cf6e015383a3edaba1946fcca6e (diff) | |
download | dexon-sol-tools-cd8f8e1e4acc00e9e31265050456a4c98d79a7d4.tar dexon-sol-tools-cd8f8e1e4acc00e9e31265050456a4c98d79a7d4.tar.gz dexon-sol-tools-cd8f8e1e4acc00e9e31265050456a4c98d79a7d4.tar.bz2 dexon-sol-tools-cd8f8e1e4acc00e9e31265050456a4c98d79a7d4.tar.lz dexon-sol-tools-cd8f8e1e4acc00e9e31265050456a4c98d79a7d4.tar.xz dexon-sol-tools-cd8f8e1e4acc00e9e31265050456a4c98d79a7d4.tar.zst dexon-sol-tools-cd8f8e1e4acc00e9e31265050456a4c98d79a7d4.zip |
Modify utils to work with new signature format
Diffstat (limited to 'packages/contracts/src/utils/types.ts')
-rw-r--r-- | packages/contracts/src/utils/types.ts | 67 |
1 files changed, 50 insertions, 17 deletions
diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts index 2ffc84f04..5075c7bf5 100644 --- a/packages/contracts/src/utils/types.ts +++ b/packages/contracts/src/utils/types.ts @@ -12,39 +12,32 @@ export interface SubmissionContractEventArgs { } export interface BatchFillOrders { - orderAddresses: string[][]; - orderValues: BigNumber[][]; + orders: OrderStruct[]; + signatures: string[]; takerTokenFillAmounts: BigNumber[]; - v: number[]; - r: string[]; - s: string[]; } export interface MarketFillOrders { - orderAddresses: string[][]; - orderValues: BigNumber[][]; + orders: OrderStruct[]; + signatures: string[]; takerTokenFillAmount: BigNumber; - v: number[]; - r: string[]; - s: string[]; } export interface BatchCancelOrders { - orderAddresses: string[][]; - orderValues: BigNumber[][]; + orders: OrderStruct[]; takerTokenCancelAmounts: BigNumber[]; } export interface DefaultOrderParams { - exchangeContractAddress: string; - maker: string; - feeRecipient: string; + exchangeAddress: string; + makerAddress: string; + feeRecipientAddress: string; makerTokenAddress: string; takerTokenAddress: string; makerTokenAmount: BigNumber; takerTokenAmount: BigNumber; - makerFee: BigNumber; - takerFee: BigNumber; + makerFeeAmount: BigNumber; + takerFeeAmount: BigNumber; } export interface TransactionDataParams { @@ -114,3 +107,43 @@ export interface Artifact { }; }; } + +export interface SignedOrder { + exchangeAddress: string; + makerAddress: string; + takerAddress: string; + makerTokenAddress: string; + takerTokenAddress: string; + feeRecipientAddress: string; + makerTokenAmount: BigNumber; + takerTokenAmount: BigNumber; + makerFeeAmount: BigNumber; + takerFeeAmount: BigNumber; + expirationTimeSeconds: BigNumber; + salt: BigNumber; + signature: string; +} + +export interface OrderStruct { + makerAddress: string; + takerAddress: string; + makerTokenAddress: string; + takerTokenAddress: string; + feeRecipientAddress: string; + makerTokenAmount: BigNumber; + takerTokenAmount: BigNumber; + makerFeeAmount: BigNumber; + takerFeeAmount: BigNumber; + expirationTimeSeconds: BigNumber; + salt: BigNumber; +} + +export enum SignatureType { + Illegal, + Invalid, + Caller, + Ecrecover, + EIP712, + Trezor, + Contract, +} |