Skip to content

update fluid logics #61

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
shriyatyagii wants to merge 2 commits into
base: main
Choose a base branch
from
Open

update fluid logics #61

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
952950a
feat: update fluid-t4 logics
shriyatyagii May 9, 2025
9b8b2fa
feat: update logics in t2 and t3
shriyatyagii May 9, 2025
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
59 changes: 40 additions & 19 deletions contracts/polygon/connectors/fluid-vault-t2/main.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,19 @@ import {TokenInterface} from "../../common/interfaces.sol";

abstract contract FluidVaultT2Connector is Helpers, Events {
struct OperateInternalVariables {
uint256 maticAmount;
uint256 maticAmount0;
uint256 maticAmount1;
uint256 maticAmountDebt;
uint256 maticAmountTotal;
int256 colShares;
int256 debtShares;
}

struct OperatePerfectInternalVariables {
uint256 maticAmount;
uint256 maticAmount0;
uint256 maticAmount1;
uint256 maticAmountDebt;
uint256 maticAmountTotal;
bool isDebtMin;
bool isDebtTokenMatic;
int256[] r;
Expand Down Expand Up @@ -96,7 +102,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
// Deposit token 0
if (helper_.newColToken0 > 0) {
// Assumes maticAmount_ would either be token0 or token1
(internalVar_.maticAmount, helper_.newColToken0) = _handleDeposit(
(internalVar_.maticAmount0, helper_.newColToken0) = _handleDeposit(
HandleDepositData({
isMatic: vaultT2Details_.supplyToken.token0 == getMaticAddr(),
isMax: helper_.newColToken0 == type(int256).max,
Expand All @@ -110,7 +116,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
// Deposit token 1
if (helper_.newColToken1 > 0) {
// Assumes maticAmount_ would either be token0 or token1
(internalVar_.maticAmount, helper_.newColToken1) = _handleDeposit(
(internalVar_.maticAmount1, helper_.newColToken1) = _handleDeposit(
HandleDepositData({
isMatic: vaultT2Details_.supplyToken.token1 == getMaticAddr(),
isMax: helper_.newColToken1 == type(int256).max,
Expand All @@ -123,7 +129,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {

// Payback (Normal Debt)
if (helper_.newDebt < 0) {
(internalVar_.maticAmount) = _handlePayback(
(internalVar_.maticAmountDebt) = _handlePayback(
HandlePaybackData({
isMatic: vaultT2Details_.borrowToken.token0 == getMaticAddr(),
isMin: helper_.newDebt == type(int256).min,
Expand All @@ -135,11 +141,13 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
);
}

internalVar_.maticAmountTotal = internalVar_.maticAmount0 + internalVar_.maticAmount1 + internalVar_.maticAmountDebt;

(
helper_.nftId,
internalVar_.colShares,
internalVar_.debtShares
) = vaultT2_.operate{value: internalVar_.maticAmount}(
) = vaultT2_.operate{value: internalVar_.maticAmountTotal}(
helper_.nftId,
helper_.newColToken0,
helper_.newColToken1,
Expand Down Expand Up @@ -178,6 +186,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
helper_.setIds
);
}

/**
* @param vaultAddress Vault address.
* @param nftId NFT ID for interaction. If 0 then create new NFT/position.
Expand Down Expand Up @@ -219,7 +228,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
// Deposit token 0
if (helper_.newColToken0 > 0) {
// Assumes maticAmount_ would either be token0 or token1
(internalVar_.maticAmount, helper_.newColToken0) = _handleDeposit(
(internalVar_.maticAmount0, helper_.newColToken0) = _handleDeposit(
HandleDepositData({
isMatic: vaultT2Details_.supplyToken.token0 == getMaticAddr(),
isMax: helper_.newColToken0 == type(int256).max,
Expand All @@ -233,7 +242,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
// Deposit token 1
if (helper_.newColToken1 > 0) {
// Assumes maticAmount_ would either be token0 or token1
(internalVar_.maticAmount, helper_.newColToken1) = _handleDeposit(
(internalVar_.maticAmount1, helper_.newColToken1) = _handleDeposit(
HandleDepositData({
isMatic: vaultT2Details_.supplyToken.token1 == getMaticAddr(),
isMax: helper_.newColToken1 == type(int256).max,
Expand All @@ -246,7 +255,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {

// Payback (Normal Debt)
if (helper_.newDebt < 0) {
(internalVar_.maticAmount) = _handlePayback(
(internalVar_.maticAmountDebt) = _handlePayback(
HandlePaybackData({
isMatic: vaultT2Details_.borrowToken.token0 == getMaticAddr(),
isMin: helper_.newDebt == type(int256).min,
Expand All @@ -258,11 +267,13 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
);
}

internalVar_.maticAmountTotal = internalVar_.maticAmount0 + internalVar_.maticAmount1 + internalVar_.maticAmountDebt;

(
helper_.nftId,
internalVar_.colShares,
internalVar_.debtShares
) = vaultT2_.operate{value: internalVar_.maticAmount}(
) = vaultT2_.operate{value: internalVar_.maticAmountTotal}(
helper_.nftId,
helper_.newColToken0,
helper_.newColToken1,
Expand Down Expand Up @@ -346,7 +357,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {

// Deposit
if (helper_.perfectColShares > 0) {
(internalVar_.maticAmount, ) = _handleDeposit(
(internalVar_.maticAmount0, ) = _handleDeposit(
HandleDepositData({
isMatic: vaultT2Details_.supplyToken.token0 == getMaticAddr(),
isMax: helper_.perfectColShares == type(int256).max,
Expand All @@ -356,7 +367,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
})
);

(internalVar_.maticAmount, ) = _handleDeposit(
(internalVar_.maticAmount1, ) = _handleDeposit(
HandleDepositData({
isMatic: vaultT2Details_.supplyToken.token1 == getMaticAddr(),
isMax: helper_.perfectColShares == type(int256).max,
Expand All @@ -373,7 +384,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {

// Payback
if (helper_.newDebt < 0) {
internalVar_.maticAmount = _handlePayback(
internalVar_.maticAmountDebt = _handlePayback(
HandlePaybackData({
isMatic: internalVar_.isDebtTokenMatic,
isMin: internalVar_.isDebtMin,
Expand All @@ -385,8 +396,13 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
);
}

internalVar_.maticAmountTotal =
internalVar_.maticAmount0
+ internalVar_.maticAmount1
+ internalVar_.maticAmountDebt;

(helper_.nftId, internalVar_.r) = vaultT2_.operatePerfect{
value: internalVar_.maticAmount
value: internalVar_.maticAmountTotal
}(
helper_.nftId,
helper_.perfectColShares,
Expand Down Expand Up @@ -470,7 +486,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {

// Deposit
if (helper_.perfectColShares > 0) {
(internalVar_.maticAmount, ) = _handleDeposit(
(internalVar_.maticAmount0, ) = _handleDeposit(
HandleDepositData({
isMatic: vaultT2Details_.supplyToken.token0 == getMaticAddr(),
isMax: helper_.perfectColShares == type(int256).max,
Expand All @@ -480,7 +496,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
})
);

(internalVar_.maticAmount, ) = _handleDeposit(
(internalVar_.maticAmount1, ) = _handleDeposit(
HandleDepositData({
isMatic: vaultT2Details_.supplyToken.token1 == getMaticAddr(),
isMax: helper_.perfectColShares == type(int256).max,
Expand All @@ -497,7 +513,7 @@ abstract contract FluidVaultT2Connector is Helpers, Events {

// Payback
if (helper_.newDebt < 0) {
internalVar_.maticAmount = _handlePayback(
internalVar_.maticAmountDebt = _handlePayback(
HandlePaybackData({
isMatic: internalVar_.isDebtTokenMatic,
isMin: internalVar_.isDebtMin,
Expand All @@ -509,8 +525,13 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
);
}

internalVar_.maticAmountTotal =
internalVar_.maticAmount0
+ internalVar_.maticAmount1
+ internalVar_.maticAmountDebt;

(helper_.nftId, internalVar_.r) = vaultT2_.operatePerfect{
value: internalVar_.maticAmount
value: internalVar_.maticAmountTotal
}(
helper_.nftId,
helper_.perfectColShares,
Expand Down Expand Up @@ -543,5 +564,5 @@ abstract contract FluidVaultT2Connector is Helpers, Events {
}

contract ConnectV2FluidVaultT2Polygon is FluidVaultT2Connector {
string public constant name = "Fluid-vaultT2-v1.0";
string public constant name = "Fluid-vaultT2-v1.1";
}
Loading