most code written, need to update some events

notional-finance · Jul 18, 2022 · d8e7b6c · d8e7b6c
1 parent ee11fe2
commit d8e7b6c
Show file tree

Hide file tree

Showing 3 changed files with 183 additions and 117 deletions.
diff --git a/schema.graphql b/schema.graphql
@@ -1109,7 +1109,7 @@ type StrategyVaultMaturity @entity {
   "All strategy vault accounts in this maturity"
   accounts: [StrategyVaultAccount!] @derivedFrom(field: "strategyVaultMaturity")
   historicalValue: [StrategyVaultHistoricalValue!] @derivedFrom(field: "strategyVaultMaturity")
-  trades: [StrategyVaultTrade!] @derivedFrom(field: "strategyVaultMaturity")
+  events: [StrategyVaultMaturityEvent!] @derivedFrom(field: "strategyVaultMaturity")
 }
 
 enum VaultTradeType {
@@ -1118,6 +1118,7 @@ enum VaultTradeType {
   ExitPreMaturity,
   ExitPostMaturity,
   DeleverageAccount,
+  TransferFromDeleverage,
   VaultRedeemStrategyToken,
   VaultMintStrategyToken
 }
@@ -1132,41 +1133,44 @@ type StrategyVaultTrade @entity {
   transactionOrigin: Bytes!
 
   vaultTradeType: VaultTradeType!
-  isVaultAction: Boolean!
 
-  strategyVaultMaturity: StrategyVaultMaturity!
-  "Will be empty if action is a vault level action"
-  strategyVaultAccount: StrategyVaultAccount
+  strategyVaultAccount: StrategyVaultAccount!
+  strategyVaultMaturityBefore: StrategyVaultMaturity
+  strategyVaultMaturityAfter: StrategyVaultMaturity
 
   "Net change to fCash borrowed in the primary currencies"
-  primaryfCashBefore: BigInt!
-  primaryfCashAfter: BigInt!
-  netPrimaryfCashChange: BigInt!
+  primaryBorrowfCashBefore: BigInt!
+  primaryBorrowfCashAfter: BigInt!
+  netPrimaryBorrowfCashChange: BigInt!
 
   "Net change to vault shares"
   vaultSharesBefore: BigInt!
   vaultSharesAfter: BigInt!
-  netVaultShareChange: BigInt!
+  netVaultSharesChange: BigInt!
+
+  "Net change to fCash borrowed in the secondary currencies"
+  secondaryDebtSharesBefore: [BigInt!]
+  secondaryDebtSharesAfter: [BigInt!]
+  netSecondaryDebtSharesChange: [BigInt!]
+}
+
+type StrategyVaultMaturityEvent @entity {
+  "strategyVault:account or vault address:transaction hash:log index"
+  id: ID!
+  blockHash: Bytes!
+  blockNumber: Int!
+  timestamp: Int!
+  transactionHash: Bytes!
+  transactionOrigin: Bytes!
 
+  strategyVaultMaturity: StrategyVaultMaturity!
   "Net change to strategy tokens"
-  strategyTokensBefore: BigInt!
-  strategyTokensAfter: BigInt!
   netStrategyTokenChange: BigInt!
-
   "Net change to asset cash"
-  assetCashBefore: BigInt!
-  assetCashAfter: BigInt!
   netAssetCashChange: BigInt!
-
-  "Net change to fCash borrowed in the secondary currencies"
-  secondaryfCashBefore: [BigInt!]
-  secondaryfCashAfter: [BigInt!]
-  netSecondaryfCashChange: [BigInt!]
-
-  "True if the liquidator transferred shares during liquidation"
-  didTransferInLiquidation: Boolean
 }
 
+
 type StrategyVaultHistoricalValue @entity {
   "strategyVault:maturity:timestamp"
   id: ID!