Merge pull request #28 from ReflectiveChimp/fix/collect-full-underlyi…

…ng-balance

store totalUnderlyingAmount0/1 for ClmManagerCollectionEvent instead …

bin/delete-all.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

bin/deploy.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # config
 valid_chains=($(ls config | sed 's/\.json//g'))

bin/prepare.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 CHAIN=$1
 valid_chains=($(ls config | sed 's/\.json//g'))

bin/release.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

bin/tag-all.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

bin/untag-all.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

schema.graphql

@@ -757,6 +757,10 @@ type ClmManagerCollectionEvent @entity(immutable: true) {
   underlyingAltAmount0: BigInt!
   "Amount of underlying tokens in the CLM assigned to the alt position in the second token."
   underlyingAltAmount1: BigInt!
+  "Underlying balance of the first token after event"
+  underlyingAmount0: BigInt!
+  "Underlying balance of the first token after event"
+  underlyingAmount1: BigInt!
 
   "Amount of collected fees in the first token"
   collectedAmount0: BigInt!

src/clm/compound.ts

@@ -135,6 +135,8 @@ function handleClmStrategyFees(
   collect.underlyingMainAmount1 = clmData.token1PositionMainBalance
   collect.underlyingAltAmount0 = clmData.token0PositionAltBalance
   collect.underlyingAltAmount1 = clmData.token1PositionAltBalance
+  collect.underlyingAmount0 = clmData.totalUnderlyingAmount0
+  collect.underlyingAmount1 = clmData.totalUnderlyingAmount1
   collect.collectedAmount0 = collectedAmount0
   collect.collectedAmount1 = collectedAmount1
   collect.collectedOutputAmounts = collectedOutputAmounts