diff --git a/contracts/UniswapV2.sol b/contracts/UniswapV2.sol index e0e7bc2..4c9c78e 100644 --- a/contracts/UniswapV2.sol +++ b/contracts/UniswapV2.sol @@ -29,9 +29,8 @@ contract UniswapV2 is IUniswapV2, ERC20("Uniswap V2", "UNI-V2", 18, 0), SafeTran address public token1; TokenData private reserves; - - OracleData public oracleDataToken0; - OracleData public oracleDataToken1; + OracleData private oracleDataToken0; + OracleData private oracleDataToken1; bool private notEntered = true; modifier lock() { diff --git a/contracts/interfaces/IUniswapV2.sol b/contracts/interfaces/IUniswapV2.sol index e323808..caf030e 100644 --- a/contracts/interfaces/IUniswapV2.sol +++ b/contracts/interfaces/IUniswapV2.sol @@ -34,8 +34,9 @@ interface IUniswapV2 { function token1() external view returns (address); function getReserves() external view returns (uint128, uint128); - function getAccumulatedPrices() external view returns (uint256, uint256); - function getBlockNumberLast() external view returns (uint32); + function readOraclePricesAccumulated() external view returns (uint240, uint240); + function readOracleBlockNumber() external view returns (uint32); + function consultOracle() external view returns (uint240, uint240); function getAmountOutput(uint128 amountInput, uint128 reserveInput, uint128 reserveOutput) external pure returns (uint128 amountOutput);