Update remaining contracts to use new transaction schema

This commit is contained in:
Amir Bandeali
2019-08-20 15:09:19 -07:00
parent 47da97137f
commit 27e2a76110
3 changed files with 8 additions and 2 deletions

View File

@@ -61,6 +61,7 @@ contract ExchangeWrapper {
LibZeroExTransaction.ZeroExTransaction memory transaction = LibZeroExTransaction.ZeroExTransaction({
salt: salt,
expirationTimeSeconds: transactionExpirationTimeSeconds,
gasPrice: tx.gasprice,
data: data,
signerAddress: makerAddress
});
@@ -99,6 +100,7 @@ contract ExchangeWrapper {
LibZeroExTransaction.ZeroExTransaction memory transaction = LibZeroExTransaction.ZeroExTransaction({
salt: salt,
expirationTimeSeconds: transactionExpirationTimeSeconds,
gasPrice: tx.gasprice,
data: data,
signerAddress: takerAddress
});

View File

@@ -134,6 +134,7 @@ contract Whitelist is
LibZeroExTransaction.ZeroExTransaction memory transaction = LibZeroExTransaction.ZeroExTransaction({
salt: salt,
data: data,
gasPrice: tx.gasprice,
expirationTimeSeconds: uint256(-1),
signerAddress: takerAddress
});

View File

@@ -361,11 +361,14 @@ contract MixinExchangeCore is
orderInfo.orderHash,
makerAddress,
signature
)) {
)
) {
if (!_isValidOrderWithHashSignature(
order,
orderInfo.orderHash,
signature)) {
signature
)
) {
LibRichErrors.rrevert(LibExchangeRichErrors.SignatureError(
LibExchangeRichErrors.SignatureErrorCodes.BAD_SIGNATURE,
orderInfo.orderHash,