Skip to content

Commit 467e502

Browse files
committed
fix: fragments and fragment vars
1 parent e0d927c commit 467e502

File tree

7 files changed

+27
-14
lines changed

7 files changed

+27
-14
lines changed

packages/client/src/actions/markets.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ import {
44
MarketsQuery,
55
type ReservesRequestOrderBy,
66
} from '@aave/graphql';
7-
import type { ChainId, EvmAddress, ResultAsync } from '@aave/types';
7+
import {
8+
type ChainId,
9+
type EvmAddress,
10+
type ResultAsync,
11+
ZERO_ADDRESS,
12+
} from '@aave/types';
813
import type { AaveClient } from '../client';
914
import type { UnexpectedError } from '../errors';
1015

@@ -54,7 +59,7 @@ export function markets(
5459
request: { chainIds },
5560
borrowsOrderBy,
5661
suppliesOrderBy,
57-
userAddress,
62+
userAddress: userAddress ?? ZERO_ADDRESS,
5863
includeUserFields: !!userAddress,
5964
});
6065
}
@@ -116,7 +121,7 @@ export function market(
116121
return client.query(MarketQuery, {
117122
request: { address, chainId },
118123
includeUserFields: !!userAddress,
119-
userAddress,
124+
userAddress: userAddress ?? ZERO_ADDRESS,
120125
borrowsOrderBy,
121126
suppliesOrderBy,
122127
});

packages/client/src/actions/reserve.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import { type Reserve, ReserveQuery } from '@aave/graphql';
2-
import type { ChainId, EvmAddress, ResultAsync } from '@aave/types';
2+
import {
3+
type ChainId,
4+
type EvmAddress,
5+
type ResultAsync,
6+
ZERO_ADDRESS,
7+
} from '@aave/types';
38
import type { AaveClient } from '../client';
49
import type { UnexpectedError } from '../errors';
510

@@ -46,6 +51,6 @@ export function reserve(
4651
return client.query(ReserveQuery, {
4752
request: { market, token, chainId },
4853
includeUserFields: !!userAddress,
49-
userAddress,
54+
userAddress: userAddress ?? ZERO_ADDRESS,
5055
});
5156
}

packages/graphql/src/fragments/reserve.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import type { FragmentOf } from 'gql.tada';
22
import { graphql } from '../graphql';
3-
import { ChainFragment } from './chain';
43
import {
54
CurrencyFragment,
65
DecimalValueFragment,
76
NativeCurrencyFragment,
87
TokenAmountFragment,
98
} from './common';
9+
import { MarketInfoFragment } from './market';
1010

1111
export const EmodeInfoFragment = graphql(
1212
`fragment EmodeInfo on EmodeInfo {
@@ -90,10 +90,7 @@ export const ReserveFragment = graphql(
9090
`fragment Reserve on Reserve {
9191
__typename
9292
market {
93-
name
94-
chain {
95-
...Chain
96-
}
93+
...MarketInfo
9794
}
9895
address
9996
underlyingToken {
@@ -133,7 +130,7 @@ export const ReserveFragment = graphql(
133130
}
134131
}`,
135132
[
136-
ChainFragment,
133+
MarketInfoFragment,
137134
CurrencyFragment,
138135
NativeCurrencyFragment,
139136
TokenAmountFragment,

packages/graphql/src/markets.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { graphql } from './graphql';
55
* @internal
66
*/
77
export const MarketsQuery = graphql(
8-
`query Markets($request: MarketsRequest!, $includeUserFields: Boolean!, $borrowsOrderBy: ReservesRequestOrderBy, $suppliesOrderBy: ReservesRequestOrderBy, $userAddress: EvmAddress) {
8+
`query Markets($request: MarketsRequest!, $includeUserFields: Boolean!, $borrowsOrderBy: ReservesRequestOrderBy, $suppliesOrderBy: ReservesRequestOrderBy, $userAddress: EvmAddress!) {
99
value: markets(request: $request) {
1010
...Market
1111
}
@@ -18,7 +18,7 @@ export const MarketsQuery = graphql(
1818
*/
1919
export const MarketQuery = graphql(
2020
`query Market(
21-
$request: MarketRequest!, $includeUserFields: Boolean!, $borrowsOrderBy: ReservesRequestOrderBy, $suppliesOrderBy: ReservesRequestOrderBy, $userAddress: EvmAddress) {
21+
$request: MarketRequest!, $includeUserFields: Boolean!, $borrowsOrderBy: ReservesRequestOrderBy, $suppliesOrderBy: ReservesRequestOrderBy, $userAddress: EvmAddress!) {
2222
value: market(request: $request) {
2323
...Market
2424
}

packages/graphql/src/reserves.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { graphql } from './graphql';
55
* @internal
66
*/
77
export const ReserveQuery = graphql(
8-
`query Reserve($request: ReserveRequest!, $includeUserFields: Boolean!, $userAddress: EvmAddress) {
8+
`query Reserve($request: ReserveRequest!, $includeUserFields: Boolean!, $userAddress: EvmAddress!) {
99
value: reserve(request: $request) {
1010
...Reserve
1111
}

packages/types/src/constants.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { evmAddress } from './hex';
2+
3+
export const ZERO_ADDRESS = evmAddress(
4+
'0x0000000000000000000000000000000000000000',
5+
);

packages/types/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export * from 'neverthrow';
2+
export * from './constants';
23
export * from './errors';
34
export * from './helpers';
45
export * from './hex';

0 commit comments

Comments
 (0)