Skip to content

Commit fa490cb

Browse files
authored
feat: v3.6 upgrade (#642)
* feat: v3.6 ui pool data provider * fix: build * fix: remove deprecated field * fix: typings * feat: adding ltv zero config * feat: ltv enabled calcs
1 parent 432e283 commit fa490cb

File tree

21 files changed

+519
-2590
lines changed

21 files changed

+519
-2590
lines changed

packages/contract-helpers/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ export {
55
} from './permissions-manager/types/PermissionManagerTypes';
66
export * from './v3-UiIncentiveDataProvider-contract';
77
export * from './v3-UiPoolDataProvider-contract';
8-
export * from './v3-UiPoolDataProvider-legacy-contract';
98
export * from './wallet-balance-provider';
109
export * from './cl-feed-registry';
1110
// export * from './uiStakeDataProvider-contract';

packages/contract-helpers/src/v3-UiPoolDataProvider-contract/_mocks.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ export const reservesMock: ReservesData = {
101101
_hex: '0x0',
102102
_isBigNumber: true,
103103
}),
104-
unbacked: BigNumber.from({
105-
_hex: '0x0',
106-
_isBigNumber: true,
107-
}),
108104
isolationModeTotalDebt: BigNumber.from({
109105
_hex: '0x0',
110106
_isBigNumber: true,
@@ -113,11 +109,14 @@ export const reservesMock: ReservesData = {
113109
_hex: '0x0',
114110
_isBigNumber: true,
115111
}),
116-
virtualAccActive: false,
117112
virtualUnderlyingBalance: BigNumber.from({
118113
_hex: '0x0',
119114
_isBigNumber: true,
120115
}),
116+
deficit: BigNumber.from({
117+
_hex: '0x0',
118+
_isBigNumber: true,
119+
}),
121120
},
122121
{
123122
underlyingAsset: '0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11',
@@ -217,10 +216,6 @@ export const reservesMock: ReservesData = {
217216
_hex: '0x0',
218217
_isBigNumber: true,
219218
}),
220-
unbacked: BigNumber.from({
221-
_hex: '0x0',
222-
_isBigNumber: true,
223-
}),
224219
isolationModeTotalDebt: BigNumber.from({
225220
_hex: '0x0',
226221
_isBigNumber: true,
@@ -229,11 +224,14 @@ export const reservesMock: ReservesData = {
229224
_hex: '0x0',
230225
_isBigNumber: true,
231226
}),
232-
virtualAccActive: false,
233227
virtualUnderlyingBalance: BigNumber.from({
234228
_hex: '0x0',
235229
_isBigNumber: true,
236230
}),
231+
deficit: BigNumber.from({
232+
_hex: '0x0',
233+
_isBigNumber: true,
234+
}),
237235
},
238236
],
239237
1: {
@@ -288,6 +286,10 @@ export const eModesMock: EModeData[] = [
288286
_hex: '0x0',
289287
_isBigNumber: true,
290288
}),
289+
ltvzeroBitmap: BigNumber.from({
290+
_hex: '0x0',
291+
_isBigNumber: true,
292+
}),
291293
},
292294
},
293295
];

