Skip to content

Commit

Permalink
Fixed up some param names
Browse files Browse the repository at this point in the history
  • Loading branch information
asselstine committed Jun 6, 2022
1 parent 4c004d0 commit 1e23473
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
22 changes: 11 additions & 11 deletions contracts/PrizePoolLiquidator.sol
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,21 @@ contract PrizePoolLiquidator {
IPrizePoolLiquidatorListener public listener;

function setPrizePool(
IPrizePool pool,
address target,
IERC20 want,
IPrizePool _pool,
address _target,
IERC20 _want,
uint32 _swapMultiplier,
uint32 _liquidityFraction,
uint192 _reserveA,
uint192 _reserveB
) external returns (bool) {
poolLiquidatorConfigs[pool] = LiquidatorConfig({
target: target,
want: want,
poolLiquidatorConfigs[_pool] = LiquidatorConfig({
target: _target,
want: _want,
swapMultiplier: _swapMultiplier,
liquidityFraction: _liquidityFraction
});
poolLiquidatorStates[pool] = LiquidatorState({
poolLiquidatorStates[_pool] = LiquidatorState({
reserveA: _reserveA,
reserveB: _reserveB
});
Expand All @@ -73,19 +73,19 @@ contract PrizePoolLiquidator {
return (reserveA*1e18) / reserveB;
}

function computeExactAmountIn(IPrizePool _prizePool, uint256 amountOut) external returns (uint256) {
function computeExactAmountIn(IPrizePool _prizePool, uint256 _amountOut) external returns (uint256) {
LiquidatorConfig memory config = poolLiquidatorConfigs[_prizePool];
LiquidatorState memory state = poolLiquidatorStates[_prizePool];
return LiquidatorLib.computeExactAmountIn(
state.reserveA, state.reserveB, _availableStreamHaveBalance(_prizePool), amountOut, config.swapMultiplier, config.liquidityFraction
state.reserveA, state.reserveB, _availableStreamHaveBalance(_prizePool), _amountOut, config.swapMultiplier, config.liquidityFraction
);
}

function computeExactAmountOut(IPrizePool _prizePool, uint256 amountIn) external returns (uint256) {
function computeExactAmountOut(IPrizePool _prizePool, uint256 _amountIn) external returns (uint256) {
LiquidatorConfig memory config = poolLiquidatorConfigs[_prizePool];
LiquidatorState memory state = poolLiquidatorStates[_prizePool];
return LiquidatorLib.computeExactAmountOut(
state.reserveA, state.reserveB, _availableStreamHaveBalance(_prizePool), amountIn, config.swapMultiplier, config.liquidityFraction
state.reserveA, state.reserveB, _availableStreamHaveBalance(_prizePool), _amountIn, config.swapMultiplier, config.liquidityFraction
);
}

Expand Down
22 changes: 11 additions & 11 deletions contracts/libraries/LiquidatorLib.sol
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ library LiquidatorLib {
function prepareSwap(
uint256 _reserveA,
uint256 _reserveB,
uint256 availableBalance
uint256 _availableBalance
) internal pure returns (uint256 reserveA, uint256 reserveB) {

// swap back yield
uint256 wantAmount = CpmmLib.getAmountOut(availableBalance, _reserveA, _reserveB);
uint256 wantAmount = CpmmLib.getAmountOut(_availableBalance, _reserveA, _reserveB);
reserveB = _reserveB.sub(wantAmount);
reserveA = _reserveA.add(availableBalance);
reserveA = _reserveA.add(_availableBalance);
}

function _finishSwap(
Expand All @@ -77,22 +77,22 @@ library LiquidatorLib {
function swapExactAmountIn(
uint256 _reserveA,
uint256 _reserveB,
uint256 availableBalance,
uint256 amountIn,
uint256 _availableBalance,
uint256 _amountIn,
uint32 _swapMultiplier,
uint32 _liquidityFraction
) internal view returns (uint256 reserveA, uint256 reserveB, uint256 amountOut) {
require(availableBalance > 0, "Whoops! no funds available");
require(_availableBalance > 0, "Whoops! no funds available");

(reserveA, reserveB) = prepareSwap(_reserveA, _reserveB, availableBalance);
(reserveA, reserveB) = prepareSwap(_reserveA, _reserveB, _availableBalance);

// do swap
amountOut = CpmmLib.getAmountOut(amountIn, reserveB, reserveA);
require(amountOut <= availableBalance, "Whoops! have exceeds available");
reserveB = reserveB.add(amountIn);
amountOut = CpmmLib.getAmountOut(_amountIn, reserveB, reserveA);
require(amountOut <= _availableBalance, "Whoops! have exceeds available");
reserveB = reserveB.add(_amountIn);
reserveA = reserveA.sub(amountOut);

(reserveA, reserveB) = _finishSwap(reserveA, reserveB, availableBalance, amountOut, _swapMultiplier, _liquidityFraction);
(reserveA, reserveB) = _finishSwap(reserveA, reserveB, _availableBalance, amountOut, _swapMultiplier, _liquidityFraction);
}

function swapExactAmountOut(
Expand Down

0 comments on commit 1e23473

Please sign in to comment.