Skip to content

fixed issue "Lack of ability to update the minimumPaybackRatio #11", … #3

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

Open
Alison024 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixed issue "Lack of ability to update the minimumPaybackRatio #11", … #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 32 additions & 20 deletions contracts/OnChainSymmioVault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ contract OnChainSymmioVault is
bytes32 public constant SETTER_ROLE = keccak256("SETTER_ROLE");
bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");
bytes32 public constant UNPAUSER_ROLE = keccak256("UNPAUSER_ROLE");
uint256 public constant MIN_PAYBACK_RATIO = 0.5e18; // 50%

ISymmio public symmio;
address public solver;
Expand Down Expand Up @@ -51,11 +52,6 @@ contract OnChainSymmioVault is
uint256 _depositLimit,
uint256 _depositPerUserLimit
) external initializer {
require(
_minimumPaybackRatio <= 1e18,
"SymmioSolverDepositor: Invalid ratio"
);

__AccessControl_init();
__Pausable_init();

Expand All @@ -66,7 +62,7 @@ contract OnChainSymmioVault is
_setLpTokenAddress(_lpTokenAddress);
setDepositLimit(_depositLimit, _depositPerUserLimit);
setSolver(_solver);
minimumPaybackRatio = _minimumPaybackRatio;
setMinimumPaybackRatio(_minimumPaybackRatio);
_setWithdrawalPeriod(604800);
}

Expand All @@ -82,15 +78,11 @@ contract OnChainSymmioVault is
);

IERC20 collateralToken = IERC20(collateralTokenAddress);
collateralToken.safeTransferFrom(
_msgSender(),
address(this),
amount
);
collateralToken.safeTransferFrom(_msgSender(), address(this), amount);
lpToken.mint(_msgSender(), amount);
currentDeposit += amount;
emit Deposit(_msgSender(), amount);

require(
collateralToken.approve(address(symmio), amount),
"SymmioSolverDepositor: Approve failed"
Expand All @@ -106,7 +98,7 @@ contract OnChainSymmioVault is
) external whenNotPaused {
require(
SymmioVaultLpToken(lpTokenAddress).balanceOf(_msgSender()) >=
amount,
amount,
"SymmioSolverDepositor: Insufficient token balance"
);
SymmioVaultLpToken(lpTokenAddress).burnFrom(_msgSender(), amount);
Expand Down Expand Up @@ -183,7 +175,7 @@ contract OnChainSymmioVault is
"SymmioSolverDepositor: Invalid accepted request"
);
uint256 amountOut = (withdrawRequests[id].amount * _paybackRatio) /
1e18;
1e18;
require(
amountOut >= withdrawRequests[id].minAmountOut,
"SymmioSolverDepositor: Payback ratio is too low for this request"
Expand All @@ -192,12 +184,13 @@ contract OnChainSymmioVault is
currentDeposit -= withdrawRequests[id].amount;
withdrawRequests[id].status = RequestStatus.Ready;
withdrawRequests[id].acceptedRatio = _paybackRatio;
withdrawRequests[id].acceptedWithdawRequestTimestamp = block.timestamp;
withdrawRequests[id].acceptedWithdawRequestTimestamp = block
.timestamp;
}

require(
IERC20(collateralTokenAddress).balanceOf(address(this)) >=
totalRequiredBalance,
totalRequiredBalance,
"SymmioSolverDepositor: Insufficient contract balance"
);
lockedBalance = totalRequiredBalance;
Expand All @@ -221,7 +214,9 @@ contract OnChainSymmioVault is
);

require(
request.acceptedWithdawRequestTimestamp + withdrawalPeriod <= block.timestamp, "SymmioSolverDepositor: Request not pass withdrawal period"
request.acceptedWithdawRequestTimestamp + withdrawalPeriod <=
block.timestamp,
"SymmioSolverDepositor: Request not pass withdrawal period"
);

request.status = RequestStatus.Done;
Expand All @@ -243,13 +238,15 @@ contract OnChainSymmioVault is
_updateCollateral();
require(
beforeCollateral == collateralTokenAddress ||
beforeCollateral == address(0),
beforeCollateral == address(0),
"SymmioSolverDepositor: Collateral can not be changed"
);
emit SymmioAddressUpdatedEvent(_symmioAddress);
}

function setWithdrawalPeriod(uint256 withdrawalPeriod_) public onlyRole(SETTER_ROLE) {

function setWithdrawalPeriod(
uint256 withdrawalPeriod_
) public onlyRole(SETTER_ROLE) {
_setWithdrawalPeriod(withdrawalPeriod_);
}

Expand All @@ -268,6 +265,21 @@ contract OnChainSymmioVault is
emit DepositLimitUpdatedEvent(_depositLimit, _depositPerUserLimit);
}