packages/contract-helpers/src/v3-UiPoolDataProvider-contract/index.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ export class UiPoolDataProvider implements UiPoolDataProviderInterface {
135135
(reserveRaw, index) => {
136136
const virtualUnderlyingBalance =
137137
reserveRaw.virtualUnderlyingBalance.toString();
138-
const { virtualAccActive } = reserveRaw;
139138
return {
140139
originalId: index,
141140
id: `${this.chainId}-${reserveRaw.underlyingAsset}-${lendingPoolAddressProvider}`.toLowerCase(),
@@ -182,13 +181,12 @@ export class UiPoolDataProvider implements UiPoolDataProviderInterface {
182181
supplyCap: reserveRaw.supplyCap.toString(),
183182
borrowableInIsolation: reserveRaw.borrowableInIsolation,
184183
accruedToTreasury: reserveRaw.accruedToTreasury.toString(),
185-
unbacked: reserveRaw.unbacked.toString(),
186184
isolationModeTotalDebt: reserveRaw.isolationModeTotalDebt.toString(),
187185
debtCeilingDecimals: reserveRaw.debtCeilingDecimals.toNumber(),
188186
isSiloedBorrowing: reserveRaw.isSiloedBorrowing,
189187
flashLoanEnabled: reserveRaw.flashLoanEnabled,
190-
virtualAccActive,
191188
virtualUnderlyingBalance,
189+
deficit: reserveRaw.deficit.toString(),
192190
};
193191
},
194192
);
@@ -268,6 +266,10 @@ export class UiPoolDataProvider implements UiPoolDataProviderInterface {
268266
.toBigInt()
269267
.toString(2)
270268
.padStart(256, '0'),
269+
ltvzeroBitmap: eMode.eMode.ltvzeroBitmap
270+
.toBigInt()
271+
.toString(2)
272+
.padStart(256, '0'),
271273
},
272274
}));
273275
}

packages/contract-helpers/src/v3-UiPoolDataProvider-contract/typechain/IUiPoolDataProviderV3.d.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export declare namespace DataTypes {
2727
collateralBitmap: BigNumberish;
2828
label: string;
2929
borrowableBitmap: BigNumberish;
30+
ltvzeroBitmap: BigNumberish;
3031
};
3132

3233
export type EModeCategoryStructOutput = [
@@ -36,13 +37,15 @@ export declare namespace DataTypes {
3637
BigNumber,
3738
string,
3839
BigNumber,
40+
BigNumber,
3941
] & {
4042
ltv: number;
4143
liquidationThreshold: number;
4244
liquidationBonus: number;
4345
collateralBitmap: BigNumber;
4446
label: string;
4547
borrowableBitmap: BigNumber;
48+
ltvzeroBitmap: BigNumber;
4649
};
4750
}
4851

@@ -89,16 +92,15 @@ export declare namespace IUiPoolDataProviderV3 {
8992
isPaused: boolean;
9093
isSiloedBorrowing: boolean;
9194
accruedToTreasury: BigNumberish;
92-
unbacked: BigNumberish;
9395
isolationModeTotalDebt: BigNumberish;
9496
flashLoanEnabled: boolean;
9597
debtCeiling: BigNumberish;
9698
debtCeilingDecimals: BigNumberish;
9799
borrowCap: BigNumberish;
98100
supplyCap: BigNumberish;
99101
borrowableInIsolation: boolean;
100-
virtualAccActive: boolean;
101102
virtualUnderlyingBalance: BigNumberish;
103+
deficit: BigNumberish;
102104
};
103105

104106
export type AggregatedReserveDataStructOutput = [
@@ -134,14 +136,13 @@ export declare namespace IUiPoolDataProviderV3 {
134136
boolean,
135137
BigNumber,
136138
BigNumber,
137-
BigNumber,
138139
boolean,
139140
BigNumber,
140141
BigNumber,
141142
BigNumber,
142143
BigNumber,
143144
boolean,
144-
boolean,
145+
BigNumber,
145146
BigNumber,
146147
] & {
147148
underlyingAsset: string;
@@ -175,16 +176,15 @@ export declare namespace IUiPoolDataProviderV3 {
175176
isPaused: boolean;
176177
isSiloedBorrowing: boolean;
177178
accruedToTreasury: BigNumber;
178-
unbacked: BigNumber;
179179
isolationModeTotalDebt: BigNumber;
180180
flashLoanEnabled: boolean;
181181
debtCeiling: BigNumber;
182182
debtCeilingDecimals: BigNumber;
183183
borrowCap: BigNumber;
184184
supplyCap: BigNumber;
185185
borrowableInIsolation: boolean;
186-
virtualAccActive: boolean;
187186
virtualUnderlyingBalance: BigNumber;
187+
deficit: BigNumber;
188188
};
189189

190190
export type BaseCurrencyInfoStruct = {

0 commit comments

Comments
 (0)