diff options
| author | Greg Hysen <greg.hysen@gmail.com> | 2018-04-12 04:14:12 +0800 |
|---|---|---|
| committer | Amir Bandeali <abandeali1@gmail.com> | 2018-04-21 04:56:17 +0800 |
| commit | 326d8d3976c2695ac574c6889bfed22ebf2b36a4 (patch) | |
| tree | db4223eed25d647998d9a335f26f50516c6ff459 /packages | |
| parent | f559a5510ba04d14cd93f8271b4e4bae722c70ba (diff) | |
| download | dexon-sol-tools-326d8d3976c2695ac574c6889bfed22ebf2b36a4.tar dexon-sol-tools-326d8d3976c2695ac574c6889bfed22ebf2b36a4.tar.gz dexon-sol-tools-326d8d3976c2695ac574c6889bfed22ebf2b36a4.tar.bz2 dexon-sol-tools-326d8d3976c2695ac574c6889bfed22ebf2b36a4.tar.lz dexon-sol-tools-326d8d3976c2695ac574c6889bfed22ebf2b36a4.tar.xz dexon-sol-tools-326d8d3976c2695ac574c6889bfed22ebf2b36a4.tar.zst dexon-sol-tools-326d8d3976c2695ac574c6889bfed22ebf2b36a4.zip | |
Proxy Metadata -> Data
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol | 4 | ||||
| -rw-r--r-- | packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol b/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol index 9f5573dae..9abc19b86 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/Exchange.sol @@ -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() {} } diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol index 8ffbbf434..e8a7a148f 100644 --- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol +++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol @@ -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 |