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

Proxy Metadata -> Data

Browse Source
This commit is contained in:
Greg Hysen
2018-04-11 13:14:12 -07:00
committed by Amir Bandeali
parent f559a5510b
commit 326d8d3976
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol
View File

@@ -36,12 +36,12 @@ contract Exchange is
function Exchange(
IToken _zrxToken,
bytes _zrxProxyMetadata,
bytes _zrxProxyData,
IAssetProxy _assetProxyDispatcher)
public
MixinExchangeCore()
MixinSignatureValidator()
MixinSettlementProxy(_assetProxyDispatcher, _zrxToken, _zrxProxyMetadata)
MixinSettlementProxy(_assetProxyDispatcher, _zrxToken, _zrxProxyData)
MixinWrapperFunctions()
{}
}

14
packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol
View File

@@ -30,7 +30,7 @@ contract MixinSettlementProxy is
LibPartialAmount
{
IAssetProxy TRANSFER_PROXY;
bytes ZRX_PROXY_METADATA;
bytes ZRX_PROXY_DATA;
IToken ZRX_TOKEN;
function transferProxy()
@@ -47,22 +47,22 @@ contract MixinSettlementProxy is
return ZRX_TOKEN;
}
function zrxProxyMetadata()
function zrxProxyData()
external view
returns (bytes)
{
return ZRX_PROXY_METADATA;
return ZRX_PROXY_DATA;
}
function MixinSettlementProxy(
IAssetProxy assetProxyDispatcherContract,
IToken zrxToken,
bytes zrxProxyMetadata)
bytes zrxProxyData)
public
{
ZRX_TOKEN = zrxToken;
TRANSFER_PROXY = assetProxyDispatcherContract;
ZRX_PROXY_METADATA = zrxProxyMetadata;
ZRX_PROXY_DATA = zrxProxyData;
}
function settleOrder(
@@ -93,7 +93,7 @@ contract MixinSettlementProxy is
if (order.makerFee > 0) {
makerFeePaid = getPartialAmount(takerTokenFilledAmount, order.takerTokenAmount, order.makerFee);
TRANSFER_PROXY.transferFrom(
ZRX_PROXY_METADATA,
ZRX_PROXY_DATA,
order.makerAddress,
order.feeRecipientAddress,
makerFeePaid
@@ -102,7 +102,7 @@ contract MixinSettlementProxy is
if (order.takerFee > 0) {
takerFeePaid = getPartialAmount(takerTokenFilledAmount, order.takerTokenAmount, order.takerFee);
TRANSFER_PROXY.transferFrom(
ZRX_PROXY_METADATA,
ZRX_PROXY_DATA,
takerAddress,
order.feeRecipientAddress,
takerFeePaid