adding net cash to exit

notional-finance · Aug 22, 2022 · c929e61 · c929e61
1 parent 88a27bf
commit c929e61
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/abi/Notional.json b/abi/Notional.json
@@ -1034,6 +1034,12 @@
                 "internalType": "uint256",
                 "name": "maturity",
                 "type": "uint256"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "underlyingToReceiver",
+                "type": "uint256"
             }
         ],
         "name": "VaultExitPostMaturity",
@@ -1071,6 +1077,12 @@
                 "internalType": "uint256",
                 "name": "vaultSharesToRedeem",
                 "type": "uint256"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "underlyingToReceiver",
+                "type": "uint256"
             }
         ],
         "name": "VaultExitPreMaturity",

diff --git a/src/vaults.ts b/src/vaults.ts
@@ -1,4 +1,4 @@
-import { Address, ByteArray, ethereum, BigInt } from "@graphprotocol/graph-ts"
+import { Address, ByteArray, ethereum, BigInt, dataSource } from "@graphprotocol/graph-ts"
 import {
   Notional,
   VaultPauseStatus,
@@ -488,14 +488,30 @@ export function handleVaultExitPreMaturity(event: VaultExitPreMaturity): void {
   // No nToken Fee to update
   updateVaultMarkets(vault, event)
   let accountAfter = updateVaultAccount(vault, event.params.account, event)
-  setVaultTrade(vault.id, accountBefore, accountAfter, "ExitPreMaturity", event, null)
+  let netUnderlyingCash: BigInt | null;
+  // Prior to this block on goerli, the underlyingToReceiver was not part of the event
+  if (dataSource.network() === "goerli" && event.block.number.lt(BigInt.fromI32(7454321))) {
+    netUnderlyingCash = null
+  } else {
+    netUnderlyingCash = event.params.underlyingToReceiver.neg()
+  }
+  setVaultTrade(vault.id, accountBefore, accountAfter, "ExitPreMaturity", event, netUnderlyingCash)
 }
 
 export function handleVaultExitPostMaturity(event: VaultExitPostMaturity): void {
   let vault = getVault(event.params.vault.toHexString())
   let accountBefore = getVaultAccount(vault.id, event.params.account.toHexString())
   let accountAfter = updateVaultAccount(vault, event.params.account, event)
-  setVaultTrade(vault.id, accountBefore, accountAfter, "ExitPostMaturity", event, null)
+
+  let netUnderlyingCash: BigInt | null;
+  // Prior to this block on goerli, the underlyingToReceiver was not part of the event
+  if (dataSource.network() === "goerli" && event.block.number.lt(BigInt.fromI32(7454321))) {
+    netUnderlyingCash = null
+  } else {
+    netUnderlyingCash = event.params.underlyingToReceiver.neg()
+  }
+
+  setVaultTrade(vault.id, accountBefore, accountAfter, "ExitPostMaturity", event, netUnderlyingCash)
 }
 
 export function handleVaultStateUpdate(event: VaultStateUpdate): void {
@@ -538,14 +554,15 @@ export function handleDeleverageAccount(event: VaultDeleverageAccount): void {
   let vault = getVault(event.params.vault.toHexString())
   let accountBefore = getVaultAccount(vault.id, event.params.account.toHexString())
   let accountAfter = updateVaultAccount(vault, event.params.account, event)
-  setVaultTrade(vault.id, accountBefore, accountAfter, "DeleverageAccount", event, null)
+  setVaultTrade(vault.id, accountBefore, accountAfter, "DeleverageAccount", event, event.params.fCashRepaid)
 }
 
 export function handleUpdateLiquidator(event: VaultLiquidatorProfit): void {
   if (event.params.transferSharesToLiquidator) {
     let vault = getVault(event.params.vault.toHexString())
     let accountBefore = getVaultAccount(vault.id, event.params.liquidator.toHexString())
     let accountAfter = updateVaultAccount(vault, event.params.liquidator, event)
+    // NOTE: deposit amount is not logged here, it is logged on the deleverage account event instead
     setVaultTrade(vault.id, accountBefore, accountAfter, "TransferFromDeleverage", event, null)
   }
 }

diff --git a/subgraph.template.yaml b/subgraph.template.yaml
@@ -335,9 +335,9 @@ dataSources:
         - event: VaultFeeAccrued(indexed address,indexed uint16,indexed uint256,int256,int256)
           handler: handleVaultFeeAccrued
         # Account Exit Events
-        - event: VaultExitPostMaturity(indexed address,indexed address,indexed uint256)
+        - event: VaultExitPostMaturity(indexed address,indexed address,indexed uint256,uint256)
           handler: handleVaultExitPostMaturity
-        - event: VaultExitPreMaturity(indexed address,indexed address,indexed uint256,uint256,uint256)
+        - event: VaultExitPreMaturity(indexed address,indexed address,indexed uint256,uint256,uint256,uint256)
           handler: handleVaultExitPreMaturity
         - event: VaultRepaySecondaryBorrow(indexed address,indexed address,indexed uint16,uint256,uint256,uint256)
           handler: handleVaultRepaySecondaryBorrow