use indexer height args for voting power and total power queries inst…

…ead of block
DA0-DA0 · Nov 20, 2024 · cfbff89 · cfbff89
1 parent 0146c74
commit cfbff89
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 27 deletions.
diff --git a/packages/state/query/queries/contracts/Cw20Stake.ts b/packages/state/query/queries/contracts/Cw20Stake.ts
@@ -192,9 +192,9 @@ export const cw20StakeQueries = {
             formula: 'cw20Stake/stakedBalanceAtHeight',
             args: {
               address: args.address,
+              height: args.height,
               ...(oraichainStakingToken && { oraichainStakingToken }),
             },
-            ...(args.height && { block: { height: args.height } }),
           })
         )
       } catch (error) {
@@ -254,9 +254,9 @@ export const cw20StakeQueries = {
             contractAddress,
             formula: 'cw20Stake/totalStakedAtHeight',
             args: {
+              height: args.height,
               ...(oraichainStakingToken && { oraichainStakingToken }),
             },
-            ...(args.height && { block: { height: args.height } }),
           })
         )
       } catch (error) {

diff --git a/packages/state/query/queries/contracts/Cw4Group.ts b/packages/state/query/queries/contracts/Cw4Group.ts
@@ -199,12 +199,8 @@ export const cw4GroupQueries = {
               formula: 'cw4Group/member',
               args: {
                 address: args.addr,
+                height: args.atHeight,
               },
-              ...(args.atHeight && {
-                block: {
-                  height: args.atHeight,
-                },
-              }),
             })
           ),
         }

