Skip to content

Commit 13d56ce

Browse files
doomsowerdoomsower
committed
fix: update abis
1 parent c9fb3cf commit 13d56ce

14 files changed

+95
-124
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@gearbox-protocol/cli-utils": "^5.59.2",
3131
"@gearbox-protocol/liquidator-contracts": "^1.36.0-experimental.41",
3232
"@gearbox-protocol/liquidator-v2-contracts": "^2.4.0",
33-
"@gearbox-protocol/sdk": "11.1.4",
33+
"@gearbox-protocol/sdk": "11.1.6",
3434
"@gearbox-protocol/types": "^1.14.8",
3535
"@types/node": "^24.10.1",
3636
"@uniswap/sdk-core": "^7.9.0",
@@ -50,7 +50,7 @@
5050
"tsx": "4.20.6",
5151
"typescript": "^5.9.3",
5252
"viem": "^2.39.0",
53-
"vitest": "^4.0.8",
53+
"vitest": "^4.0.9",
5454
"zod": "^4.1.12"
5555
},
5656
"commitlint": {

‎src/data/exceptions.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/data/index.ts‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/services/Client.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { nextTick } from "node:process";
22

33
import { chains, formatBN, PERCENTAGE_FACTOR } from "@gearbox-protocol/sdk";
4+
import { errorAbis } from "@gearbox-protocol/sdk/abi/errors";
45
import type {
56
AnvilClient,
67
AnvilNodeInfo,
@@ -14,7 +15,6 @@ import type {
1415
ContractFunctionArgs,
1516
ContractFunctionName,
1617
EncodeFunctionDataParameters,
17-
FeeValuesEIP1559,
1818
PrivateKeyAccount,
1919
PublicClient,
2020
SimulateContractParameters,
@@ -35,7 +35,6 @@ import {
3535
import { privateKeyToAccount } from "viem/accounts";
3636

3737
import type { Config } from "../config/index.js";
38-
import { exceptionsAbis } from "../data/index.js";
3938
import { DI } from "../di.js";
4039
import { TransactionRevertedError } from "../errors/TransactionRevertedError.js";
4140
import { type ILogger, Logger } from "../log/index.js";
@@ -213,7 +212,7 @@ export default class Client {
213212
Address
214213
>({
215214
...args,
216-
abi: [...args.abi, ...exceptionsAbis],
215+
abi: [...args.abi, ...errorAbis],
217216
account,
218217
});
219218
const hash = await this.wallet.writeContract(request as any);

‎src/services/Scanner.ts‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ import {
1212
WAD,
1313
} from "@gearbox-protocol/sdk";
1414
import { iBotListV310Abi } from "@gearbox-protocol/sdk/abi/310/generated";
15-
import {
16-
iCreditManagerV3Abi,
17-
iPartialLiquidationBotV3Abi,
18-
} from "@gearbox-protocol/types/abi";
15+
import { iCreditManagerV300Abi } from "@gearbox-protocol/sdk/abi/v300";
16+
import { iPartialLiquidationBotV310Abi } from "@gearbox-protocol/sdk/plugins/bots";
1917
import type { Address, Block } from "viem";
2018
import { getContract } from "viem";
2119
import type { Config } from "../config/index.js";
@@ -89,7 +87,7 @@ export class Scanner {
8987
this.#minHealthFactor = WAD;
9088
const botMinHealthFactor = await this.client.pub.readContract({
9189
address: this.config.partialLiquidationBot,
92-
abi: iPartialLiquidationBotV3Abi,
90+
abi: iPartialLiquidationBotV310Abi,
9391
functionName: "minHealthFactor",
9492
});
9593
this.#maxHealthFactor =
@@ -188,12 +186,8 @@ export class Scanner {
188186
}
189187
if (this.config.ignoreAccounts) {
190188
const before = accounts.length;
191-
const ignoreAccounts = new Set(
192-
this.config.ignoreAccounts?.map(a => a.toLowerCase()),
193-
);
194-
accounts = accounts.filter(
195-
ca => !ignoreAccounts.has(ca.creditAccount.toLowerCase()),
196-
);
189+
const ignoreAccounts = new AddressSet(this.config.ignoreAccounts);
190+
accounts = accounts.filter(ca => !ignoreAccounts.has(ca.creditAccount));
197191
this.log.debug(
198192
`filtered out ${before - accounts.length} ignored accounts`,
199193
);
@@ -273,7 +267,7 @@ export class Scanner {
273267
if (this.#restakingCMAddr) {
274268
const ezETH = this.caService.sdk.tokensMeta.mustFindBySymbol("ezETH");
275269
const cm = getContract({
276-
abi: iCreditManagerV3Abi,
270+
abi: iCreditManagerV300Abi,
277271
address: this.#restakingCMAddr,
278272
client: this.client.pub,
279273
});

‎src/services/liquidate/AbstractLiquidator.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ import type {
55
MultiCall,
66
} from "@gearbox-protocol/sdk";
77
import { filterDustUSD } from "@gearbox-protocol/sdk";
8-
import { ierc20MetadataAbi } from "@gearbox-protocol/types/abi";
98
import type { OptimisticResult } from "@gearbox-protocol/types/optimist";
10-
import type { Address, TransactionReceipt } from "viem";
9+
import { type Address, erc20Abi, type TransactionReceipt } from "viem";
1110

1211
import type { CommonSchema, LiqduiatorConfig } from "../../config/index.js";
1312
import { DI } from "../../di.js";
@@ -132,7 +131,7 @@ export default abstract class AbstractLiquidator<
132131
? eth
133132
: await this.client.pub.readContract({
134133
address: underlyingToken,
135-
abi: ierc20MetadataAbi,
134+
abi: erc20Abi,
136135
functionName: "balanceOf",
137136
args: [this.client.address],
138137
});

‎src/services/liquidate/BatchLiquidator.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import {
1212
VERSION_RANGE_300,
1313
} from "@gearbox-protocol/sdk";
1414
import {
15-
iCreditFacadeV3Abi,
16-
iCreditFacadeV3MulticallAbi,
17-
} from "@gearbox-protocol/types/abi";
15+
iCreditFacadeV300Abi,
16+
iCreditFacadeV300MulticallAbi,
17+
} from "@gearbox-protocol/sdk/abi/v300";
1818
import type {
1919
OptimisticResult,
2020
PriceUpdate,
@@ -173,7 +173,7 @@ export default class BatchLiquidator
173173
).map(({ token, reserve, data }) => ({
174174
target: cm.creditFacade.address,
175175
callData: encodeFunctionData({
176-
abi: iCreditFacadeV3MulticallAbi,
176+
abi: iCreditFacadeV300MulticallAbi,
177177
functionName: "onDemandPriceUpdate",
178178
args: [token, reserve, data],
179179
}),
@@ -231,7 +231,7 @@ export default class BatchLiquidator
231231
);
232232

233233
const logs = parseEventLogs({
234-
abi: iCreditFacadeV3Abi,
234+
abi: iCreditFacadeV300Abi,
235235
eventName: "LiquidateCreditAccount",
236236
logs: receipt.logs,
237237
});

‎src/services/liquidate/LiquidationStrategyFull.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
iCreditManagerV310Abi,
1212
iPoolV310Abi,
1313
} from "@gearbox-protocol/sdk/abi/310/generated";
14+
import { errorAbis } from "@gearbox-protocol/sdk/abi/errors";
1415
import { replaceStorage } from "@gearbox-protocol/sdk/dev";
1516
import {
1617
BaseError,
@@ -21,7 +22,6 @@ import type {
2122
FullLiquidatorSchema,
2223
LiqduiatorConfig,
2324
} from "../../config/index.js";
24-
import { exceptionsAbis } from "../../data/index.js";
2525
import { DI } from "../../di.js";
2626
import { isCreditAccountNotLiquidatableException } from "../../errors/index.js";
2727
import { type ILogger, Logger } from "../../log/index.js";
@@ -203,7 +203,7 @@ export default class LiquidationStrategyFull
203203
try {
204204
const result = await this.client.pub.simulateContract({
205205
account: this.client.account,
206-
abi: [...iCreditFacadeV310Abi, ...exceptionsAbis],
206+
abi: [...iCreditFacadeV310Abi, ...errorAbis],
207207
address: account.creditFacade,
208208
functionName: "liquidateCreditAccount",
209209
args: args as any,

‎src/services/liquidate/partial/AbstractPartialLiquidatorContract.ts‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@ import type {
77
OnDemandPriceUpdates,
88
} from "@gearbox-protocol/sdk";
99
import { ADDRESS_0X0, AddressMap } from "@gearbox-protocol/sdk";
10-
import {
11-
iDegenDistributorV3Abi,
12-
iPartialLiquidationBotV3Abi,
13-
} from "@gearbox-protocol/types/abi";
10+
import { iDegenDistributorV300Abi } from "@gearbox-protocol/sdk/abi/iDegenDistributorV300";
11+
import { iPartialLiquidationBotV310Abi } from "@gearbox-protocol/sdk/plugins/bots";
1412
import type { Address, SimulateContractReturnType } from "viem";
1513
import { parseAbi } from "viem";
16-
1714
import type {
1815
DeleverageLiquidatorSchema,
1916
LiqduiatorConfig,
@@ -211,17 +208,17 @@ export abstract class AbstractPartialLiquidatorContract
211208
contracts: [
212209
{
213210
address: distributor,
214-
abi: iDegenDistributorV3Abi,
211+
abi: iDegenDistributorV300Abi,
215212
functionName: "degenNFT",
216213
},
217214
{
218215
address: distributor,
219-
abi: iDegenDistributorV3Abi,
216+
abi: iDegenDistributorV300Abi,
220217
functionName: "merkleRoot",
221218
},
222219
{
223220
address: distributor,
224-
abi: iDegenDistributorV3Abi,
221+
abi: iDegenDistributorV300Abi,
225222
functionName: "claimed",
226223
args: [account],
227224
},
@@ -245,7 +242,7 @@ export abstract class AbstractPartialLiquidatorContract
245242

246243
const receipt = await this.client.simulateAndWrite({
247244
address: distributor,
248-
abi: iDegenDistributorV3Abi,
245+
abi: iDegenDistributorV300Abi,
249246
functionName: "claim",
250247
args: [
251248
BigInt(claims.index), // uint256 index,
@@ -381,12 +378,12 @@ export abstract class AbstractPartialLiquidatorContract
381378
contracts: [
382379
{
383380
address: this.partialLiquidationBot,
384-
abi: iPartialLiquidationBotV3Abi,
381+
abi: iPartialLiquidationBotV310Abi,
385382
functionName: "minHealthFactor",
386383
},
387384
{
388385
address: this.partialLiquidationBot,
389-
abi: iPartialLiquidationBotV3Abi,
386+
abi: iPartialLiquidationBotV310Abi,
390387
functionName: "maxHealthFactor",
391388
},
392389
],

‎src/services/liquidate/partial/v300/PartialLiquidatorV300Contract.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ import type {
77
PriceUpdateV300,
88
} from "@gearbox-protocol/sdk";
99
import { ADDRESS_0X0, hexEq } from "@gearbox-protocol/sdk";
10+
import { errorAbis } from "@gearbox-protocol/sdk/abi/errors";
1011
import type { Address, SimulateContractReturnType } from "viem";
1112
import { parseAbi } from "viem";
12-
1313
import type { PartialV300ConfigSchema } from "../../../../config/index.js";
14-
import { exceptionsAbis } from "../../../../data/index.js";
1514
import type { PartialLiquidationPreview } from "../../types.js";
1615
import { AbstractPartialLiquidatorContract } from "../AbstractPartialLiquidatorContract.js";
1716
import type {
@@ -119,7 +118,7 @@ export default abstract class PartialLiquidatorV300Contract extends AbstractPart
119118
],
120119
} = await this.client.pub.simulateContract({
121120
account: this.client.account,
122-
abi: [...iPartialLiquidatorAbi, ...exceptionsAbis],
121+
abi: [...iPartialLiquidatorAbi, ...errorAbis],
123122
address: this.address,
124123
functionName: "getOptimalLiquidation",
125124
args: [
@@ -163,7 +162,7 @@ export default abstract class PartialLiquidatorV300Contract extends AbstractPart
163162
const { result: preview } = await this.client.pub.simulateContract({
164163
account: ADDRESS_0X0,
165164
address: this.address,
166-
abi: [...iPartialLiquidatorAbi, ...exceptionsAbis],
165+
abi: [...iPartialLiquidatorAbi, ...errorAbis],
167166
functionName: "previewPartialLiquidation",
168167
args: [
169168
ca.creditManager,
@@ -188,7 +187,7 @@ export default abstract class PartialLiquidatorV300Contract extends AbstractPart
188187
return this.client.pub.simulateContract({
189188
account: this.client.account,
190189
address: this.address,
191-
abi: [...iPartialLiquidatorAbi, ...exceptionsAbis],
190+
abi: [...iPartialLiquidatorAbi, ...errorAbis],
192191
functionName: "partialLiquidateAndConvert",
193192
args: [
194193
account.creditManager,

0 commit comments

Comments
 (0)