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

Renamed IVault to IZrxVault

Browse Source
This commit is contained in:
Greg Hysen
2019-06-25 15:26:45 -07:00
parent cae8c2013d
commit 9566188d6b
6 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/staking/contracts/src/core/MixinFees.sol
View File

@@ -20,7 +20,6 @@ pragma solidity ^0.5.5;
import "../libs/LibSafeMath.sol"; import "../libs/LibSafeMath.sol";
import "../libs/LibFeeMath.sol"; import "../libs/LibFeeMath.sol";
import "../interfaces/IVault.sol";
import "../immutable/MixinStorage.sol"; import "../immutable/MixinStorage.sol";
import "../immutable/MixinConstants.sol"; import "../immutable/MixinConstants.sol";
import "../interfaces/IStakingEvents.sol"; import "../interfaces/IStakingEvents.sol";

4
contracts/staking/contracts/src/core/MixinZrxVault.sol
View File

@@ -18,7 +18,7 @@
pragma solidity ^0.5.5; pragma solidity ^0.5.5;
import "../interfaces/IVault.sol"; import "../interfaces/IZrxVault.sol";
import "../immutable/MixinStorage.sol"; import "../immutable/MixinStorage.sol";
@@ -30,7 +30,7 @@ contract MixinZrxVault is
external external
// onlyOwner // onlyOwner
{ {
zrxVault = IVault(_zrxVault); zrxVault = IZrxVault(_zrxVault);
} }
function getZrxVault() function getZrxVault()

13
contracts/staking/contracts/src/immutable/MixinStorage.sol
View File

@@ -18,7 +18,7 @@
pragma solidity ^0.5.5; pragma solidity ^0.5.5;
import "../interfaces/IVault.sol"; import "../interfaces/IZrxVault.sol";
import "../interfaces/IRewardVault.sol"; import "../interfaces/IRewardVault.sol";
import "./MixinConstants.sol"; import "./MixinConstants.sol";
import "../interfaces/IStructs.sol"; import "../interfaces/IStructs.sol";
@@ -100,17 +100,8 @@ contract MixinStorage is
// registrered 0x exchanges // registrered 0x exchanges
mapping (address => bool) validExchanges; mapping (address => bool) validExchanges;
/*
// mapping from Owner to Pool Id to Amount Delegated
mapping (address => mapping (bytes32 => uint256)) shadowDelegatedStakeToPoolByOwner;
// mapping from Pool Id to Amount Delegated
mapping (bytes32 => uint256) shadowDelegatedStakeByPoolId;
*/
// ZRX vault // ZRX vault
IVault zrxVault; IZrxVault zrxVault;
// Rebate Vault // Rebate Vault
IRewardVault rewardVault; IRewardVault rewardVault;

2
contracts/staking/contracts/src/interfaces/IVault.sol → contracts/staking/contracts/src/interfaces/IZrxVault.sol
View File

@@ -19,7 +19,7 @@
pragma solidity ^0.5.5; pragma solidity ^0.5.5;
interface IVault { interface IZrxVault {
function depositFrom(address owner, uint256 amount) external; function depositFrom(address owner, uint256 amount) external;
function withdrawFrom(address owner, uint256 amount) external; function withdrawFrom(address owner, uint256 amount) external;

1
contracts/staking/contracts/src/vaults/RewardVault.sol
View File

@@ -18,7 +18,6 @@
pragma solidity ^0.5.5; pragma solidity ^0.5.5;
import "../interfaces/IVault.sol";
import "../libs/LibSafeMath.sol"; import "../libs/LibSafeMath.sol";
import "../libs/LibSafeMath96Bit.sol"; import "../libs/LibSafeMath96Bit.sol";
import "./MixinVaultCore.sol"; import "./MixinVaultCore.sol";

4
contracts/staking/contracts/src/vaults/ZrxVault.sol
View File

@@ -18,7 +18,7 @@
pragma solidity ^0.5.5; pragma solidity ^0.5.5;
import "../interfaces/IVault.sol"; import "../interfaces/IZrxVault.sol";
import "../interfaces/IAssetProxy.sol"; import "../interfaces/IAssetProxy.sol";
import "@0x/contracts-utils/contracts/src/SafeMath.sol"; import "@0x/contracts-utils/contracts/src/SafeMath.sol";
import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol"; import "@0x/contracts-erc20/contracts/src/interfaces/IERC20Token.sol";
@@ -26,7 +26,7 @@ import "./MixinVaultCore.sol";
contract ZrxVault is contract ZrxVault is
IVault, IZrxVault,
SafeMath, SafeMath,
MixinVaultCore MixinVaultCore
{ {