fix: update to contracts that accept PLB as call parameter

Author: doomsower

package.json

@@ -28,7 +28,7 @@
     "@gearbox-protocol/biome-config": "^1.0.0",
     "@gearbox-protocol/cli-utils": "^5.39.5",
     "@gearbox-protocol/liquidator-v2-contracts": "^2.4.0",
-    "@gearbox-protocol/next-contracts": "npm:@gearbox-protocol/liquidator-v2-contracts@2.5.0-next.5",
+    "@gearbox-protocol/next-contracts": "npm:@gearbox-protocol/liquidator-v2-contracts@2.5.0-next.6",
     "@gearbox-protocol/sdk": "8.12.3",
     "@gearbox-protocol/types": "^1.14.8",
     "@types/node": "^24.1.0",

src/services/liquidate/partial/AbstractPartialLiquidatorContract.ts

@@ -304,6 +304,9 @@ export abstract class AbstractPartialLiquidatorContract
     preview: PartialLiquidationPreview,
   ): Promise<SimulateContractReturnType<unknown[], any, any>>;
 
+  /**
+   * Returns partial liquidation bot, or deleverage bot
+   */
   protected abstract get partialLiquidationBot(): Address;
 
   public get envVariables(): Record<string, string> {

src/services/liquidate/partial/v310/AAVELiquidatorV310Contract.ts

@@ -104,8 +104,8 @@ export class AAVELiquidatorV310Contract extends PartialLiquidatorV310Contract {
     const { address } = await this.deployer.ensureExists({
       abi: aaveUnwinderAbi,
       bytecode: AaveUnwinder_bytecode,
-      // constructor(address _owner, address _plb, address _aavePool, address _aaveFLTaker
-      args: [this.owner, this.partialLiquidationBot, this.#aavePool, flTaker],
+      // constructor(address _owner, address _aavePool, address _aaveFLTaker)
+      args: [this.owner, this.#aavePool, flTaker],
     });
     this.logger.debug(`AaveUnwinder address: ${address}`);
     return address;

src/services/liquidate/partial/v310/GHOLiquidatorV310Contract.ts

@@ -135,10 +135,9 @@ export class GHOLiquidatorV310Contract extends PartialLiquidatorV310Contract {
     const { address } = await this.deployer.ensureExists({
       abi: ghoUnwinderAbi,
       bytecode: GhoUnwinder_bytecode,
-      // constructor(address _owner, address _plb, address _ghoFlashMinter, address _ghoFMTaker, address _gho)
+      // constructor(address _owner, address _ghoFlashMinter, address _ghoFMTaker, address _gho)
       args: [
         this.owner,
-        this.partialLiquidationBot,
         this.#flashMinter,
         ghoFMTaker,
         this.sdk.tokensMeta.mustFindBySymbol(this.#token).addr,

src/services/liquidate/partial/v310/PartialLiquidatorV310Contract.ts

@@ -10,6 +10,8 @@ import { Create2Deployer } from "@gearbox-protocol/sdk/dev";
 import {
   type Address,
   type Chain,
+  encodeAbiParameters,
+  type Hex,
   type PrivateKeyAccount,
   parseAbi,
   type SimulateContractReturnType,
@@ -123,6 +125,7 @@ export default abstract class PartialLiquidatorV310Contract extends AbstractPart
         priceUpdates,
         BigInt(this.config.slippage),
         4n, // TODO: splits
+        this.extraData,
       ],
       gas: 550_000_000n,
     });
@@ -147,6 +150,7 @@ export default abstract class PartialLiquidatorV310Contract extends AbstractPart
         preview.flashLoanAmount,
         preview.priceUpdates,
         preview.calls,
+        this.extraData,
       ],
     });
   }
@@ -159,4 +163,10 @@ export default abstract class PartialLiquidatorV310Contract extends AbstractPart
       "partial liquidation bot is only available in deleverage mode",
     );
   }
+
+  protected get extraData(): Hex {
+    return this.config.liquidationMode === "deleverage"
+      ? encodeAbiParameters([{ type: "address" }], [this.partialLiquidationBot])
+      : "0x0";
+  }
 }

src/services/liquidate/partial/v310/SiloLiquidatorV310Contract.ts

@@ -133,8 +133,8 @@ export class SiloLiquidatorV310Contract extends PartialLiquidatorV310Contract {
     const { address } = await this.deployer.ensureExists({
       abi: siloUnwinderAbi,
       bytecode: SiloUnwinder_bytecode,
-      // constructor(address _owner, address _plb, address _siloFLTaker)
-      args: [this.owner, this.partialLiquidationBot, this.siloFLTaker],
+      // constructor(address _owner, address _siloFLTaker)
+      args: [this.owner, this.siloFLTaker],
     });
     this.logger.debug(`SiloUnwinder address: ${address}`);
     return address;

yarn.lock

@@ -1762,7 +1762,7 @@ __metadata:
     "@gearbox-protocol/biome-config": "npm:^1.0.0"
     "@gearbox-protocol/cli-utils": "npm:^5.39.5"
     "@gearbox-protocol/liquidator-v2-contracts": "npm:^2.4.0"
-    "@gearbox-protocol/next-contracts": "npm:@gearbox-protocol/liquidator-v2-contracts@2.5.0-next.5"
+    "@gearbox-protocol/next-contracts": "npm:@gearbox-protocol/liquidator-v2-contracts@2.5.0-next.6"
     "@gearbox-protocol/sdk": "npm:8.12.3"
     "@gearbox-protocol/types": "npm:^1.14.8"
     "@types/node": "npm:^24.1.0"
@@ -1789,10 +1789,10 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@gearbox-protocol/next-contracts@npm:@gearbox-protocol/liquidator-v2-contracts@2.5.0-next.5":
-  version: 2.5.0-next.5
-  resolution: "@gearbox-protocol/liquidator-v2-contracts@npm:2.5.0-next.5"
-  checksum: 10c0/536ea82e0e64ceb5cd8058a246403382adee0c39e63535c54b108c17ea9730300af233b37b76cc7c89066de197560bc326255af1f8b2d3451d784866118161e8
+"@gearbox-protocol/next-contracts@npm:@gearbox-protocol/liquidator-v2-contracts@2.5.0-next.6":
+  version: 2.5.0-next.6
+  resolution: "@gearbox-protocol/liquidator-v2-contracts@npm:2.5.0-next.6"
+  checksum: 10c0/c1a1b5e6733cd9c6b4eb9f2a2476de5e5eabdfdf43493480b3f528a4fe1b2010cac288ab6c5985ee42a915c03b9edfd614e27679940ee10eca013215fc7f1813
   languageName: node
   linkType: hard