diff --git a/contracts/Oracle.sol b/contracts/Oracle.sol index d0504af..37d1849 100644 --- a/contracts/Oracle.sol +++ b/contracts/Oracle.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT + pragma solidity 0.8.20; import "@openzeppelin/contracts/access/AccessControl.sol"; diff --git a/contracts/Vault.sol b/contracts/Vault.sol index 6e4befb..4e54ba3 100644 --- a/contracts/Vault.sol +++ b/contracts/Vault.sol @@ -1,11 +1,5 @@ // SPDX-License-Identifier: MIT -/** - * NOTE - * Always do additions first - * Check if the substracting value is greater than or less than the added values i.e check for a negative result - */ - pragma solidity ^0.8.20; import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol"; @@ -112,14 +106,14 @@ contract Vault is address _oracle, IERC20 _collateral, address _zusd - ) external reinitializer(3) { + ) external initializer { TxPaused = false; Oracle = _oracle; collateral = _collateral; zUSD = _zusd; COLLATERIZATION_RATIO_THRESHOLD = 15 * 1e2; LIQUIDATION_REWARD = 15; - treasuryWallet = 0xd7FA3f5f3f857FEDE4eD6E396C0afE2C5716055a; + treasuryWallet = _admin; swapFee = WadRayMath.wadDiv(8, 1000); globalMintersPercentOfSwapFee = WadRayMath.wadDiv(1, 2); treasuryPercentOfSwapFee = WadRayMath.wadDiv(1, 2); @@ -951,5 +945,5 @@ contract Vault is return true; } - uint256[48] private __gap; + uint256[50] private __gap; } diff --git a/contracts/interfaces/BakiOracleInterface.sol b/contracts/interfaces/BakiOracleInterface.sol index fb9e58b..54ee596 100644 --- a/contracts/interfaces/BakiOracleInterface.sol +++ b/contracts/interfaces/BakiOracleInterface.sol @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT + pragma solidity 0.8.20; /** * @dev Oracle interface @@ -8,7 +9,6 @@ interface BakiOracleInterface { * @dev get each exRates */ - function getZTokenUSDValue(string calldata _name) external view returns(uint256); function getZToken(string calldata _name) external view returns(address); @@ -16,4 +16,5 @@ interface BakiOracleInterface { function getZTokenList() external view returns(string[] memory); function collateralUSD() external view returns (uint256); + } \ No newline at end of file