From 8ddc890e10da80c8ede79d23d96d11b1bf9e20f9 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Wed, 3 Apr 2019 11:12:32 -0700 Subject: [PATCH] Refactor BalanceThresholdFilter to use new ITransaction interface --- .../BalanceThresholdFilter.sol | 1 + .../MixinBalanceThresholdFilterCore.sol | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/contracts/extensions/contracts/src/BalanceThresholdFilter/BalanceThresholdFilter.sol b/contracts/extensions/contracts/src/BalanceThresholdFilter/BalanceThresholdFilter.sol index af61b95d0c..0ce737c50e 100644 --- a/contracts/extensions/contracts/src/BalanceThresholdFilter/BalanceThresholdFilter.sol +++ b/contracts/extensions/contracts/src/BalanceThresholdFilter/BalanceThresholdFilter.sol @@ -17,6 +17,7 @@ */ pragma solidity ^0.5.5; +pragma experimental ABIEncoderV2; import "@0x/contracts-exchange/contracts/src/interfaces/IExchange.sol"; import "./interfaces/IThresholdAsset.sol"; diff --git a/contracts/extensions/contracts/src/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol b/contracts/extensions/contracts/src/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol index e486070b44..87310b49df 100644 --- a/contracts/extensions/contracts/src/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol +++ b/contracts/extensions/contracts/src/BalanceThresholdFilter/MixinBalanceThresholdFilterCore.sol @@ -17,8 +17,10 @@ */ pragma solidity ^0.5.5; +pragma experimental ABIEncoderV2; import "@0x/contracts-exchange-libs/contracts/src/LibExchangeSelectors.sol"; +import "@0x/contracts-exchange-libs/contracts/src/LibZeroExTransaction.sol"; import "./mixins/MBalanceThresholdFilterCore.sol"; import "./MixinExchangeCalldata.sol"; @@ -75,13 +77,14 @@ contract MixinBalanceThresholdFilterCore is } emit ValidatedAddresses(addressesToValidate); + LibZeroExTransaction.ZeroExTransaction memory transaction = LibZeroExTransaction.ZeroExTransaction({ + salt: salt, + data: signedExchangeTransaction, + signerAddress: signerAddress + }); + // All addresses are valid. Execute exchange function. - EXCHANGE.executeTransaction( - salt, - signerAddress, - signedExchangeTransaction, - signature - ); + EXCHANGE.executeTransaction(transaction, signature); } /// @dev Constructs an array of addresses to be validated.