Skip to content

Add strategyType and owner to events #123

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
nialexsan merged 5 commits into from
Jan 20, 2026
Merged

Add strategyType and owner to events #123

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ee75d2
add strategy type and owner to events
loic1 Jan 6, 2026
41bc5e7
improve formatting
loic1 Jan 7, 2026
8b27a6f
Merge branch 'main' into loic/add-strategy-type-in-events
nialexsan Jan 20, 2026
0724074
Update cadence/contracts/FlowYieldVaults.cdc
nialexsan Jan 20, 2026
142be7a
revert change
nialexsan Jan 20, 2026
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
80 changes: 67 additions & 13 deletions cadence/contracts/FlowYieldVaults.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,44 @@ access(all) contract FlowYieldVaults {

/* --- EVENTS --- */

access(all) event CreatedYieldVault(id: UInt64, uuid: UInt64, strategyType: String, tokenType: String, initialAmount: UFix64, creator: Address?)
access(all) event DepositedToYieldVault(id: UInt64, tokenType: String, amount: UFix64, owner: Address?, fromUUID: UInt64)
access(all) event WithdrawnFromYieldVault(id: UInt64, tokenType: String, amount: UFix64, owner: Address?, toUUID: UInt64)
access(all) event AddedToManager(id: UInt64, owner: Address?, managerUUID: UInt64, tokenType: String)
access(all) event BurnedYieldVault(id: UInt64, strategyType: String, tokenType: String, remainingBalance: UFix64)
access(all) event CreatedYieldVault(
id: UInt64,
uuid: UInt64,
strategyType: String,
tokenType: String,
initialAmount: UFix64,
creator: Address?
)
access(all) event DepositedToYieldVault(
id: UInt64,
strategyType: String,
tokenType: String,
amount: UFix64,
owner: Address?,
fromUUID: UInt64
)
access(all) event WithdrawnFromYieldVault(
id: UInt64,
strategyType: String,
tokenType: String,
amount: UFix64,
owner: Address?,
toUUID: UInt64
)
access(all) event AddedToManager(
id: UInt64,
strategyType: String,
owner: Address?,
managerUUID: UInt64,
tokenType: String
)
access(all) event BurnedYieldVault(
id: UInt64,
strategyType: String,
tokenType: String,
remainingBalance: UFix64,
owner: Address?
)

/* --- CONSTRUCTS --- */

Expand Down Expand Up @@ -226,9 +259,10 @@ access(all) contract FlowYieldVaults {
access(contract) fun burnCallback() {
emit BurnedYieldVault(
id: self.uniqueID.id,
strategyType: self.strategy.getType().identifier,
strategyType: self.getStrategyType(),
tokenType: self.getType().identifier,
remainingBalance: self.getYieldVaultBalance()
remainingBalance: self.getYieldVaultBalance(),
owner: self.owner?.address
)
let _strategy <- self.strategy <- nil
// Force unwrap to ensure burnCallback is called on the Strategy
Expand All @@ -249,7 +283,14 @@ access(all) contract FlowYieldVaults {
"Deposited vault of type \(from.getType().identifier) is not supported by this YieldVault"
}
let amount = from.balance
emit DepositedToYieldVault(id: self.uniqueID.id, tokenType: from.getType().identifier, amount: from.balance, owner: self.owner?.address, fromUUID: from.uuid)
emit DepositedToYieldVault(
id: self.uniqueID.id,
strategyType: self.getStrategyType(),
tokenType: from.getType().identifier,
amount: from.balance,
owner: self.owner?.address,
fromUUID: from.uuid
)
self._borrowStrategy().deposit(from: &from as auth(FungibleToken.Withdraw) &{FungibleToken.Vault})
assert(
from.balance == 0.0,
Expand All @@ -265,9 +306,9 @@ access(all) contract FlowYieldVaults {
access(all) view fun isSupportedVaultType(type: Type): Bool {
return self.getSupportedVaultTypes()[type] ?? false
}
/// Returns the Type of the Strategy encapsulated by this YieldVault
access(all) view fun getStrategyType(): Type? {
return self.strategy?.getType()
/// Returns the strategy type identifier for this YieldVault
access(all) view fun getStrategyType(): String {
return self.strategy.getType().identifier
}
/// Withdraws the requested amount from the Strategy
access(FungibleToken.Withdraw) fun withdraw(amount: UFix64): @{FungibleToken.Vault} {
Expand All @@ -283,7 +324,14 @@ access(all) contract FlowYieldVaults {

let res <- self._borrowStrategy().withdraw(maxAmount: amount, ofToken: self.vaultType)

emit WithdrawnFromYieldVault(id: self.uniqueID.id, tokenType: res.getType().identifier, amount: amount, owner: self.owner?.address, toUUID: res.uuid)
emit WithdrawnFromYieldVault(
id: self.uniqueID.id,
strategyType: self.getStrategyType(),
tokenType: res.getType().identifier,
amount: amount,
owner: self.owner?.address,
toUUID: res.uuid
)

return <- res
}
Expand Down Expand Up @@ -362,7 +410,13 @@ access(all) contract FlowYieldVaults {
FlowYieldVaultsClosedBeta.validateBeta(self.owner?.address!, betaRef):
"Invalid Beta Ref"
}
emit AddedToManager(id: yieldVault.uniqueID.id, owner: self.owner?.address, managerUUID: self.uuid, tokenType: yieldVault.getType().identifier)
emit AddedToManager(
id: yieldVault.uniqueID.id,
strategyType: yieldVault.getStrategyType(),
owner: self.owner?.address,
managerUUID: self.uuid,
tokenType: yieldVault.getType().identifier
)
self.yieldVaults[yieldVault.uniqueID.id] <-! yieldVault
}
/// Deposits additional funds to the specified YieldVault, reverting if none exists with the provided ID
Expand Down