Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/solhint fixes #4

Merged
merged 2 commits into from
Jul 21, 2022
Merged

Feat/solhint fixes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a64b468
Update yarn.lock
mariano-perez-rodriguez Jul 21, 2022
56b15ac
Silence Solhint warnings by either ignoring or acting upong them
mariano-perez-rodriguez Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/AutoCompounder.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import "@openzeppelin/contracts_latest/access/Ownable.sol";
contract AutoCompounder is
Ownable
{
IPeronio peronio;
IPeronio internal peronio;

uint256 public lastExecuted;

Expand Down
20 changes: 10 additions & 10 deletions contracts/IPeronio.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
pragma solidity ^0.8.2;

interface IPeronio {
function USDC_ADDRESS() external view returns (address usdcAddress);
function USDC_ADDRESS() external view returns (address usdcAddress); // solhint-disable-line func-name-mixedcase

function MAI_ADDRESS() external view returns (address maiAddress);
function MAI_ADDRESS() external view returns (address maiAddress); // solhint-disable-line func-name-mixedcase

function LP_ADDRESS() external view returns (address lpAddress);
function LP_ADDRESS() external view returns (address lpAddress); // solhint-disable-line func-name-mixedcase

function QI_ADDRESS() external view returns (address qiAddress);
function QI_ADDRESS() external view returns (address qiAddress); // solhint-disable-line func-name-mixedcase

function QUICKSWAP_ROUTER_ADDRESS() external view returns (address quickSwapRouterAddress);
function QUICKSWAP_ROUTER_ADDRESS() external view returns (address quickSwapRouterAddress); // solhint-disable-line func-name-mixedcase

function QIDAO_FARM_ADDRESS() external view returns (address qiDaoFarmAddress);
function QIDAO_FARM_ADDRESS() external view returns (address qiDaoFarmAddress); // solhint-disable-line func-name-mixedcase

function QIDAO_POOL_ID() external view returns (uint256 qiDaoPoolId);
function QIDAO_POOL_ID() external view returns (uint256 qiDaoPoolId); // solhint-disable-line func-name-mixedcase

// Markup
function MARKUP_DECIMALS() external view returns (uint8 decimals_);
function MARKUP_DECIMALS() external view returns (uint8 decimals_); // solhint-disable-line func-name-mixedcase

function markup() external view returns (uint256 markup_);

Expand All @@ -27,9 +27,9 @@ interface IPeronio {
function initialized() external view returns (bool initialized_);

// Roles
function MARKUP_ROLE() external view returns (bytes32 roleId);
function MARKUP_ROLE() external view returns (bytes32 roleId); // solhint-disable-line func-name-mixedcase

function REWARDS_ROLE() external view returns (bytes32 roleId);
function REWARDS_ROLE() external view returns (bytes32 roleId); // solhint-disable-line func-name-mixedcase

// Events
event Initialized(address owner, uint256 collateral, uint256 startingRatio);
Expand Down
18 changes: 9 additions & 9 deletions contracts/Peronio.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,21 @@ contract Peronio is
using SafeERC20 for IERC20;

// USDC Token Address
address public immutable override USDC_ADDRESS;
address public immutable override USDC_ADDRESS; // solhint-disable-line var-name-mixedcase
// MAI Token Address
address public immutable override MAI_ADDRESS;
address public immutable override MAI_ADDRESS; // solhint-disable-line var-name-mixedcase
// LP USDC/MAI Address from QuickSwap
address public immutable override LP_ADDRESS;
address public immutable override LP_ADDRESS; // solhint-disable-line var-name-mixedcase
// QI Token Address
address public immutable override QI_ADDRESS;
address public immutable override QI_ADDRESS; // solhint-disable-line var-name-mixedcase

// QuickSwap Router
address public immutable override QUICKSWAP_ROUTER_ADDRESS;
address public immutable override QUICKSWAP_ROUTER_ADDRESS; // solhint-disable-line var-name-mixedcase

// QiDao Farm
address public immutable override QIDAO_FARM_ADDRESS;
address public immutable override QIDAO_FARM_ADDRESS; // solhint-disable-line var-name-mixedcase
// QiDao Pool ID
uint256 public immutable override QIDAO_POOL_ID;
uint256 public immutable override QIDAO_POOL_ID; // solhint-disable-line var-name-mixedcase

// Markup
uint8 public constant override MARKUP_DECIMALS = 5;
Expand Down Expand Up @@ -713,8 +713,8 @@ contract Peronio is
pure
returns (uint256 amountOut)
{
require(amountIn > 0, "UniswapV2Library: INSUFFICIENT_INPUT_AMOUNT");
require(reserveIn > 0 && reserveOut > 0, "UniswapV2Library: INSUFFICIENT_LIQUIDITY");
require(amountIn > 0, "UniswapV2Library: INSUFFICIENT_INPUT_AMOUNT"); // solhint-disable-line reason-string
require(reserveIn > 0 && reserveOut > 0, "UniswapV2Library: INSUFFICIENT_LIQUIDITY"); // solhint-disable-line reason-string
uint256 amountInWithFee = amountIn * 997;
uint256 numerator = amountInWithFee * reserveOut;
uint256 denominator = reserveIn * 1000 + amountInWithFee;
Expand Down
Loading