fix: include rewards in ada circulating supply

cardano-foundation · Mar 8, 2021 · 69f23c1 · 69f23c1
1 parent f86ef42
commit 69f23c1
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/packages/api-cardano-db-hasura/src/HasuraClient.ts b/packages/api-cardano-db-hasura/src/HasuraClient.ts
@@ -34,7 +34,16 @@ export class HasuraClient {
     this.applyingSchemaAndMetadata = false
     this.adaCirculatingSupplyFetcher = new DataFetcher<AssetSupply['circulating']>(
       'AdaCirculatingSupply',
-      this.getAdaCirculatingSupply.bind(this),
+      () => {
+        try {
+          return this.getAdaCirculatingSupply()
+        } catch (error) {
+          if (error.message !== 'currentEpoch is only available when close to the chain tip. This is expected during the initial chain-sync.') {
+            throw error
+          }
+          this.logger.debug(error.message)
+        }
+      },
       pollingInterval,
       this.logger
     )
@@ -60,16 +69,39 @@ export class HasuraClient {
   private async getAdaCirculatingSupply (): Promise<AssetSupply['circulating']> {
     const result = await this.client.query({
       query: gql`query {
+          rewards_aggregate {
+              aggregate {
+                  sum {
+                      amount
+                  }
+              }
+          }
           utxos_aggregate {
               aggregate {
                   sum {
                       value
                   }
               }
           }
+          withdrawals_aggregate {
+              aggregate {
+                  sum {
+                      amount
+                  }
+              }
+          }
       }`
     })
-    return result.data.utxos_aggregate.aggregate.sum.value
+    const {
+      rewards_aggregate: rewardsAggregate,
+      utxos_aggregate: utxosAggregate,
+      withdrawals_aggregate: withdrawalsAggregate
+    } = result.data
+    const rewards = new BigNumber(rewardsAggregate.aggregate.sum.amount)
+    const utxos = new BigNumber(utxosAggregate.aggregate.sum.value)
+    const withdrawals = new BigNumber(withdrawalsAggregate.aggregate.sum.amount)
+    const withdrawableRewards = rewards.minus(withdrawals)
+    return utxos.plus(withdrawableRewards).toString()
   }
 
   private async hasuraCli (command: string) {

diff --git a/packages/api-cardano-db-hasura/src/executableSchema.ts b/packages/api-cardano-db-hasura/src/executableSchema.ts
@@ -86,9 +86,13 @@ export async function buildSchema (
         },
         ada: async () => {
           await throwIfNotInCurrentEra('ada')
+          const circulating = hasuraClient.adaCirculatingSupplyFetcher.value
+          if (circulating === undefined) {
+            return new ApolloError('ada query results are not ready yet. This can occur during startup.')
+          }
           return {
             supply: {
-              circulating: hasuraClient.adaCirculatingSupplyFetcher.value,
+              circulating,
               max: genesis.shelley.maxLovelaceSupply
             }
           }