function setMinimumPaybackRatio(
uint256 _minimumPaybackRatio
) public onlyRole(SETTER_ROLE) {
require(
_minimumPaybackRatio >= MIN_PAYBACK_RATIO,
"SymmioSolverDepositor: Minimum buyback ratio is too low"
);
require(
_minimumPaybackRatio <= 1e18,
"SymmioSolverDepositor: Minimum buyback ratio is too high"
);
minimumPaybackRatio = _minimumPaybackRatio;
emit MinimumPaybackRatioUpdatedEvent(_minimumPaybackRatio);
}

function pause() external onlyRole(PAUSER_ROLE) {
_pause();
}
Expand Down
11 changes: 7 additions & 4 deletions contracts/interfaces/IOnChainSymmioVault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ interface IOnChainSymmioVault {
}

event WithdrawalPeriodUpdate(uint256 withdrawalPeriod);

event Deposit(address indexed depositor, uint256 amount);
event WithdrawRequestEvent(
uint256 indexed requestId,
Expand All @@ -39,12 +39,15 @@ interface IOnChainSymmioVault {
address indexed receiver
);
event SymmioAddressUpdatedEvent(address indexed newSymmioAddress);
event DepositLimitUpdatedEvent(uint256 depositLimit, uint256 depositPerUserLimit);

event DepositLimitUpdatedEvent(
uint256 depositLimit,
uint256 depositPerUserLimit
);
event MinimumPaybackRatioUpdatedEvent(uint256 minimumPaybackRatio);
event SolverUpdatedEvent(address indexed solver);
event DepositToSymmio(
address indexed depositor,
address indexed solver,
uint256 amount
);
}
}
129 changes: 68 additions & 61 deletions hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,76 @@
import { HardhatUserConfig } from "hardhat/config"
import "@nomicfoundation/hardhat-toolbox"
import "@openzeppelin/hardhat-upgrades"
import { resolve } from "path"
import { HardhatUserConfig } from "hardhat/config";
import "@nomicfoundation/hardhat-toolbox";
import "@openzeppelin/hardhat-upgrades";
import { ethers } from "ethers";
import { resolve } from "path";

import { config as dotenvConfig } from "dotenv"
import { config as dotenvConfig } from "dotenv";

const dotenvConfigPath: string = process.env.DOTENV_CONFIG_PATH || "./.env"
dotenvConfig({ path: resolve(__dirname, dotenvConfigPath) })
const dotenvConfigPath: string = process.env.DOTENV_CONFIG_PATH || "./.env";
dotenvConfig({ path: resolve(__dirname, dotenvConfigPath) });

// Ensure that we have all the environment variables we need.
const privateKey: string | undefined = process.env.PRIVATE_KEY
if (!privateKey)
throw new Error("Please set your PRIVATE_KEY in a .env file")

const baseApiKey: string = process.env.BASE_API_KEY || ""
const privateKey: string | undefined = process.env.PRIVATE_KEY;
if (!privateKey) throw new Error("Please set your PRIVATE_KEY in a .env file");
const wallet = new ethers.Wallet(privateKey);
if (wallet.address !== "0xf1d63df1CD64a3f3A8F440bAba619dbB4baBB020")
console.warn(
`Using wallet ${wallet.address} instead of original 0xf1d63df1CD64a3f3A8F440bAba619dbB4baBB020`
);
const baseApiKey: string = process.env.BASE_API_KEY || "";

const config: HardhatUserConfig = {
defaultNetwork: "hardhat",
gasReporter: {
currency: "USD",
enabled: true,
excludeContracts: [],
src: "./contracts",
},
networks: {
hardhat: {
allowUnlimitedContractSize: false,
},
base: {
url: "https://1rpc.io/base",
accounts: [privateKey || `0x0`],
}, },
etherscan: {
apiKey: {
base: baseApiKey,
},
customChains: [
{
network: "base",
chainId: 8453,
urls: {
apiURL: `https://api.basescan.org/api?apiKey=${baseApiKey}`,
browserURL: "https://basescan.org",
},
}, ],
},
paths: {
artifacts: "./artifacts",
cache: "./cache",
sources: "./contracts",
tests: "./test",
},
solidity: {
version: "0.8.28",
settings: {
metadata: {
bytecodeHash: "none",
},
optimizer: {
enabled: true,
runs: 200000,
},
viaIR: true,
},
},
}
defaultNetwork: "hardhat",
gasReporter: {
currency: "USD",
enabled: true,
excludeContracts: [],
src: "./contracts",
},
networks: {
hardhat: {
allowUnlimitedContractSize: false,
},
base: {
url: "https://1rpc.io/base",
accounts: [privateKey || `0x0`],
},
},
etherscan: {
apiKey: {
base: baseApiKey,
},
customChains: [
{
network: "base",
chainId: 8453,
urls: {
apiURL: `https://api.basescan.org/api?apiKey=${baseApiKey}`,
browserURL: "https://basescan.org",
},
},
],
},
paths: {
artifacts: "./artifacts",
cache: "./cache",
sources: "./contracts",
tests: "./test",
},
solidity: {
version: "0.8.28",
settings: {
evmVersion: "cancun",
metadata: {
bytecodeHash: "none",
},
optimizer: {
enabled: true,
runs: 200000,
},
viaIR: true,
},
},
};

export default config;