@defisaver/automation-sdk 3.3.11 → 3.3.12-strategies-refactor-dev

package/src/services/triggerService.test.ts

@@ -33,6 +33,9 @@ import {
   aaveV3QuotePriceRangeTrigger,
   morphoBluePriceRangeTrigger,
   sparkQuotePriceTrigger,
+  aaveV4RatioTrigger,
+  aaveV4QuotePriceTrigger,
+  aaveV4QuotePriceRangeTrigger,
 } from './triggerService';
 
 describe('Feature: triggerService.ts', () => {
@@ -1284,7 +1287,101 @@ describe('Feature: triggerService.ts', () => {
       });
     });
   });
+  describe('When testing triggerService.aaveV4RatioTrigger', () => {
+    describe('encode()', () => {
+      const examples: Array<[[string], [owner: EthereumAddress, spoke: EthereumAddress, ratioPercentage: number, ratioState: RatioState]]> = [
+        [
+          ['0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001'],
+          [web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), 120, RatioState.UNDER]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(aaveV4RatioTrigger.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ owner: EthereumAddress, spoke: EthereumAddress, ratio: number, ratioState: RatioState }, TriggerData]> = [
+        [
+          { owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), ratio: 120, ratioState: RatioState.UNDER },
+          ['0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001'],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV4RatioTrigger.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
 
+  describe('When testing triggerService.aaveV4QuotePriceTrigger', () => {
+    describe('encode()', () => {
+      const examples: Array<[[string], [spoke: EthereumAddress, baseTokenId: number, quoteTokenId: number, price: string, ratioState: RatioState]]> = [
+        [
+          ['0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000005150ae84a8cdf000000000000000000000000000000000000000000000000000000000000000000000'],
+          [web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), 10, 20, '1500', RatioState.OVER]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(aaveV4QuotePriceTrigger.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ spoke: EthereumAddress, baseTokenId: number, quoteTokenId: number, price: string, ratioState: RatioState }, TriggerData]> = [
+        [
+          { spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), baseTokenId: 10, quoteTokenId: 20, price: '1500', ratioState: RatioState.OVER },
+          ['0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000005150ae84a8cdf000000000000000000000000000000000000000000000000000000000000000000000'],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV4QuotePriceTrigger.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
+  describe('When testing triggerService.aaveV4QuotePriceRangeTrigger', () => {
+    describe('encode()', () => {
+      const examples: Array<[[string], [spoke: EthereumAddress, baseTokenId: number, quoteTokenId: number, lowerPrice: string, upperPrice: string]]> = [
+        [
+          ['0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000004be4e7267b6ae00000000000000000000000000000000000000000000000000056bc75e2d631000000'],
+          [web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), 10, 20, '1400', '1600']
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(aaveV4QuotePriceRangeTrigger.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ spoke: EthereumAddress, baseTokenId: number, quoteTokenId: number, lowerPrice: string, upperPrice: string }, TriggerData]> = [
+        [
+          { spoke: web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'), baseTokenId: 10, quoteTokenId: 20, lowerPrice: '1400', upperPrice: '1600' },
+          ['0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000004be4e7267b6ae00000000000000000000000000000000000000000000000000056bc75e2d631000000'],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV4QuotePriceRangeTrigger.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
   describe('When testing triggerService.sparkQuotePriceTrigger', () => {
     describe('encode()', () => {
       const examples: Array<[[string], [baseTokenAddr: EthereumAddress, quoteTokenAddr: EthereumAddress, price: number, ratioState: RatioState]]> = [

package/src/services/triggerService.ts

@@ -743,4 +743,77 @@ export const sparkQuotePriceTrigger = {
       ratioState: Number(decodedData[3]),
     };
   },
-};
+};
+
+export const aaveV4RatioTrigger = {
+  encode(owner: EthereumAddress, spoke: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
+    const ratioWei = ratioPercentageToWei(ratioPercentage);
+    return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, spoke, ratioWei, ratioState])];
+  },
+  decode(triggerData: TriggerData) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    return {
+      owner: decodedData[0] as EthereumAddress,
+      spoke: decodedData[1] as EthereumAddress,
+      ratio: weiToRatioPercentage(decodedData[2] as string),
+      ratioState: Number(decodedData[3]),
+    };
+  },
+};
+
+export const aaveV4QuotePriceTrigger = {
+  encode(
+    spoke: EthereumAddress,
+    baseTokenId: number,
+    quoteTokenId: number,
+    price: string,
+    ratioState: RatioState,
+  ) {
+    // Price is intentionally scaled to 1e18 for higher precision.
+    const _price = new Dec(price).mul(1e18).floor().toString();
+    return [AbiCoder.encodeParameters(['address', 'uint256', 'uint256', 'uint256', 'uint8'], [spoke, baseTokenId, quoteTokenId, _price, ratioState])];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256', 'uint256', 'uint8'], triggerData[0]);
+    return {
+      spoke: decodedData[0] as EthereumAddress,
+      baseTokenId: Number(decodedData[1]),
+      quoteTokenId: Number(decodedData[2]),
+      price: new Dec(decodedData[3] as string).div(1e18).toString(),
+      ratioState: Number(decodedData[4]),
+    };
+  },
+};
+
+export const aaveV4QuotePriceRangeTrigger = {
+  encode(
+    spoke: EthereumAddress,
+    baseTokenId: number,
+    quoteTokenId: number,
+    lowerPrice: string,
+    upperPrice: string,
+  ) {
+    // Price is intentionally scaled to 1e18 for higher precision.
+    const lowerPriceFormatted = new Dec(lowerPrice).mul(1e18).floor().toString();
+    const upperPriceFormatted = new Dec(upperPrice).mul(1e18).floor().toString();
+    return [
+      AbiCoder.encodeParameters(
+        ['address', 'uint256', 'uint256', 'uint256', 'uint256'],
+        [spoke, baseTokenId, quoteTokenId, lowerPriceFormatted, upperPriceFormatted]),
+    ];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256', 'uint256', 'uint256'], triggerData[0]);
+    return {
+      spoke: decodedData[0] as EthereumAddress,
+      baseTokenId: Number(decodedData[1]),
+      quoteTokenId: Number(decodedData[2]),
+      lowerPrice: new Dec(decodedData[3] as string).div(1e18).toString(),
+      upperPrice: new Dec(decodedData[4] as string).div(1e18).toString(),
+    };
+  },
+};

package/src/services/utils.ts

@@ -106,13 +106,24 @@ export function getPositionId(...args: (number | string)[]) {
 }
 
 export function getCloseStrategyType(
-  stopLossPrice: number,
+  stopLossPrice: number | string,
   stopLossType: CloseToAssetType,
-  takeProfitPrice: number,
+  takeProfitPrice: number | string,
   takeProfitType: CloseToAssetType,
 ): CloseStrategyType {
-  const isStopLoss = stopLossPrice > 0;
-  const isTakeProfit = takeProfitPrice > 0;
+  const stopLossPriceDec = new Dec(stopLossPrice);
+  const takeProfitPriceDec = new Dec(takeProfitPrice);
+
+  if (!stopLossPriceDec.isFinite() || stopLossPriceDec.isNegative()) {
+    throw new Error('CloseOnPrice: stopLossPrice must be a finite non-negative number');
+  }
+
+  if (!takeProfitPriceDec.isFinite() || takeProfitPriceDec.isNegative()) {
+    throw new Error('CloseOnPrice: takeProfitPrice must be a finite non-negative number');
+  }
+
+  const isStopLoss = stopLossPriceDec.gt(0);
+  const isTakeProfit = takeProfitPriceDec.gt(0);
 
   if (!isStopLoss && !isTakeProfit) {
     throw new Error('CloseOnPrice: At least one price must be defined');

package/src/types/enums.ts

@@ -64,6 +64,7 @@ export namespace ProtocolIdentifiers {
     CompoundV3 = 'Compound__V3',
     AaveV2 = 'Aave__V2',
     AaveV3 = 'Aave__V3',
+    AaveV4 = 'Aave__V4',
     MorphoAaveV2 = 'Morpho-Aave__V2',
     Exchange = 'Exchange',
     Spark = 'Spark',
@@ -97,6 +98,8 @@ export namespace Strategies {
     CURVEUSD_PAYBACK = 92,
     LIQUITY_V2_PAYBACK = 113,
     AAVE_V3_COLLATERAL_SWITCH = 135,
+    AAVE_V4_COLLATERAL_SWITCH = 154,
+    AAVE_V4_COLLATERAL_SWITCH_EOA = 155,
   }
 
   export enum OptimismIds {
@@ -148,6 +151,7 @@ export namespace Strategies {
     EoaBoostOnPrice = 'eoa-boost-on-price',
     EoaRepayOnPrice = 'eoa-repay-on-price',
     CollateralSwitch = 'collateral-switch',
+    EoaCollateralSwitch = 'eoa-collateral-switch',
   }
   export enum IdOverrides {
     TakeProfit = 'take-profit',
@@ -225,6 +229,16 @@ export namespace Bundles {
     MORPHO_BLUE_CLOSE = 58,
     SPARK_REPAY_ON_PRICE = 59,
     SPARK_BOOST_ON_PRICE = 60,
+    AAVE_V4_REPAY = 61,
+    AAVE_V4_BOOST = 62,
+    AAVE_V4_REPAY_ON_PRICE = 63,
+    AAVE_V4_BOOST_ON_PRICE = 64,
+    AAVE_V4_CLOSE = 65,
+    AAVE_V4_EOA_REPAY = 66,
+    AAVE_V4_EOA_BOOST = 67,
+    AAVE_V4_EOA_REPAY_ON_PRICE = 68,
+    AAVE_V4_EOA_BOOST_ON_PRICE = 69,
+    AAVE_V4_EOA_CLOSE = 70,
   }
 
   export enum OptimismIds {

package/src/types/index.ts

@@ -248,6 +248,30 @@ export declare namespace Position {
       ratioState: RatioState,
       ratio: number,
     }
+
+    interface CloseBase extends Base {
+      stopLossPrice: string,
+      takeProfitPrice: string,
+      stopLossType: CloseToAssetType | undefined,
+      takeProfitType: CloseToAssetType | undefined,
+    }
+
+    interface AaveV4LeverageManagementOnPrice extends Base {
+      collAsset: EthereumAddress,
+      collAssetId: number,
+      debtAsset: EthereumAddress,
+      debtAssetId: number,
+      price: string,
+      ratioState: number,
+      ratio: number,
+    }
+
+    interface AaveV4CloseOnPrice extends CloseBase {
+      collAsset: EthereumAddress,
+      collAssetId: number,
+      debtAsset: EthereumAddress,
+      debtAssetId: number,
+    }
   }
 
   type SpecificAny =
@@ -266,6 +290,8 @@ export declare namespace Position {
     | Specific.CompoundV3LeverageManagementOnPrice
     | Specific.CompoundV3CloseOnPrice
     | Specific.AaveV3CloseOnPriceGeneric
+    | Specific.AaveV4LeverageManagementOnPrice
+    | Specific.AaveV4CloseOnPrice
     | Specific.SparkOnPrice;
 
   export interface Automated {