Skip to content

Commit

Permalink
fix: Prevent arbitrary calls to leverage zappers
Browse files Browse the repository at this point in the history
  • Loading branch information
@bingen
bingen committed Sep 4, 2024
1 parent f196f6e commit 7a422d9
Show file tree
Hide file tree
Showing 6 changed files with 419 additions and 99 deletions.
10 changes: 3 additions & 7 deletions contracts/src/Zappers/Interfaces/IFlashLoanProvider.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ interface IFlashLoanProvider {
LeverDownTrove
}

function makeFlashLoan(
IERC20 _token,
uint256 _amount,
IFlashLoanReceiver _caller,
Operation _operation,
bytes calldata userData
) external;
function receiver() external view returns (IFlashLoanReceiver);

function makeFlashLoan(IERC20 _token, uint256 _amount, Operation _operation, bytes calldata userData) external;
}
5 changes: 4 additions & 1 deletion contracts/src/Zappers/Interfaces/ILeverageZapper.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

pragma solidity ^0.8.0;

import "./IFlashLoanProvider.sol";
import "./IExchange.sol";

interface ILeverageZapper {
Expand Down Expand Up @@ -33,7 +34,9 @@ interface ILeverageZapper {
uint256 minBoldAmount;
}

function exchange() external returns (IExchange);
function flashLoanProvider() external view returns (IFlashLoanProvider);

function exchange() external view returns (IExchange);

function openLeveragedTroveWithRawETH(OpenLeveragedTroveParams calldata _params) external payable;

Expand Down
18 changes: 3 additions & 15 deletions contracts/src/Zappers/LeverageLSTZapper.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@ contract LeverageLSTZapper is GasCompZapper, IFlashLoanReceiver, ILeverageZapper

// Flash loan coll
flashLoanProvider.makeFlashLoan(
collTokenCached,
_params.flashLoanAmount,
IFlashLoanReceiver(address(this)),
IFlashLoanProvider.Operation.OpenTrove,
abi.encode(_params)
collTokenCached, _params.flashLoanAmount, IFlashLoanProvider.Operation.OpenTrove, abi.encode(_params)
);
}

Expand Down Expand Up @@ -120,11 +116,7 @@ contract LeverageLSTZapper is GasCompZapper, IFlashLoanReceiver, ILeverageZapper

// Flash loan coll
flashLoanProvider.makeFlashLoan(
collToken,
_params.flashLoanAmount,
IFlashLoanReceiver(address(this)),
IFlashLoanProvider.Operation.LeverUpTrove,
abi.encode(_params)
collToken, _params.flashLoanAmount, IFlashLoanProvider.Operation.LeverUpTrove, abi.encode(_params)
);
}

Expand Down Expand Up @@ -161,11 +153,7 @@ contract LeverageLSTZapper is GasCompZapper, IFlashLoanReceiver, ILeverageZapper

// Flash loan coll
flashLoanProvider.makeFlashLoan(
collToken,
_params.flashLoanAmount,
IFlashLoanReceiver(address(this)),
IFlashLoanProvider.Operation.LeverDownTrove,
abi.encode(_params)
collToken, _params.flashLoanAmount, IFlashLoanProvider.Operation.LeverDownTrove, abi.encode(_params)
);
}

Expand Down
18 changes: 3 additions & 15 deletions contracts/src/Zappers/LeverageWETHZapper.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,7 @@ contract LeverageWETHZapper is WETHZapper, IFlashLoanReceiver, ILeverageZapper {

// Flash loan coll
flashLoanProvider.makeFlashLoan(
WETHCached,
_params.flashLoanAmount,
IFlashLoanReceiver(address(this)),
IFlashLoanProvider.Operation.OpenTrove,
abi.encode(_params)
WETHCached, _params.flashLoanAmount, IFlashLoanProvider.Operation.OpenTrove, abi.encode(_params)
);
}

Expand Down Expand Up @@ -112,11 +108,7 @@ contract LeverageWETHZapper is WETHZapper, IFlashLoanReceiver, ILeverageZapper {

// Flash loan coll
flashLoanProvider.makeFlashLoan(
WETH,
_params.flashLoanAmount,
IFlashLoanReceiver(address(this)),
IFlashLoanProvider.Operation.LeverUpTrove,
abi.encode(_params)
WETH, _params.flashLoanAmount, IFlashLoanProvider.Operation.LeverUpTrove, abi.encode(_params)
);
}

Expand Down Expand Up @@ -153,11 +145,7 @@ contract LeverageWETHZapper is WETHZapper, IFlashLoanReceiver, ILeverageZapper {

// Flash loan coll
flashLoanProvider.makeFlashLoan(
WETH,
_params.flashLoanAmount,
IFlashLoanReceiver(address(this)),
IFlashLoanProvider.Operation.LeverDownTrove,
abi.encode(_params)
WETH, _params.flashLoanAmount, IFlashLoanProvider.Operation.LeverDownTrove, abi.encode(_params)
);
}

