@defisaver/automation-sdk 3.3.7 → 3.3.8-lev-management-dev

package/src/services/subDataService.ts

@@ -104,6 +104,25 @@ export const makerLeverageManagementSubData = {
   },
 };
 
+export const makerLeverageManagementWithoutSubProxy = {
+  encode(
+    cdpId: number,
+    targetRatio: number,
+    ratioState: RatioState,
+  ): SubData {
+    const encodedCdpId = AbiCoder.encodeParameter('uint256', cdpId);
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+    return [encodedTargetRatio, encodedRatioState, encodedCdpId];
+  },
+  decode(subData: SubData): { targetRatio: number, ratioState: RatioState } {
+    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]) as any as string);
+    const ratioState = AbiCoder.decodeParameter('uint8', subData[1]) as any as RatioState;
+
+    return { targetRatio, ratioState };
+  },
+};
+
 export const liquityLeverageManagementSubData = {
   decode: (subData:SubData) => {
     const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
@@ -592,6 +611,26 @@ export const sparkLeverageManagementSubData = { // TODO encode?
     return { targetRatio };
   },
 };
+export const sparkLeverageManagementSubDataWithoutSubProxy = {
+  encode(
+    targetRatio: number,
+    ratioState: RatioState,
+  ): SubData {
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+
+    const encodedUseDefaultMarket = AbiCoder.encodeParameter('bool', true);
+    const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', false);
+    return [encodedTargetRatio, encodedRatioState, encodedUseDefaultMarket, encodedUseOnBehalf];
+  },
+  decode(subData: SubData): { targetRatio: number, ratioState: RatioState } {
+    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]) as any as string);
+    const ratioState = AbiCoder.decodeParameter('uint8', subData[1]) as any as RatioState;
+
+    return { targetRatio, ratioState };
+  },
+};
+
 
 export const liquityDsrPaybackSubData = {
   encode: (targetRatio: number) => {
@@ -1212,3 +1251,43 @@ export const sparkCloseGenericSubData = {
     };
   },
 };
+
+export const morphoBlueCloseOnPriceSubData = {
+  encode(
+    loanToken: EthereumAddress,
+    collToken: EthereumAddress,
+    oracle: EthereumAddress,
+    irm: EthereumAddress,
+    lltv: string,
+    user: EthereumAddress,
+    closeType: CloseStrategyType,
+  ): SubData {
+    const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
+    const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+    const oracleEncoded = AbiCoder.encodeParameter('address', oracle);
+    const irmEncoded = AbiCoder.encodeParameter('address', irm);
+    const lltvEncoded = AbiCoder.encodeParameter('uint256', lltv);
+    const userEncoded = AbiCoder.encodeParameter('address', user);
+    const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+    return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, userEncoded, closeTypeEncoded];
+  },
+  decode(subData: SubData) {
+    const loanToken = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collToken = AbiCoder.decodeParameter('address', subData[1]) as any as EthereumAddress;
+    const oracle = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
+    const irm = AbiCoder.decodeParameter('address', subData[3]) as any as EthereumAddress;
+    const lltv = AbiCoder.decodeParameter('uint256', subData[4]) as any as EthereumAddress;
+    const user = AbiCoder.decodeParameter('address', subData[5]) as any as EthereumAddress;
+    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[6])) as CloseStrategyType;
+
+    return {
+      loanToken,
+      collToken,
+      oracle,
+      irm,
+      lltv,
+      user,
+      closeType,
+    };
+  },
+};

package/src/services/triggerService.test.ts

@@ -31,6 +31,7 @@ import {
   crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger,
   compoundV3PriceRangeTrigger,
   aaveV3QuotePriceRangeTrigger,
+  morphoBluePriceRangeTrigger,
 } from './triggerService';
 
 describe('Feature: triggerService.ts', () => {
@@ -1230,4 +1231,56 @@ describe('Feature: triggerService.ts', () => {
       });
     });
   });
+
+  describe('When testing triggerService.morphoBluePriceRangeTrigger', () => {
+    describe('encode()', () => {
+      const examples: Array<[[string], [oracle: EthereumAddress, collateralToken: EthereumAddress, loanToken: EthereumAddress, lowerPrice: number, upperPrice: number]]> = [
+        [
+          ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+          [web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 1500, 4000]
+        ],
+        [
+          ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+          [web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 0, 5000]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(morphoBluePriceRangeTrigger.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ oracle: EthereumAddress, collateralToken: EthereumAddress, loanToken: EthereumAddress, lowerPrice: string, upperPrice: string }, TriggerData]> = [
+        [
+          {
+            oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            loanToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            lowerPrice: '1500',
+            upperPrice: '4000',
+          },
+          ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+        ],
+        [
+          {
+            oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            loanToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            lowerPrice: '0',
+            upperPrice: '5000',
+          },
+          ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8dA6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(morphoBluePriceRangeTrigger.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
 });

package/src/services/triggerService.ts

@@ -688,4 +688,36 @@ export const sparkQuotePriceRangeTrigger = {
       upperPrice: new Dec(decodedData[3] as string).div(1e8).toString(),
     };
   },
+};
+
+export const morphoBluePriceRangeTrigger = {
+  encode(
+    oracle: EthereumAddress,
+    collateralToken: EthereumAddress,
+    loanToken: EthereumAddress,
+    lowerPrice: number,
+    upperPrice: number,
+  ) {
+    // Price is scaled to 1e8
+    const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();
+    const upperPriceFormatted = new Dec(upperPrice).mul(1e8).floor().toString();
+    return [
+      AbiCoder.encodeParameters(
+        ['address', 'address', 'address', 'uint256', 'uint256'],
+        [oracle, collateralToken, loanToken, lowerPriceFormatted, upperPriceFormatted],
+      ),
+    ];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'address', 'uint256', 'uint256'], triggerData[0]);
+    return {
+      oracle: decodedData[0] as EthereumAddress,
+      collateralToken: decodedData[1] as EthereumAddress,
+      loanToken: decodedData[2] as EthereumAddress,
+      lowerPrice: new Dec(decodedData[3] as string).div(1e8).toString(),
+      upperPrice: new Dec(decodedData[4] as string).div(1e8).toString(),
+    };
+  },
 };

package/src/types/enums.ts

@@ -222,6 +222,7 @@ export namespace Bundles {
     AAVE_V3_EOA_BOOST_ON_PRICE = 55,
     AAVE_V3_EOA_CLOSE = 56,
     SPARK_CLOSE = 57,
+    MORPHO_BLUE_CLOSE = 58,
   }
 
   export enum OptimismIds {
@@ -265,6 +266,7 @@ export namespace Bundles {
     AAVE_V3_EOA_REPAY_ON_PRICE = 25,
     AAVE_V3_EOA_BOOST_ON_PRICE = 26,
     AAVE_V3_EOA_CLOSE = 27,
+    MORPHO_BLUE_CLOSE = 28,
   }
 
   export enum ArbitrumIds {
@@ -296,6 +298,7 @@ export namespace Bundles {
     MORPHO_BLUE_BOOST_ON_PRICE = 25,
     MORPHO_BLUE_EOA_REPAY = 26,
     MORPHO_BLUE_EOA_BOOST = 27,
+    MORPHO_BLUE_CLOSE = 28,
   }
 }