crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix imports and inheritance, update tests for forwarder

Browse Source
This commit is contained in:
Michael Zhu
2019-07-02 17:24:19 -07:00
parent 0fad6a6ec1
commit 34be9830af
5 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contracts/exchange-forwarder/contracts/src/Forwarder.sol
View File

@@ -19,19 +19,14 @@
pragma solidity ^0.5.9;
pragma experimental ABIEncoderV2;
import "./MixinWeth.sol";
import "./MixinForwarderCore.sol";
import "./libs/LibConstants.sol";
import "./MixinAssets.sol";
import "./MixinExchangeWrapper.sol";
// solhint-disable no-empty-blocks
// MixinAssets, MixinExchangeWrapper, and MixinWeth are all inherited via
// MixinForwarderCore.
contract Forwarder is
LibConstants,
MixinWeth,
MixinAssets,
MixinExchangeWrapper,
MixinForwarderCore
{
constructor (

4
contracts/exchange-forwarder/contracts/src/MixinAssets.sol
View File

@@ -28,8 +28,8 @@ import "./interfaces/IAssets.sol";
contract MixinAssets is
Ownable,
LibConstants
IAssets,
LibConstants,
IAssets
{
using LibBytes for bytes;

16
contracts/exchange-forwarder/contracts/src/MixinForwarderCore.sol
View File

@@ -19,21 +19,27 @@
pragma solidity ^0.5.9;
pragma experimental ABIEncoderV2;
import "./libs/LibConstants.sol";
import "./interfaces/IAsserts.sol";
import "./interfaces/IForwarderCore.sol";
import "@0x/contracts-utils/contracts/src/LibBytes.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibOrder.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibFillResults.sol";
import "@0x/contracts-exchange-libs/contracts/src/LibMath.sol";
import "./libs/LibConstants.sol";
import "./interfaces/IAssets.sol";
import "./interfaces/IForwarderCore.sol";
import "./MixinAssets.sol";
import "./MixinExchangeWrapper.sol";
import "./MixinWeth.sol";
contract MixinForwarderCore is
LibFillResults,
LibMath,
LibConstants,
IAsserts,
IForwarderCore
IAssets,
IForwarderCore,
MixinWeth,
MixinAssets,
MixinExchangeWrapper
{
using LibBytes for bytes;

4
contracts/exchange-forwarder/contracts/src/MixinWeth.sol
View File

@@ -24,9 +24,9 @@ import "./libs/LibConstants.sol";
contract MixinWeth is
LibMath,
LibConstants,
LibConstants
{
/// @dev Default payabale function, this allows us to withdraw WETH
/// @dev Default payable function, this allows us to withdraw WETH
function ()
external
payable

40
contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts
View File

@@ -1,7 +1,7 @@
import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
import { constants, formatters, LogDecoder, MarketSellOrders, Web3ProviderEngine } from '@0x/contracts-test-utils';
import { constants, LogDecoder, Web3ProviderEngine } from '@0x/contracts-test-utils';
import { SignedOrder } from '@0x/types';
import { BigNumber } from '@0x/utils';
import { Web3Wrapper } from '@0x/web3-wrapper';
@@ -40,24 +40,6 @@ export class ForwarderWrapper {
});
return wethAmount;
}
private static _createOptimizedOrders(signedOrders: SignedOrder[]): MarketSellOrders {
_.forEach(signedOrders, (signedOrder, index) => {
signedOrder.takerAssetData = constants.NULL_BYTES;
if (index > 0) {
signedOrder.makerAssetData = constants.NULL_BYTES;
}
});
const params = formatters.createMarketSellOrders(signedOrders, constants.ZERO_AMOUNT);
return params;
}
private static _createOptimizedZrxOrders(signedOrders: SignedOrder[]): MarketSellOrders {
_.forEach(signedOrders, signedOrder => {
signedOrder.makerAssetData = constants.NULL_BYTES;
signedOrder.takerAssetData = constants.NULL_BYTES;
});
const params = formatters.createMarketSellOrders(signedOrders, constants.ZERO_AMOUNT);
return params;
}
constructor(contractInstance: ForwarderContract, provider: Web3ProviderEngine) {
this._forwarderContract = contractInstance;
this._web3Wrapper = new Web3Wrapper(provider);
@@ -74,15 +56,13 @@ export class ForwarderWrapper {
txData: TxDataPayable,
opts: { feePercentage?: BigNumber; feeRecipient?: string } = {},
): Promise<TransactionReceiptWithDecodedLogs> {
const params = ForwarderWrapper._createOptimizedOrders(orders);
const feeParams = ForwarderWrapper._createOptimizedZrxOrders(feeOrders);
const feePercentage = opts.feePercentage === undefined ? constants.ZERO_AMOUNT : opts.feePercentage;
const feeRecipient = opts.feeRecipient === undefined ? constants.NULL_ADDRESS : opts.feeRecipient;
const txHash = await this._forwarderContract.marketSellOrdersWithEth.sendTransactionAsync(
params.orders,
params.signatures,
feeParams.orders,
feeParams.signatures,
orders,
orders.map(signedOrder => signedOrder.signature),
feeOrders,
feeOrders.map(signedFeeOrder => signedFeeOrder.signature),
feePercentage,
feeRecipient,
txData,
@@ -97,16 +77,14 @@ export class ForwarderWrapper {
txData: TxDataPayable,
opts: { feePercentage?: BigNumber; feeRecipient?: string } = {},
): Promise<TransactionReceiptWithDecodedLogs> {
const params = ForwarderWrapper._createOptimizedOrders(orders);
const feeParams = ForwarderWrapper._createOptimizedZrxOrders(feeOrders);
const feePercentage = opts.feePercentage === undefined ? constants.ZERO_AMOUNT : opts.feePercentage;
const feeRecipient = opts.feeRecipient === undefined ? constants.NULL_ADDRESS : opts.feeRecipient;
const txHash = await this._forwarderContract.marketBuyOrdersWithEth.sendTransactionAsync(
params.orders,
orders,
makerAssetFillAmount,
params.signatures,
feeParams.orders,
feeParams.signatures,
orders.map(signedOrder => signedOrder.signature),
feeOrders,
feeOrders.map(signedFeeOrder => signedFeeOrder.signature),
feePercentage,
feeRecipient,
txData,