Expand Down
33 changes: 17 additions & 16 deletions contracts/src/Zappers/Modules/FlashLoans/BalancerFlashLoan.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,9 @@ contract BalancerFlashLoan is IFlashLoanRecipient, IFlashLoanProvider {
using SafeERC20 for IERC20;

IVault private constant vault = IVault(0xBA12222222228d8Ba445958a75a0704d566BF2C8);
IFlashLoanReceiver public receiver;

function makeFlashLoan(
IERC20 _token,
uint256 _amount,
IFlashLoanReceiver _caller, // TODO: should it always be msg.sender?
Operation _operation,
bytes calldata _params
) external {
function makeFlashLoan(IERC20 _token, uint256 _amount, Operation _operation, bytes calldata _params) external {
IERC20[] memory tokens = new IERC20[](1);
tokens[0] = _token;
uint256[] memory amounts = new uint256[](1);
Expand All @@ -34,19 +29,22 @@ contract BalancerFlashLoan is IFlashLoanRecipient, IFlashLoanProvider {
if (_operation == Operation.OpenTrove) {
ILeverageZapper.OpenLeveragedTroveParams memory openTroveParams =
abi.decode(_params, (ILeverageZapper.OpenLeveragedTroveParams));
userData = abi.encode(_caller, _operation, openTroveParams);
userData = abi.encode(_operation, openTroveParams);
} else if (_operation == Operation.LeverUpTrove) {
ILeverageZapper.LeverUpTroveParams memory leverUpTroveParams =
abi.decode(_params, (ILeverageZapper.LeverUpTroveParams));
userData = abi.encode(_caller, _operation, leverUpTroveParams);
userData = abi.encode(_operation, leverUpTroveParams);
} else if (_operation == Operation.LeverDownTrove) {
ILeverageZapper.LeverDownTroveParams memory leverDownTroveParams =
abi.decode(_params, (ILeverageZapper.LeverDownTroveParams));
userData = abi.encode(_caller, _operation, leverDownTroveParams);
userData = abi.encode(_operation, leverDownTroveParams);
} else {
revert("LZ: Wrong Operation");
}

// This will be used by the callback below no
receiver = IFlashLoanReceiver(msg.sender);

vault.flashLoan(this, tokens, amounts, userData);
}

Expand All @@ -57,16 +55,16 @@ contract BalancerFlashLoan is IFlashLoanRecipient, IFlashLoanProvider {
bytes calldata userData
) external override {
require(msg.sender == address(vault), "Caller is not Vault");
require(address(receiver) != address(0), "Flash loan not properly initiated");

// decode receiver and operation
IFlashLoanReceiver receiver = IFlashLoanReceiver(abi.decode(userData[0:32], (address)));
Operation operation = abi.decode(userData[32:64], (Operation));
// decode and operation
Operation operation = abi.decode(userData[0:32], (Operation));

if (operation == Operation.OpenTrove) {
// Open
// decode params
ILeverageZapper.OpenLeveragedTroveParams memory openTroveParams =
abi.decode(userData[64:], (ILeverageZapper.OpenLeveragedTroveParams));
abi.decode(userData[32:], (ILeverageZapper.OpenLeveragedTroveParams));
// Flash loan minus fees
uint256 effectiveFlashLoanAmount = amounts[0] - feeAmounts[0];
// We send only effective flash loan, keeping fees here
Expand All @@ -77,7 +75,7 @@ contract BalancerFlashLoan is IFlashLoanRecipient, IFlashLoanProvider {
// Lever up
// decode params
ILeverageZapper.LeverUpTroveParams memory leverUpTroveParams =
abi.decode(userData[64:], (ILeverageZapper.LeverUpTroveParams));
abi.decode(userData[32:], (ILeverageZapper.LeverUpTroveParams));
// Flash loan minus fees
uint256 effectiveFlashLoanAmount = amounts[0] - feeAmounts[0];
// We send only effective flash loan, keeping fees here
Expand All @@ -88,7 +86,7 @@ contract BalancerFlashLoan is IFlashLoanRecipient, IFlashLoanProvider {
// Lever down
// decode params
ILeverageZapper.LeverDownTroveParams memory leverDownTroveParams =
abi.decode(userData[64:], (ILeverageZapper.LeverDownTroveParams));
abi.decode(userData[32:], (ILeverageZapper.LeverDownTroveParams));
// Flash loan minus fees
uint256 effectiveFlashLoanAmount = amounts[0] - feeAmounts[0];
// We send only effective flash loan, keeping fees here
Expand All @@ -101,5 +99,8 @@ contract BalancerFlashLoan is IFlashLoanRecipient, IFlashLoanProvider {

// Return flash loan
tokens[0].safeTransfer(address(vault), amounts[0] + feeAmounts[0]);

// Reset receiver
receiver = IFlashLoanReceiver(address(0));
}
}
Loading

0 comments on commit 7a422d9

Please sign in to comment.