From e65cc3ec8c1d1ed665582f5bbea1638c328d50e6 Mon Sep 17 00:00:00 2001 From: Alex Ni <12097569+nialexsan@users.noreply.github.com> Date: Mon, 25 Aug 2025 14:41:49 -0400 Subject: [PATCH 1/2] use interface --- .gitignore | 2 +- cadence/contracts/TidalYieldStrategies.cdc | 4 ++-- lib/.DS_Store | Bin 6148 -> 0 bytes lib/DeFiActions | 2 +- lib/TidalProtocol | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 lib/.DS_Store diff --git a/.gitignore b/.gitignore index ff7e6124..4323e9d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ - +.DS_Store # flow *.pkey !local/mock-incrementfi.pkey diff --git a/cadence/contracts/TidalYieldStrategies.cdc b/cadence/contracts/TidalYieldStrategies.cdc index d958bb8b..761e1e96 100644 --- a/cadence/contracts/TidalYieldStrategies.cdc +++ b/cadence/contracts/TidalYieldStrategies.cdc @@ -46,7 +46,7 @@ access(all) contract TidalYieldStrategies { access(contract) var uniqueID: DeFiActions.UniqueIdentifier? access(self) let position: TidalProtocol.Position access(self) var sink: {DeFiActions.Sink} - access(self) var source: {DeFiActions.Source} + access(self) var source: {DeFiActions.Source, DeFiActions.Liquidator} init(id: DeFiActions.UniqueIdentifier, collateralType: Type, position: TidalProtocol.Position) { self.uniqueID = id @@ -63,7 +63,7 @@ access(all) contract TidalYieldStrategies { } /// Returns the amount available for withdrawal via the inner Source access(all) fun availableBalance(ofToken: Type): UFix64 { - return ofToken == self.source.getSourceType() ? self.source.minimumAvailable() : 0.0 + return ofToken == self.source.getSourceType() ? self.source.liquidationAmount() : 0.0 } /// Deposits up to the inner Sink's capacity from the provided authorized Vault reference access(all) fun deposit(from: auth(FungibleToken.Withdraw) &{FungibleToken.Vault}) { diff --git a/lib/.DS_Store b/lib/.DS_Store deleted file mode 100644 index e33fb26622278537c4cd608e741f150425a534e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%SyyR5UkccEXcwhJ Date: Mon, 25 Aug 2025 15:47:21 -0400 Subject: [PATCH 2/2] update ref --- lib/TidalProtocol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/TidalProtocol b/lib/TidalProtocol index 4f137f61..decd619f 160000 --- a/lib/TidalProtocol +++ b/lib/TidalProtocol @@ -1 +1 @@ -Subproject commit 4f137f61143d97c03794f997ab34f952ec76feea +Subproject commit decd619f62ad055a107bdc3e74dab58aa83c5340