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 e33fb266..00000000 Binary files a/lib/.DS_Store and /dev/null differ diff --git a/lib/TidalProtocol b/lib/TidalProtocol index 2d4ecb6c..decd619f 160000 --- a/lib/TidalProtocol +++ b/lib/TidalProtocol @@ -1 +1 @@ -Subproject commit 2d4ecb6c0d4b76779abfc845209ab95bb652f3d4 +Subproject commit decd619f62ad055a107bdc3e74dab58aa83c5340