diff --git a/packages/state/query/queries/contracts/DaoDaoCore.ts b/packages/state/query/queries/contracts/DaoDaoCore.ts
@@ -823,8 +823,8 @@ export const daoDaoCoreQueries = {
             formula: 'daoCore/votingPowerAtHeight',
             args: {
               address: args.address,
+              height: args.height,
             },
-            ...(args.height && { height: args.height }),
           })
         )
       } catch (error) {
@@ -864,7 +864,9 @@ export const daoDaoCoreQueries = {
             chainId,
             contractAddress,
             formula: 'daoCore/totalPowerAtHeight',
-            ...(args.height && { height: args.height }),
+            args: {
+              height: args.height,
+            },
           })
         )
       } catch (error) {

diff --git a/packages/state/query/queries/contracts/DaoVotingCw20Staked.ts b/packages/state/query/queries/contracts/DaoVotingCw20Staked.ts
@@ -227,8 +227,8 @@ export const daoVotingCw20StakedQueries = {
             formula: 'daoVotingCw20Staked/votingPowerAtHeight',
             args: {
               address: args.address,
+              height: args.height,
             },
-            ...(args.height && { block: { height: args.height } }),
           })
         )
       } catch (error) {
@@ -268,7 +268,9 @@ export const daoVotingCw20StakedQueries = {
             chainId,
             contractAddress,
             formula: 'daoVotingCw20Staked/totalPowerAtHeight',
-            ...(args.height && { block: { height: args.height } }),
+            args: {
+              height: args.height,
+            },
           })
         )
       } catch (error) {

diff --git a/packages/state/query/queries/contracts/DaoVotingCw4.ts b/packages/state/query/queries/contracts/DaoVotingCw4.ts
@@ -145,10 +145,8 @@ export const daoVotingCw4Queries = {
             formula: 'daoVotingCw4/votingPowerAtHeight',
             args: {
               address: args.address,
+              height: args.height,
             },
-            ...(args.height && {
-              block: { height: args.height },
-            }),
           })
         )
       } catch (error) {
@@ -188,9 +186,9 @@ export const daoVotingCw4Queries = {
             chainId,
             contractAddress,
             formula: 'daoVotingCw4/totalPowerAtHeight',
-            ...(args.height && {
-              block: { height: args.height },
-            }),
+            args: {
+              height: args.height,
+            },
           })
         )
       } catch (error) {

diff --git a/packages/state/query/queries/contracts/DaoVotingCw721Staked.ts b/packages/state/query/queries/contracts/DaoVotingCw721Staked.ts
@@ -378,8 +378,8 @@ export const daoVotingCw721StakedQueries = {
             formula: 'daoVotingCw721Staked/votingPowerAtHeight',
             args: {
               address: args.address,
+              height: args.height,
             },
-            ...(args.height && { block: { height: args.height } }),
           })
         )
       } catch (error) {
@@ -419,7 +419,9 @@ export const daoVotingCw721StakedQueries = {
             chainId,
             contractAddress,
             formula: 'daoVotingCw721Staked/totalPowerAtHeight',
-            ...(args.height && { block: { height: args.height } }),
+            args: {
+              height: args.height,
+            },
           })
         )
       } catch (error) {

diff --git a/packages/state/query/queries/contracts/DaoVotingNativeStaked.ts b/packages/state/query/queries/contracts/DaoVotingNativeStaked.ts
@@ -262,8 +262,8 @@ export const daoVotingNativeStakedQueries = {
             formula: 'daoVotingNativeStaked/votingPowerAtHeight',
             args: {
               address: args.address,
+              height: args.height,
             },
-            ...(args.height && { block: { height: args.height } }),
           })
         )
       } catch (error) {
@@ -303,7 +303,9 @@ export const daoVotingNativeStakedQueries = {
             chainId,
             contractAddress,
             formula: 'daoVotingNativeStaked/totalPowerAtHeight',
-            ...(args.height && { block: { height: args.height } }),
+            args: {
+              height: args.height,
+            },
           })
         )
       } catch (error) {

diff --git a/packages/state/query/queries/contracts/DaoVotingOnftStaked.ts b/packages/state/query/queries/contracts/DaoVotingOnftStaked.ts
@@ -372,8 +372,8 @@ export const daoVotingOnftStakedQueries = {
             formula: 'daoVotingOnftStaked/votingPowerAtHeight',
             args: {
               address: args.address,
+              height: args.height,
             },
-            ...(args.height && { block: { height: args.height } }),
           })
         )
       } catch (error) {
@@ -413,7 +413,9 @@ export const daoVotingOnftStakedQueries = {
             chainId,
             contractAddress,
             formula: 'daoVotingOnftStaked/totalPowerAtHeight',
-            ...(args.height && { block: { height: args.height } }),
+            args: {
+              height: args.height,
+            },
           })
         )
       } catch (error) {

diff --git a/packages/state/query/queries/contracts/DaoVotingSgCommunityNft.ts b/packages/state/query/queries/contracts/DaoVotingSgCommunityNft.ts
@@ -362,8 +362,8 @@ export const daoVotingSgCommunityNftQueries = {
             formula: 'daoVotingSgCommunityNft/votingPowerAtHeight',
             args: {
               address: args.address,
+              height: args.height,
             },
-            ...(args.height && { block: { height: args.height } }),
           })
         )
       } catch (error) {
@@ -403,7 +403,9 @@ export const daoVotingSgCommunityNftQueries = {
             chainId,
             contractAddress,
             formula: 'daoVotingSgCommunityNft/totalPowerAtHeight',
-            ...(args.height && { block: { height: args.height } }),
+            args: {
+              height: args.height,
+            },
           })
         )
       } catch (error) {

diff --git a/packages/state/query/queries/contracts/DaoVotingTokenStaked.ts b/packages/state/query/queries/contracts/DaoVotingTokenStaked.ts
@@ -468,8 +468,8 @@ export const daoVotingTokenStakedQueries = {
             formula: 'daoVotingTokenStaked/votingPowerAtHeight',
             args: {
               address: args.address,
+              height: args.height,
             },
-            ...(args.height && { block: { height: args.height } }),
           })
         )
       } catch (error) {
@@ -509,7 +509,9 @@ export const daoVotingTokenStakedQueries = {
             chainId,
             contractAddress,
             formula: 'daoVotingTokenStaked/totalPowerAtHeight',
-            ...(args.height && { block: { height: args.height } }),
+            args: {
+              height: args.height,
+            },
           })
         )
       } catch (error) {