Diff
checker
Texte
Texte
Images
Documents
Excel
Dossiers
Legal
Enterprise
Application de bureau
Prix
Se connecter
Télécharger Diffchecker Desktop
Comparer le texte
Trouver la différence entre deux fichiers texte
Outils
Historique
Éditeur live
Masquer les espaces
Cacher identiques
Sans retour à la ligne
Vue
Divisé
Unifié
Niveau de précision
Intelligent
Mot
Caractère
Styles de texte
Modifier l’apparence
Coloration syntaxique
Choisir la syntaxe
Ignorer
Transformer le texte
Aller au premier écart
Modifier l'entrée
Diffchecker Desktop
La façon la plus sécurisée d'utiliser Diffchecker. Obtenez l'application Diffchecker Desktop : vos diffs ne quittent jamais votre ordinateur !
Obtenir Desktop
ORACLE
Créé
l’année dernière
Le diff n'expire jamais
Effacer
Exporter
Partager
Expliquer
74 suppressions
Lignes
Total
Supprimé
Caractères
Total
Supprimé
Pour continuer à utiliser cette fonctionnalité, passez à
Diff
checker
Pro
Voir les prix
82 lignes
Copier tout
48 ajouts
Lignes
Total
Ajouté
Caractères
Total
Ajouté
Pour continuer à utiliser cette fonctionnalité, passez à
Diff
checker
Pro
Voir les prix
61 lignes
Copier tout
Copier
Copié
Copier
Copié
contract Oracle is
Epoch {
contract Oracle is
Operator {
using FixedPoint for *;
using SafeMath for uint256;
using SafeMath for uint256;
Copier
Copié
Copier
Copié
/* ========== STATE VARIABLES ========== */
// uniswap
address public token0;
address public token0;
address public token1;
address public token1;
Copier
Copié
Copier
Copié
IUniswapV2Pair
public pair;
IPool
public pair;
// oracle
uint32 public blockTimestampLast;
uint256 public price0CumulativeLast;
uint256 public price1CumulativeLast;
FixedPoint.uq112x112 public price0Average;
FixedPoint.uq112x112 public price1Average;
/* ========== CONSTRUCTOR ========== */
Copier
Copié
Copier
Copié
constructor(
constructor(
IPool
_pair
) public
{
IUniswapV2Pair
_pair
,
uint256 _period,
uint256 _startTime
) public
Epoch(_period, _startTime, 0)
{
pair = _pair;
pair = _pair;
token0 = pair.token0();
token0 = pair.token0();
token1 = pair.token1();
token1 = pair.token1();
Copier
Copié
Copier
Copié
price0CumulativeLast = pair.price0CumulativeLast(); // fetch the current accumulated price value (1 / 0)
uint
256
reserve0;
price1CumulativeLast = pair.price1CumulativeLast(); // fetch the current accumulated price value (0 / 1)
uint
256
reserve1;
uint
112
reserve0;
(reserve0, reserve1,
) = pair.getReserves();
uint
112
reserve1;
require(reserve0 != 0 && reserve1 != 0, "Oracle:
No reserves");
(reserve0, reserve1,
blockTimestampLast
) = pair.getReserves();
require(reserve0 != 0 && reserve1 != 0, "Oracle:
NO_RESERVES"); // ensure that there's liquidity in the pair
}
}
Copier
Copié
Copier
Copié
/* ========== MUTABLE FUNCTIONS ========== */
function update() external
{
pair.sync();
/** @dev Updates 1-day EMA price from Uniswap. */
function update() external
checkEpoch
{
(uint256 price0Cumulative, uint256 price1Cumulative, uint32 blockTimestamp) = UniswapV2OracleLibrary.currentCumulativePrices(address(pair));
uint32 timeElapsed = blockTimestamp - blockTimestampLast; // overflow is desired
if (timeElapsed == 0) {
// prevent divided by zero
return;
}
// overflow is desired, casting never truncates
// cumulative price is in (uq112x112 price * seconds) units so we simply wrap it after division by time elapsed
price0Average = FixedPoint.uq112x112(uint224((price0Cumulative - price0CumulativeLast) / timeElapsed));
price1Average = FixedPoint.uq112x112(uint224((price1Cumulative - price1CumulativeLast) / timeElapsed));
price0CumulativeLast = price0Cumulative;
price1CumulativeLast = price1Cumulative;
blockTimestampLast = blockTimestamp;
emit Updated(price0Cumulative, price1Cumulative);
}
}
Copier
Copié
Copier
Copié
// note this will always return 0 before update has been called successfully for the first time.
function consult(
function consult(
address _token,
uint256 _amountIn
) external view returns (
uint144
amountOut) {
address _token,
uint256 _amountIn
) external view returns (
uint256
amountOut) {
if (_token == token0) {
if (_token == token0) {
Copier
Copié
Copier
Copié
amountOut =
price0Average.mul(
_amountIn
).decode144(
);
amountOut =
_quote(_token,
_amountIn
, 12
);
} else {
} else {
Copier
Copié
Copier
Copié
require(_token == token1, "Oracle:
INVALID_TOKEN
");
require(_token == token1, "Oracle:
Invalid token
");
amountOut =
price1Average.mul(
_amountIn
).decode144(
);
amountOut =
_quote(_token,
_amountIn
, 12
);
}
}
}
}
Copier
Copié
Copier
Copié
function twap(
address _token,
uint256 _amountIn
) external view returns (
uint144 _
amountOut) {
function twap(
(uint256 price0Cumulative, uint256 price1Cumulative, uint32 blockTimestamp) = UniswapV2OracleLibrary.currentCumulativePrices(address(pair));
address _token,
uint32 timeElapsed = blockTimestamp - blockTimestampLast; // overflow is desired
uint256 _amountIn
) external view returns (
uint256
amountOut) {
if (_token == token0) {
if (_token == token0) {
Copier
Copié
Copier
Copié
_
amountOut =
FixedPoint.uq112x112(uint224((price0Cumulative - price0CumulativeLast) / timeElapsed)).mul(
_amountIn
).decode144(
);
amountOut =
_quote(_token,
_amountIn
, 2
);
} else
if
(_token == token1
) {
} else
{
_
amountOut =
FixedPoint.uq112x112(uint224((price1Cumulative - price1CumulativeLast) / timeElapsed)).mul(
_amountIn
).decode144(
);
require
(_token == token1
, "Oracle: Invalid token");
amountOut =
_quote(_token,
_amountIn
, 2
);
}
}
}
}
Copier
Copié
Copier
Copié
event Updated(uint256 price0CumulativeLast, uint256 price1CumulativeLast);
// Note the window parameter is removed as its always 1 (30min), granularity at 12 for example is (12 * 30min) = 6 hours
function _quote(
address tokenIn,
uint256 amountIn,
uint256 granularity // number of observations to query
) internal view returns (uint256 amountOut) {
uint256 observationLength = IPool(pair).observationLength();
require(
granularity <= observationLength,
"Oracle: Not enough observations"
);
uint256 price = IPool(pair).quote(tokenIn, amountIn, granularity);
amountOut = price;
}
}
}
Différences enregistrées
Texte d'origine
Ouvrir un fichier
contract Oracle is Epoch { using FixedPoint for *; using SafeMath for uint256; /* ========== STATE VARIABLES ========== */ // uniswap address public token0; address public token1; IUniswapV2Pair public pair; // oracle uint32 public blockTimestampLast; uint256 public price0CumulativeLast; uint256 public price1CumulativeLast; FixedPoint.uq112x112 public price0Average; FixedPoint.uq112x112 public price1Average; /* ========== CONSTRUCTOR ========== */ constructor( IUniswapV2Pair _pair, uint256 _period, uint256 _startTime ) public Epoch(_period, _startTime, 0) { pair = _pair; token0 = pair.token0(); token1 = pair.token1(); price0CumulativeLast = pair.price0CumulativeLast(); // fetch the current accumulated price value (1 / 0) price1CumulativeLast = pair.price1CumulativeLast(); // fetch the current accumulated price value (0 / 1) uint112 reserve0; uint112 reserve1; (reserve0, reserve1, blockTimestampLast) = pair.getReserves(); require(reserve0 != 0 && reserve1 != 0, "Oracle: NO_RESERVES"); // ensure that there's liquidity in the pair } /* ========== MUTABLE FUNCTIONS ========== */ /** @dev Updates 1-day EMA price from Uniswap. */ function update() external checkEpoch { (uint256 price0Cumulative, uint256 price1Cumulative, uint32 blockTimestamp) = UniswapV2OracleLibrary.currentCumulativePrices(address(pair)); uint32 timeElapsed = blockTimestamp - blockTimestampLast; // overflow is desired if (timeElapsed == 0) { // prevent divided by zero return; } // overflow is desired, casting never truncates // cumulative price is in (uq112x112 price * seconds) units so we simply wrap it after division by time elapsed price0Average = FixedPoint.uq112x112(uint224((price0Cumulative - price0CumulativeLast) / timeElapsed)); price1Average = FixedPoint.uq112x112(uint224((price1Cumulative - price1CumulativeLast) / timeElapsed)); price0CumulativeLast = price0Cumulative; price1CumulativeLast = price1Cumulative; blockTimestampLast = blockTimestamp; emit Updated(price0Cumulative, price1Cumulative); } // note this will always return 0 before update has been called successfully for the first time. function consult(address _token, uint256 _amountIn) external view returns (uint144 amountOut) { if (_token == token0) { amountOut = price0Average.mul(_amountIn).decode144(); } else { require(_token == token1, "Oracle: INVALID_TOKEN"); amountOut = price1Average.mul(_amountIn).decode144(); } } function twap(address _token, uint256 _amountIn) external view returns (uint144 _amountOut) { (uint256 price0Cumulative, uint256 price1Cumulative, uint32 blockTimestamp) = UniswapV2OracleLibrary.currentCumulativePrices(address(pair)); uint32 timeElapsed = blockTimestamp - blockTimestampLast; // overflow is desired if (_token == token0) { _amountOut = FixedPoint.uq112x112(uint224((price0Cumulative - price0CumulativeLast) / timeElapsed)).mul(_amountIn).decode144(); } else if (_token == token1) { _amountOut = FixedPoint.uq112x112(uint224((price1Cumulative - price1CumulativeLast) / timeElapsed)).mul(_amountIn).decode144(); } } event Updated(uint256 price0CumulativeLast, uint256 price1CumulativeLast); }
Texte modifié
Ouvrir un fichier
contract Oracle is Operator { using SafeMath for uint256; address public token0; address public token1; IPool public pair; constructor(IPool _pair) public { pair = _pair; token0 = pair.token0(); token1 = pair.token1(); uint256 reserve0; uint256 reserve1; (reserve0, reserve1, ) = pair.getReserves(); require(reserve0 != 0 && reserve1 != 0, "Oracle: No reserves"); } function update() external { pair.sync(); } function consult( address _token, uint256 _amountIn ) external view returns (uint256 amountOut) { if (_token == token0) { amountOut = _quote(_token, _amountIn, 12); } else { require(_token == token1, "Oracle: Invalid token"); amountOut = _quote(_token, _amountIn, 12); } } function twap( address _token, uint256 _amountIn ) external view returns (uint256 amountOut) { if (_token == token0) { amountOut = _quote(_token, _amountIn, 2); } else { require(_token == token1, "Oracle: Invalid token"); amountOut = _quote(_token, _amountIn, 2); } } // Note the window parameter is removed as its always 1 (30min), granularity at 12 for example is (12 * 30min) = 6 hours function _quote( address tokenIn, uint256 amountIn, uint256 granularity // number of observations to query ) internal view returns (uint256 amountOut) { uint256 observationLength = IPool(pair).observationLength(); require( granularity <= observationLength, "Oracle: Not enough observations" ); uint256 price = IPool(pair).quote(tokenIn, amountIn, granularity); amountOut = price; } }
Trouver la différence