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

Remove wethAssetProxy and wethAssetData from staking contract

Browse Source
This commit is contained in:
Amir Bandeali
2019-09-29 15:45:08 -07:00
parent d21f978def
commit 57ca601be1
2 changed files with 7 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/staking/contracts/src/fees/MixinExchangeFees.sol
View File

@@ -56,11 +56,13 @@ contract MixinExchangeFees is
// Transfer the protocol fee to this address if it should be paid in // Transfer the protocol fee to this address if it should be paid in
// WETH. // WETH.
if (msg.value == 0) { if (msg.value == 0) {
getWethAssetProxy().transferFrom( require(
getWethAssetData(), getWethContract().transferFrom(
payerAddress, payerAddress,
address(this), address(this),
protocolFeePaid protocolFeePaid
),
"WETH_TRANSFER_FAILED"
); );
} }

35
contracts/staking/contracts/src/immutable/MixinDeploymentConstants.sol
View File

@@ -18,7 +18,6 @@
pragma solidity ^0.5.9; pragma solidity ^0.5.9;
import "@0x/contracts-asset-proxy/contracts/src/interfaces/IAssetProxy.sol";
import "@0x/contracts-erc20/contracts/src/interfaces/IEtherToken.sol"; import "@0x/contracts-erc20/contracts/src/interfaces/IEtherToken.sol";
import "../interfaces/IZrxVault.sol"; import "../interfaces/IZrxVault.sol";
@@ -37,17 +36,7 @@ contract MixinDeploymentConstants {
// Ropsten & Rinkeby WETH9 Address // Ropsten & Rinkeby WETH9 Address
// address constant private WETH_ADDRESS = address(0xc778417e063141139fce010982780140aa0cd5ab); // address constant private WETH_ADDRESS = address(0xc778417e063141139fce010982780140aa0cd5ab);
// Mainnet Weth Asset Data
bytes constant private WETH_ASSET_DATA = hex"f47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2";
// Kovan Weth Asset Data
// bytes constant private WETH_ASSET_DATA = hex"f47261b0000000000000000000000000d0a1e359811322d97991e03f863a0c30c2cf029c";
// Ropsten & Rinkeby Weth Asset Data
// bytes constant private WETH_ASSET_DATA = hex"f47261b0000000000000000000000000c778417e063141139fce010982780140aa0cd5ab";
// @TODO SET THESE VALUES FOR DEPLOYMENT // @TODO SET THESE VALUES FOR DEPLOYMENT
address constant private WETH_ASSET_PROXY_ADDRESS = address(1);
address constant private ZRX_VAULT_ADDRESS = address(1); address constant private ZRX_VAULT_ADDRESS = address(1);
/// @dev An overridable way to access the deployed WETH contract. /// @dev An overridable way to access the deployed WETH contract.
@@ -62,30 +51,6 @@ contract MixinDeploymentConstants {
return wethContract; return wethContract;
} }
/// @dev An overridable way to access the deployed WETH assetData.
/// Must be view to allow overrides to access state.
/// @return wethAssetData The assetData of the configured WETH contract.
function getWethAssetData()
public
view
returns (bytes memory wethAssetData)
{
wethAssetData = WETH_ASSET_DATA;
return wethAssetData;
}
/// @dev An overridable way to access the deployed WETH assetProxy.
/// Must be view to allow overrides to access state.
/// @return wethAssetProxy The assetProxy used to transfer WETH.
function getWethAssetProxy()
public
view
returns (IAssetProxy wethAssetProxy)
{
wethAssetProxy = IAssetProxy(WETH_ASSET_PROXY_ADDRESS);
return wethAssetProxy;
}
/// @dev An overridable way to access the deployed zrxVault. /// @dev An overridable way to access the deployed zrxVault.
/// Must be view to allow overrides to access state. /// Must be view to allow overrides to access state.
/// @return zrxVault The zrxVault contract. /// @return zrxVault The zrxVault contract.