Skip to content

OUSD daily stats + converted yield stats #33

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
merged 7 commits into from
Dec 6, 2023
Merged

OUSD daily stats + converted yield stats #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a68061
OUSD daily stats + converted yield stats
nick Nov 30, 2023
5e1275b
Update validators
nick Dec 4, 2023
3481a43
Schema
nick Dec 5, 2023
168caf9
Merge
nick Dec 5, 2023
a6a4b0c
Daily stat calc
nick Dec 5, 2023
d8038e4
JSON
nick Dec 5, 2023
6e58670
Add toJSON to OUSD
nick Dec 6, 2023
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
34 changes: 29 additions & 5 deletions db/migrations/1701729003798-Data.js → db/migrations/1701813557098-Data.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 17 additions & 10 deletions schema-oeth.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ type OETHRebase @entity {
rebasingCredits: BigInt!
rebasingCreditsPerToken: BigInt!
apy: OETHAPY!
fee: BigInt!
yield: BigInt!
feeETH: BigInt!
feeUSD: BigInt!
yieldETH: BigInt!
yieldUSD: BigInt!
}

"""
Expand Down Expand Up @@ -178,12 +180,18 @@ type OETHDailyStat @entity {
dripperWETH: BigInt!
wrappedSupply: BigInt!

yield: BigInt!
fees: BigInt!
revenue: BigInt!
revenue7DayAvg: BigInt!
revenue7DayTotal: BigInt!
revenueAllTime: BigInt!
yieldETH: BigInt!
yieldETHAllTime: BigInt!
yieldUSD: BigInt!
yieldUSDAllTime: BigInt!

feesETH: BigInt!
feesETH7Day: BigInt!
feesETHAllTime: BigInt!

feesUSD: BigInt!
feesUSD7Day: BigInt!
feesUSDAllTime: BigInt!

pegPrice: BigInt!
"""
Expand All @@ -206,7 +214,7 @@ type OETHStrategyDailyStat @entity {
Total ETH value
"""
holdings: [OETHStrategyHoldingDailyStat]
@derivedFrom(field: "strategyDailyStatId")
@derivedFrom(field: "strategyDailyStatId")
}

type OETHStrategyHoldingDailyStat @entity {
Expand Down Expand Up @@ -279,4 +287,3 @@ type OETHActivity @entity {
toSymbol: String
amount: BigInt
}

69 changes: 67 additions & 2 deletions schema-ousd.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@ type OUSDRebase @entity {
rebasingCredits: BigInt!
rebasingCreditsPerToken: BigInt!
apy: OUSDAPY!
fee: BigInt!
yield: BigInt!
feeETH: BigInt!
feeUSD: BigInt!
yieldETH: BigInt!
yieldUSD: BigInt!
}

"""
Expand Down Expand Up @@ -192,3 +194,66 @@ type OUSDActivity @entity {
toSymbol: String
amount: BigInt
}

type OUSDDailyStat @entity {
id: ID!
blockNumber: Int! @index
timestamp: DateTime! @index
apr: Float!
apy: Float!
apy7DayAvg: Float!
apy14DayAvg: Float!
apy30DayAvg: Float!

totalSupply: BigInt!
totalSupplyUSD: Float!
rebasingSupply: BigInt!
nonRebasingSupply: BigInt!
amoSupply: BigInt!
dripperWETH: BigInt!
wrappedSupply: BigInt!

yieldETH: BigInt!
yieldETHAllTime: BigInt!
yieldUSD: BigInt!
yieldUSDAllTime: BigInt!

feesETH: BigInt!
feesETH7Day: BigInt!
feesETHAllTime: BigInt!

feesUSD: BigInt!
feesUSD7Day: BigInt!
feesUSDAllTime: BigInt!

pegPrice: BigInt!
strategies: [OUSDStrategyDailyStat] @derivedFrom(field: "dailyStatId")
collateral: [OUSDCollateralDailyStat] @derivedFrom(field: "dailyStatId")
}

type OUSDStrategyDailyStat @entity {
id: ID!
dailyStatId: OUSDDailyStat!
name: String!
total: BigInt!
tvl: BigInt!
holdings: [OUSDStrategyHoldingDailyStat]
@derivedFrom(field: "strategyDailyStatId")
}

type OUSDStrategyHoldingDailyStat @entity {
id: ID!
strategyDailyStatId: OUSDStrategyDailyStat!
symbol: String!
amount: BigInt!
value: BigInt!
}

type OUSDCollateralDailyStat @entity {
id: ID!
dailyStatId: OUSDDailyStat! @index
symbol: String!
amount: BigInt!
price: BigInt!
value: BigInt!
}
96 changes: 84 additions & 12 deletions schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,10 @@ type OETHRebase @entity {
rebasingCredits: BigInt!
rebasingCreditsPerToken: BigInt!
apy: OETHAPY!
fee: BigInt!
yield: BigInt!
feeETH: BigInt!
feeUSD: BigInt!
yieldETH: BigInt!
yieldUSD: BigInt!
}

"""
Expand Down Expand Up @@ -329,12 +331,18 @@ type OETHDailyStat @entity {
dripperWETH: BigInt!
wrappedSupply: BigInt!

yield: BigInt!
fees: BigInt!
revenue: BigInt!
revenue7DayAvg: BigInt!
revenue7DayTotal: BigInt!
revenueAllTime: BigInt!
yieldETH: BigInt!
yieldETHAllTime: BigInt!
yieldUSD: BigInt!
yieldUSDAllTime: BigInt!

feesETH: BigInt!
feesETH7Day: BigInt!
feesETHAllTime: BigInt!

feesUSD: BigInt!
feesUSD7Day: BigInt!
feesUSDAllTime: BigInt!

pegPrice: BigInt!
"""
Expand All @@ -357,7 +365,7 @@ type OETHStrategyDailyStat @entity {
Total ETH value
"""
holdings: [OETHStrategyHoldingDailyStat]
@derivedFrom(field: "strategyDailyStatId")
@derivedFrom(field: "strategyDailyStatId")
}

type OETHStrategyHoldingDailyStat @entity {
Expand Down Expand Up @@ -430,7 +438,6 @@ type OETHActivity @entity {
toSymbol: String
amount: BigInt
}

type OGV @entity {
id: ID!
timestamp: DateTime! @index
Expand Down Expand Up @@ -582,8 +589,10 @@ type OUSDRebase @entity {
rebasingCredits: BigInt!
rebasingCreditsPerToken: BigInt!
apy: OUSDAPY!
fee: BigInt!
yield: BigInt!
feeETH: BigInt!
feeUSD: BigInt!
yieldETH: BigInt!
yieldUSD: BigInt!
}

"""
Expand Down Expand Up @@ -724,3 +733,66 @@ type OUSDActivity @entity {
toSymbol: String
amount: BigInt
}

type OUSDDailyStat @entity {
id: ID!
blockNumber: Int! @index
timestamp: DateTime! @index
apr: Float!
apy: Float!
apy7DayAvg: Float!
apy14DayAvg: Float!
apy30DayAvg: Float!

totalSupply: BigInt!
totalSupplyUSD: Float!
rebasingSupply: BigInt!
nonRebasingSupply: BigInt!
amoSupply: BigInt!
dripperWETH: BigInt!
wrappedSupply: BigInt!

yieldETH: BigInt!
yieldETHAllTime: BigInt!
yieldUSD: BigInt!
yieldUSDAllTime: BigInt!

feesETH: BigInt!
feesETH7Day: BigInt!
feesETHAllTime: BigInt!

feesUSD: BigInt!
feesUSD7Day: BigInt!
feesUSDAllTime: BigInt!

pegPrice: BigInt!
strategies: [OUSDStrategyDailyStat] @derivedFrom(field: "dailyStatId")
collateral: [OUSDCollateralDailyStat] @derivedFrom(field: "dailyStatId")
}

type OUSDStrategyDailyStat @entity {
id: ID!
dailyStatId: OUSDDailyStat!
name: String!
total: BigInt!
tvl: BigInt!
holdings: [OUSDStrategyHoldingDailyStat]
@derivedFrom(field: "strategyDailyStatId")
}

type OUSDStrategyHoldingDailyStat @entity {
id: ID!
strategyDailyStatId: OUSDStrategyDailyStat!
symbol: String!
amount: BigInt!
value: BigInt!
}

type OUSDCollateralDailyStat @entity {
id: ID!
dailyStatId: OUSDDailyStat! @index
symbol: String!
amount: BigInt!
price: BigInt!
value: BigInt!
}
3 changes: 2 additions & 1 deletion src/main-ousd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import * as dailyStats from './ousd/post-processors/daily-stats'
import * as ousd from './ousd/processors/ousd'
import * as strategies from './ousd/processors/strategies/strategies'
import * as validateOusd from './ousd/validators/validate-ousd'
Expand All @@ -7,7 +8,7 @@ import * as exchangeRates from './shared/post-processors/exchange-rates'
export const processor = {
stateSchema: 'ousd-processor',
processors: [ousd, strategies],
postProcessors: [exchangeRates],
postProcessors: [exchangeRates, dailyStats],
validators: [validateOusd],
}
export default processor
Expand Down
4 changes: 4 additions & 0 deletions src/model/generated/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,7 @@ export * from "./ousdAaveStrategy.model"
export * from "./ousdMetaStrategy.model"
export * from "./ousdConvexLusdPlus3Crv.model"
export * from "./ousdActivity.model"
export * from "./ousdDailyStat.model"
export * from "./ousdStrategyDailyStat.model"
export * from "./ousdStrategyHoldingDailyStat.model"
export * from "./ousdCollateralDailyStat.model"
Loading