Skip to content

Kan/fix available balance calculation #18

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

Merged
kgrgpg merged 2 commits into from
Jun 20, 2025
Merged

Kan/fix available balance calculation #18

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
a163484
update fundsAvailableAboveTargetHealthAfterDepositing function, for c…
Kay-Zee Jun 19, 2025
73965d1
handle zero case
Kay-Zee Jun 19, 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
4 changes: 3 additions & 1 deletion cadence/contracts/TidalProtocol.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,9 @@ access(all) contract TidalProtocol {
// We will hit the health target before using up all of the withdraw token credit. We can easily
// compute how many units of the token would bring the position down to the target health.
let availableHealth = healthAfterDeposit - targetHealth
let availableEffectiveValue = availableHealth * effectiveDebtAfterDeposit

// If there is no debt, then we can just use the entire collateral amount
let availableEffectiveValue = effectiveDebtAfterDeposit == 0.0 ? effectiveCollateralAfterDeposit : availableHealth * effectiveDebtAfterDeposit
Copy link
Member Author

@Kay-Zee Kay-Zee Jun 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently just using effectiveCollateralAfterDeposit for the case where effectiveDebtAfterDeposit is 0.0, due to this causing issues with the equation if we actually use 0 in the equation below.


// The amount of the token we can take using that amount of health
let availableTokenCount = availableEffectiveValue / self.collateralFactor[withdrawType]! / self.priceOracle.price(ofToken: withdrawType)!
Expand Down
2 changes: 1 addition & 1 deletion cadence/transactions/tidal-protocol/pool-management/repay_and_close_position.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ transaction(positionWrapperPath: StoragePath) {

let withdrawnVault <- positionRef.withdrawAndPull(
type: Type<@FlowToken.Vault>(),
amount: 1000.0, // should be using `positionRef.availableBalance(type: Type<@FlowToken.Vault>(), pullFromTopUpSource: true), but this for some reason returns 0
amount: positionRef.availableBalance(type: Type<@FlowToken.Vault>(), pullFromTopUpSource: true),
pullFromTopUpSource: true,
)

Expand Down