chore: update to most recent GQL changes

Author: cesarenaldi

packages/client/src/actions/vaults.ts

@@ -4,29 +4,14 @@ import {
   type UserVaultsRequest,
   type Vault,
   VaultQuery,
-  type VaultQueryRequest,
+  type VaultRequest,
   VaultsQuery,
-  type VaultsQueryRequest,
+  type VaultsRequest,
 } from '@aave/graphql';
-import {
-  type EvmAddress,
-  type Prettify,
-  type ResultAsync,
-  ZERO_ADDRESS,
-} from '@aave/types';
+import type { ResultAsync } from '@aave/types';
 import type { AaveClient } from '../client';
 import type { UnexpectedError } from '../errors';
 
-export type VaultRequest = Prettify<
-  VaultQueryRequest & {
-    /**
-     * The user address to get user-specific data for the vault.
-     * If not provided, user-specific fields will be null.
-     */
-    user?: EvmAddress;
-  }
->;
-
 /**
  * Fetches a specific vault by address and chain ID.
  *
@@ -44,25 +29,13 @@ export type VaultRequest = Prettify<
  */
 export function vault(
   client: AaveClient,
-  { user, ...request }: VaultRequest,
+  request: VaultRequest,
 ): ResultAsync<Vault | null, UnexpectedError> {
   return client.query(VaultQuery, {
     request,
-    includeUserShares: !!user,
-    userAddress: user ?? ZERO_ADDRESS,
   });
 }
 
-export type VaultsRequest = Prettify<
-  VaultsQueryRequest & {
-    /**
-     * The user address to get user-specific data for the vaults.
-     * If not provided, user-specific fields will be null.
-     */
-    user?: EvmAddress;
-  }
->;
-
 /**
  * Fetches vaults based on filter criteria.
  *
@@ -82,12 +55,10 @@ export type VaultsRequest = Prettify<
  */
 export function vaults(
   client: AaveClient,
-  { user, ...request }: VaultsRequest,
+  request: VaultsRequest,
 ): ResultAsync<PaginatedVaultsResult, UnexpectedError> {
   return client.query(VaultsQuery, {
     request,
-    includeUserShares: !!user,
-    userAddress: user ?? ZERO_ADDRESS,
   });
 }
 
@@ -115,7 +86,5 @@ export function userVaults(
 ): ResultAsync<PaginatedVaultsResult, UnexpectedError> {
   return client.query(UserVaultsQuery, {
     request,
-    includeUserShares: true,
-    userAddress: request.user,
   });
 }

packages/graphql/schema.graphql

@@ -166,6 +166,9 @@ input ERC712Signature {
 }
 
 type EmodeMarketCategory {
+  """The eMode id for the market"""
+  id: Int!
+
   """The eMode label"""
   label: String!
 
@@ -270,6 +273,9 @@ type InsufficientBalanceError {
 }
 
 input LiquidateRequest {
+  """The market pool address"""
+  market: EvmAddress!
+
   """
   The address of the token used as collateral, to receive as result of the liquidation
   """
@@ -307,11 +313,9 @@ type Market {
   """The liquidity pool address for the market"""
   address: EvmAddress!
 
-  """The total borrows on the market"""
-  totalBorrows: BigDecimal!
-
   """A list eModes the market can support"""
   eModeCategories: [EmodeMarketCategory!]!
+  userStats: MarketUserStats
 
   """The market icon"""
   icon: String!
@@ -324,9 +328,6 @@ type Market {
 
   """The total available liquidity in USD"""
   totalAvailableLiquidity: BigDecimal!
-
-  """The market user stats"""
-  userStats: MarketUserStats
 }
 
 type MarketInfo {
@@ -655,15 +656,15 @@ type Reserve {
   """
   borrowInfo: ReserveBorrowInfo
 
-  """A list eModes the reserve can support"""
-  eModeInfo: [EmodeReserveInfo!]!
-
   """The reserve has been frozen all actions are stopped"""
   isFrozen: Boolean!
 
   """The reserve is paused you can still withdraw and some other actions"""
   isPaused: Boolean!
 
+  """A list eModes the reserve can support"""
+  eModeInfo: [EmodeReserveInfo!]!
+
   """
   The user's availability on the reserve to borrow and supply with balance
   """
@@ -754,13 +755,13 @@ type ReserveSupplyInfo {
 
 type ReserveUserAvailability {
   """The user's balance of this asset"""
-  balance: DecimalValue!
+  balance: TokenAmount!
 
   """The amount the user can supply to this reserve"""
-  supply: DecimalValue!
+  suppliable: TokenAmount!
 
   """The amount the user can borrow from this reserve"""
-  borrow: DecimalValue!
+  borrowable: TokenAmount!
 }
 
 input SetVaultFeeRequest {
@@ -998,7 +999,7 @@ type Vault {
   chainId: ChainId!
 
   """The user's shares on the vault"""
-  userShares(address: EvmAddress!): DecimalValue!
+  userShares: DecimalValue
 }
 
 input VaultDepositRequest {
@@ -1052,6 +1053,11 @@ input VaultRequest {
 
   """The chain id the vault is deployed on"""
   chainId: ChainId!
+
+  """
+  The user viewing it (can be connected wallet) - this caters for stuff like userShares and other user features
+  """
+  user: EvmAddress
 }
 
 input VaultShareInput {
@@ -1069,6 +1075,11 @@ input VaultsRequest {
   """Filter criteria for vaults"""
   criteria: VaultsRequestFilterCriteria!
 
+  """
+  The user viewing it (can be connected wallet) - this caters for stuff like userShares and other user features
+  """
+  user: EvmAddress
+
   """The page size"""
   pageSize: PageSize! = FIFTY
 

packages/graphql/src/fragments/market.ts

@@ -55,6 +55,7 @@ export type EmodeMarketReserveInfo = FragmentOf<
 export const EmodeMarketCategoryFragment = graphql(
   `fragment EmodeMarketCategory on EmodeMarketCategory {
     __typename
+    id
     label
     maxLTV {
       ...DecimalValue
@@ -87,7 +88,6 @@ export const MarketFragment = graphql(
     icon
     totalMarketSize
     totalAvailableLiquidity
-    totalBorrows
     eModeCategories {
       ...EmodeMarketCategory
     }

packages/graphql/src/fragments/reserve.ts

@@ -102,16 +102,16 @@ export const ReserveUserAvailabilityFragment = graphql(
   `fragment ReserveUserAvailability on ReserveUserAvailability {
     __typename
     balance {
-      ...DecimalValue
+      ...TokenAmount
     }
-    supply {
-      ...DecimalValue
+    suppliable {
+      ...TokenAmount
     }
-    borrow {
-      ...DecimalValue
+    borrowable {
+      ...TokenAmount
     }
   }`,
-  [DecimalValueFragment],
+  [TokenAmountFragment],
 );
 export type ReserveUserAvailability = FragmentOf<
   typeof ReserveUserAvailabilityFragment

packages/graphql/src/fragments/vaults.ts

@@ -25,7 +25,7 @@ export const VaultFragment = graphql(
       ...TokenAmount
     }
     chainId
-    userShares(address: $userAddress) @include(if: $includeUserShares) {
+    userShares {
       ...DecimalValue
     }
   }`,