Refactor BalanceThresholdFilter to use new ITransaction interface
This commit is contained in:
parent
095c899913
commit
8ddc890e10
@ -17,6 +17,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
pragma solidity ^0.5.5;
|
pragma solidity ^0.5.5;
|
||||||
|
pragma experimental ABIEncoderV2;
|
||||||
|
|
||||||
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
|
import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol";
|
||||||
import "./interfaces/IThresholdAsset.sol";
|
import "./interfaces/IThresholdAsset.sol";
|
||||||
|
@ -17,8 +17,10 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
pragma solidity ^0.5.5;
|
pragma solidity ^0.5.5;
|
||||||
|
pragma experimental ABIEncoderV2;
|
||||||
|
|
||||||
import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
|
import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol";
|
||||||
|
import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol";
|
||||||
import "./mixins/MBalanceThresholdFilterCore.sol";
|
import "./mixins/MBalanceThresholdFilterCore.sol";
|
||||||
import "./MixinExchangeCalldata.sol";
|
import "./MixinExchangeCalldata.sol";
|
||||||
|
|
||||||
@ -75,13 +77,14 @@ contract MixinBalanceThresholdFilterCore is
|
|||||||
}
|
}
|
||||||
emit ValidatedAddresses(addressesToValidate);
|
emit ValidatedAddresses(addressesToValidate);
|
||||||
|
|
||||||
|
LibZeroExTransaction.ZeroExTransaction memory transaction = LibZeroExTransaction.ZeroExTransaction({
|
||||||
|
salt: salt,
|
||||||
|
data: signedExchangeTransaction,
|
||||||
|
signerAddress: signerAddress
|
||||||
|
});
|
||||||
|
|
||||||
// All addresses are valid. Execute exchange function.
|
// All addresses are valid. Execute exchange function.
|
||||||
EXCHANGE.executeTransaction(
|
EXCHANGE.executeTransaction(transaction, signature);
|
||||||
salt,
|
|
||||||
signerAddress,
|
|
||||||
signedExchangeTransaction,
|
|
||||||
signature
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @dev Constructs an array of addresses to be validated.
|
/// @dev Constructs an array of addresses to be validated.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user