Skip to content

Commit 8ed9cb2

Browse files
committed
fix: renamed fields and types
1 parent 73a37ac commit 8ed9cb2

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

packages/client/src/actions/markets.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {
22
type Market,
33
MarketQuery,
4+
type MarketReservesRequestOrderBy,
45
MarketsQuery,
5-
type ReservesRequestOrderBy,
66
} from '@aave/graphql';
77
import {
88
type ChainId,
@@ -29,13 +29,13 @@ export type MarketsRequest = {
2929
*
3030
* @defaultValue { tokenName: OrderDirection.Asc }
3131
*/
32-
borrowsOrderBy?: ReservesRequestOrderBy;
32+
borrowsOrderBy?: MarketReservesRequestOrderBy;
3333
/**
3434
* The order by clause for the supply reserves in the market.
3535
*
3636
* @defaultValue { tokenName: OrderDirection.Asc }
3737
*/
38-
suppliesOrderBy?: ReservesRequestOrderBy;
38+
suppliesOrderBy?: MarketReservesRequestOrderBy;
3939
};
4040

4141
/**
@@ -85,13 +85,13 @@ export type MarketRequest = {
8585
*
8686
* @defaultValue { tokenName: OrderDirection.Asc }
8787
*/
88-
borrowsOrderBy?: ReservesRequestOrderBy;
88+
borrowsOrderBy?: MarketReservesRequestOrderBy;
8989
/**
9090
* The order by clause for the supply reserves in the market.
9191
*
9292
* @defaultValue { tokenName: OrderDirection.Asc }
9393
*/
94-
suppliesOrderBy?: ReservesRequestOrderBy;
94+
suppliesOrderBy?: MarketReservesRequestOrderBy;
9595
};
9696

9797
/**

packages/graphql/src/common.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ export type OrderByUserCriteria = ReturnType<
1818
/**
1919
* Criteria for ordering reserves.
2020
*/
21-
export type ReservesRequestOrderBy = ReturnType<
22-
typeof graphql.scalar<'ReservesRequestOrderBy'>
21+
export type MarketReservesRequestOrderBy = ReturnType<
22+
typeof graphql.scalar<'MarketReservesRequestOrderBy'>
2323
>;

packages/graphql/src/fragments/reserve.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const ReserveSupplyInfoFragment = graphql(
4040
liquidationThreshold {
4141
...DecimalValue
4242
}
43-
liquidationPenalty {
43+
liquidationBonus {
4444
...DecimalValue
4545
}
4646
canBeCollateral
@@ -58,10 +58,10 @@ export const ReserveBorrowInfoFragment = graphql(
5858
total {
5959
...DecimalValue
6060
}
61-
borrowCap {
61+
borrowCap
62+
reserveFactor {
6263
...DecimalValue
6364
}
64-
reserveFactor
6565
}`,
6666
[DecimalValueFragment],
6767
);
@@ -92,7 +92,6 @@ export const ReserveFragment = graphql(
9292
market {
9393
...MarketInfo
9494
}
95-
address
9695
underlyingToken {
9796
...Currency
9897
}
@@ -116,6 +115,8 @@ export const ReserveFragment = graphql(
116115
}
117116
usdExchangeRate
118117
usdOracleAddress
118+
isFrozen
119+
isPaused
119120
supplyInfo {
120121
...ReserveSupplyInfo
121122
}

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: MarketReservesRequestOrderBy, $suppliesOrderBy: MarketReservesRequestOrderBy, $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: MarketReservesRequestOrderBy, $suppliesOrderBy: MarketReservesRequestOrderBy, $userAddress: EvmAddress!) {
2222
value: market(request: $request) {
2323
...Market
2424
}

packages/react/src/markets.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import type { MarketRequest } from '@aave/client/actions';
22
import {
33
type Market,
44
MarketQuery,
5+
type MarketReservesRequestOrderBy,
56
MarketsQuery,
6-
type ReservesRequestOrderBy,
77
} from '@aave/graphql';
88
import { type ChainId, type EvmAddress, ZERO_ADDRESS } from '@aave/types';
99
import type {
@@ -73,8 +73,8 @@ export function useAaveMarket({
7373
export type UseAaveMarketsArgs = {
7474
chainIds: ChainId[];
7575
userAddress?: EvmAddress;
76-
borrowsOrderBy?: ReservesRequestOrderBy;
77-
suppliesOrderBy?: ReservesRequestOrderBy;
76+
borrowsOrderBy?: MarketReservesRequestOrderBy;
77+
suppliesOrderBy?: MarketReservesRequestOrderBy;
7878
};
7979

8080
/**

0 commit comments

Comments
 (0)