@defisaver/automation-sdk 2.1.1 → 2.1.3

package/src/services/strategySubService.ts

@@ -413,3 +413,24 @@ export const sparkEncode = {
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
 };
+
+export const crvUSDEncode = {
+  leverageManagement(
+    owner: EthereumAddress,
+    controllerAddr: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+    collTokenAddr: EthereumAddress,
+    crvUSDAddr: EthereumAddress,
+  ) {
+    const subData = subDataService.crvUSDLeverageManagementSubData.encode(controllerAddr, ratioState, targetRatio, collTokenAddr, crvUSDAddr);
+    const triggerData = triggerService.crvUSDRatioTrigger.encode(owner, controllerAddr, triggerRatio, ratioState);
+
+    // over is boost, under is repay
+    const strategyOrBundleId = ratioState === RatioState.OVER ? Bundles.MainnetIds.CRVUSD_BOOST : Bundles.MainnetIds.CRVUSD_REPAY;
+    const isBundle = true;
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+};

package/src/services/subDataService.test.ts

@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import { getAssetInfo } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 
-import { ChainId, OrderType } from '../types/enums';
+import { ChainId, OrderType, RatioState } from '../types/enums';
 import type { EthereumAddress, SubData } from '../types';
 
 import {
@@ -13,8 +13,12 @@ import {
   cBondsRebondSubData,
   compoundV2LeverageManagementSubData,
   compoundV3LeverageManagementSubData,
-  exchangeDcaSubData, exchangeLimitOrderSubData,
-  liquityCloseSubData, liquityDsrPaybackSubData, liquityDsrSupplySubData,
+  exchangeDcaSubData,
+  exchangeLimitOrderSubData,
+  liquityCloseSubData,
+  liquityDebtInFrontRepaySubData,
+  liquityDsrPaybackSubData,
+  liquityDsrSupplySubData,
   liquityLeverageManagementSubData,
   liquityPaybackUsingChickenBondSubData,
   liquityRepayFromSavingsSubData,
@@ -24,7 +28,7 @@ import {
   morphoAaveV2LeverageManagementSubData,
   sparkLeverageManagementSubData,
   sparkQuotePriceSubData,
-  liquityDebtInFrontRepaySubData,
+  crvUSDLeverageManagementSubData,
 } from './subDataService';
 
 describe('Feature: subDataService.ts', () => {
@@ -1059,5 +1063,63 @@ describe('Feature: subDataService.ts', () => {
       });
     });
   });
+  describe('When testing subDataService.crvUSDLeverageManagementSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[SubData, [controller: EthereumAddress, ratioState: RatioState, targetRatio: number, collToken: EthereumAddress, crvUSD: EthereumAddress]]> = [
+        [
+          [
+            "0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635",
+            "0x0000000000000000000000000000000000000000000000000000000000000001",
+            "0x00000000000000000000000000000000000000000000000010a741a462780000",
+            "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+            "0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e",
+          ],
+          ["0xa920de414ea4ab66b97da1bfe9e6eca7d4219635", RatioState.UNDER, 120, "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", "0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E"],
+        ],
+        [
+          [
+            "0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635",
+            "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "0x00000000000000000000000000000000000000000000000018fae27693b40000",
+            "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+            "0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e",
+          ],
+          ["0xa920de414ea4ab66b97da1bfe9e6eca7d4219635", RatioState.OVER, 180, "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", "0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E"]
+        ],
+      ];
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(crvUSDLeverageManagementSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+    describe('decode()', () => {
+      const examples: Array<[{
+        controller: EthereumAddress,
+        targetRatio: number,
+      }, SubData]> = [
+        [
+          {
+            controller: '0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635',
+            targetRatio: 120,
+          },
+          ["0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635", "0x0000000000000000000000000000000000000000000000000000000000000001", "0x00000000000000000000000000000000000000000000000010a741a462780000", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e",],
+        ],
+        [
+          {
+            controller: "0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635",
+            targetRatio: 180,
+          },
+          ["0x000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d4219635", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x00000000000000000000000000000000000000000000000018fae27693b40000", "0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "0x000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e",],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(crvUSDLeverageManagementSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
 
 });

package/src/services/subDataService.ts

@@ -452,3 +452,27 @@ export const liquityDebtInFrontRepaySubData = {
     return { targetRatioIncrease };
   },
 };
+
+export const crvUSDLeverageManagementSubData = {
+  encode: (
+    controllerAddr: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    collTokenAddr: EthereumAddress,
+    crvUSDAddr: EthereumAddress,
+  ) => {
+    const controllerAddrEncoded = AbiCoder.encodeParameter('address', controllerAddr);
+    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const collTokenAddrEncoded = AbiCoder.encodeParameter('address', collTokenAddr);
+    const crvUSDAddrEncoded = AbiCoder.encodeParameter('address', crvUSDAddr);
+    return [controllerAddrEncoded, ratioStateEncoded, targetRatioEncoded, collTokenAddrEncoded, crvUSDAddrEncoded];
+  },
+  decode: (subData: SubData) => {
+    const controller = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[2]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    return { controller, targetRatio };
+  },
+};

package/src/services/triggerService.test.ts

@@ -25,6 +25,7 @@ import {
   sparkRatioTrigger,
   trailingStopTrigger,
   liquityDebtInFrontWithLimitTrigger,
+  crvUSDRatioTrigger,
 } from './triggerService';
 
 describe('Feature: triggerService.ts', () => {
@@ -893,5 +894,41 @@ describe('Feature: triggerService.ts', () => {
       });
     });
   });
+  describe('When testing triggerService.crvUSDRatioTrigger', () => {
+    describe('encode()', () => {
+      const examples: Array<[[string], [owner: EthereumAddress, controller: EthereumAddress, ratioPercentage: number, ratioState: RatioState]]> = [
+        [
+          ['0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001'],
+          [web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'), 120, RatioState.UNDER]
+        ],
+        [
+          ['0x0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d42196350000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'],
+          [web3Utils.toChecksumAddress('0x0043d218133AFaB8F2B829B106633E434Ad94E2c'), web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'), 200, RatioState.OVER]
+        ],
+      ];
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(crvUSDRatioTrigger.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+    describe('decode()', () => {
+      const examples: Array<[{ owner: EthereumAddress, controller: EthereumAddress, ratio: number, ratioState: RatioState }, TriggerData]> = [
+        [
+          { owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), controller: web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'), ratio: 120, ratioState: RatioState.UNDER },
+          ['0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d421963500000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001'],
+        ],
+        [
+          { owner: web3Utils.toChecksumAddress('0x0043d218133AFaB8F2B829B106633E434Ad94E2c'), controller: web3Utils.toChecksumAddress('0xa920de414ea4ab66b97da1bfe9e6eca7d4219635'), ratio: 200, ratioState: RatioState.OVER },
+          ['0x0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c000000000000000000000000a920de414ea4ab66b97da1bfe9e6eca7d42196350000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'],
+        ],
+      ];
 
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(crvUSDRatioTrigger.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
 });

package/src/services/triggerService.ts

@@ -380,3 +380,27 @@ export const curveUsdSoftLiquidationTrigger = {
     };
   },
 };
+
+
+export const crvUSDRatioTrigger = {
+  encode(
+    owner: EthereumAddress,
+    controller: EthereumAddress,
+    ratioPercentage: number,
+    ratioState: RatioState,
+  ) {
+    const ratioWei = ratioPercentageToWei(ratioPercentage);
+    return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, controller, ratioWei, ratioState])];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
+    return {
+      owner: decodedData[0] as EthereumAddress,
+      controller: decodedData[1] as EthereumAddress,
+      ratio: weiToRatioPercentage(decodedData[2] as string),
+      ratioState: Number(decodedData[3]),
+    };
+  },
+};

package/src/types/enums.ts

@@ -39,6 +39,7 @@ export namespace ProtocolIdentifiers {
     MorphoAaveV2 = 'Morpho-Aave__V2',
     Exchange = 'Exchange',
     Spark = 'Spark',
+    CrvUSD = 'CurveUSD',
   }
 
   export enum LegacyAutomation {
@@ -138,6 +139,8 @@ export namespace Bundles {
     AAVE_V2_BOOST = 23,
     COMP_V2_REPAY = 20,
     COMP_V2_BOOST = 21,
+    CRVUSD_REPAY = 26,
+    CRVUSD_BOOST = 27,
   }
 
   export enum OptimismIds {

package/src/types/index.ts

@@ -167,9 +167,14 @@ export declare namespace Position {
       debtInFrontMin: string,
       targetRepayRatioIncrease: number,
     }
+
+    interface LeverageManagementCrvUSD extends Base {
+      subHashBoost?: string,
+      subHashRepay?: string,
+    }
   }
 
-  type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay;
+  type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD;
 
   export interface Automated {
     chainId: ChainId,