fixed vault total supply twabs

GenerationSoftware · Apr 22, 2024 · 5841379 · 5841379
1 parent bc543f3
commit 5841379
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/packages/hyperstructure-client-js/package.json b/packages/hyperstructure-client-js/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@generationsoftware/hyperstructure-client-js",
   "description": "Lightweight library for interacting with PoolTogether contracts",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "license": "MIT",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

diff --git a/packages/hyperstructure-client-js/src/PrizePool.ts b/packages/hyperstructure-client-js/src/PrizePool.ts
@@ -347,11 +347,15 @@ export class PrizePool {
     const source = 'Prize Pool [getVaultTotalSupplyTwab]'
     await validateClientNetwork(this.chainId, this.publicClient, source)
 
+    const lastDrawId = (await this.getLastAwardedDrawId()) || 1
+    const startDrawId = numDraws > lastDrawId ? 1 : lastDrawId - Math.floor(numDraws) + 1
+
     const totalSupplyTwabs = await getPrizePoolTotalSupplyTwabs(
       this.publicClient,
       this.address,
       vaultAddresses,
-      numDraws
+      startDrawId,
+      lastDrawId
     )
 
     return totalSupplyTwabs

diff --git a/packages/hyperstructure-react-hooks/package.json b/packages/hyperstructure-react-hooks/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@generationsoftware/hyperstructure-react-hooks",
   "description": "React hooks library for interacting with PoolTogether contracts",
-  "version": "1.16.1",
+  "version": "1.16.2",
   "license": "MIT",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

diff --git a/shared/utilities/utils/prizes.ts b/shared/utilities/utils/prizes.ts
@@ -119,23 +119,25 @@ export const getPrizePoolContributionPercentages = async (
  * @param publicClient a public Viem client for the prize pool's chain
  * @param prizePoolAddress the prize pool's address
  * @param vaultAddresses the addresses for any vaults to get total supply TWAB for
- * @param numDraws the number of draws to look back on
+ * @param startDrawId the draw to start at (inclusive)
+ * @param endDrawId the draw to end at (inclusive)
  * @returns
  */
 export const getPrizePoolTotalSupplyTwabs = async (
   publicClient: PublicClient,
   prizePoolAddress: Address,
   vaultAddresses: Address[],
-  numDraws: number
+  startDrawId: number,
+  endDrawId: number
 ): Promise<{ [vaultId: string]: bigint }> => {
   const totalSupplyTwabs: { [vaultId: string]: bigint } = {}
 
   const chainId = await publicClient.getChainId()
 
-  if (vaultAddresses.length > 0 && numDraws >= 0) {
+  if (vaultAddresses.length > 0 && startDrawId <= endDrawId) {
     const calls = vaultAddresses.map((vaultAddress) => ({
       functionName: 'getVaultUserBalanceAndTotalSupplyTwab',
-      args: [vaultAddress, zeroAddress, Math.floor(numDraws)]
+      args: [vaultAddress, zeroAddress, startDrawId, endDrawId]
     }))
 
     const multicallResults = await getSimpleMulticallResults(