@defisaver/automation-sdk 3.3.10 → 3.3.11-aave-v4-1-dev

package/src/services/strategySubService.test.ts

@@ -21,6 +21,8 @@ import {
   crvUSDEncode,
   compoundV3L2Encode,
   morphoBlueEncode,
+  sparkEncode,
+  aaveV4Encode,
 } from './strategySubService';
 
 describe('Feature: strategySubService.ts', () => {
@@ -1730,4 +1732,288 @@ describe('Feature: strategySubService.ts', () => {
       });
     });
   });
+
+  describe('When testing strategySubService.sparkEncode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[string, [number, number, number, number, boolean]]> = [
+        [
+          '0x0000000000000000136dcc951d8c00000000000000000000214e8348c4f0000000000000000000001d24b2dfac52000000000000000000001a5e27eef13e000001',
+          [140,240,210,190,true]
+        ],
+        [
+          '0x0000000000000000130337bdce49000000000000000000001988fe4052b800000000000000000000281b57b028e1000000000000000000002223acf76376000000',
+          [137, 184, 289, 246, false]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(sparkEncode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('leverageManagementOnPrice()', () => {
+      const examples: Array<[[StrategyOrBundleIds, boolean, TriggerData, SubData], 
+      [
+        strategyOrBundleId: number, 
+        isBundle: boolean, 
+        triggerData: { baseTokenAddr: EthereumAddress, quoteTokenAddr: EthereumAddress, price: number, ratioState: RatioState }, 
+        subData: { collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number }
+      ]]> = [
+        [
+          [
+            Bundles.MainnetIds.SPARK_REPAY_ON_PRICE,
+            true,
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+             '0x0000000000000000000000000000000000000000000000000000000000000000',
+             '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+             '0x0000000000000000000000000000000000000000000000000000000000000001',
+             '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+             '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+             '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+          ],
+          [
+            59,
+            true,
+            {
+              baseTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+              quoteTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+              price: 2500,
+              ratioState: RatioState.UNDER,
+            },
+            {
+              collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+              collAssetId: 0,
+              debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+              debtAssetId: 1,
+              marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+              targetRatio: 200,
+            },
+          ]
+        ],
+        [
+          [
+            Bundles.MainnetIds.SPARK_BOOST_ON_PRICE,
+            true,
+            ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000000000417bce6c8000000000000000000000000000000000000000000000000000000000000000000'],
+            [
+              '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+              '0x0000000000000000000000000000000000000000000000000000000000000002',
+              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+              '0x0000000000000000000000000000000000000000000000000000000000000004',
+              '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+              '0x00000000000000000000000000000000000000000000000022b1c8c1227a0000',
+              '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ]
+          ],
+          [
+            60,
+            true,
+            {
+              baseTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+              quoteTokenAddr: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+              price: 45000,
+              ratioState: RatioState.OVER,
+            },
+            {
+              collAsset: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+              collAssetId: 2,
+              debtAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+              debtAssetId: 4,
+              marketAddr: web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+              targetRatio: 250,
+            },
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(sparkEncode.leverageManagementOnPrice(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('closeOnPrice()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number,
+          collAsset: EthereumAddress,
+          collAssetId: number,
+          debtAsset: EthereumAddress,
+          debtAssetId: number,
+          marketAddr: EthereumAddress,
+          user: EthereumAddress,
+          stopLossPrice: number,
+          stopLossType: CloseToAssetType,
+          takeProfitPrice: number,
+          takeProfitType: CloseToAssetType,
+        ]
+      ] > = 
+      [
+        [
+          [
+            Bundles.MainnetIds.SPARK_CLOSE,
+            true,
+            ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000003a35294400000000000000000000000000000000000000000000000000000000574fbde6000'],
+            [
+              '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
+              '0x0000000000000000000000000000000000000000000000000000000000000002',
+              '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f',
+              '0x0000000000000000000000000000000000000000000000000000000000000004',
+              '0x0000000000000000000000000000000000000000000000000000000000000005',
+              '0x00000000000000000000000002c3ea4e34c0cbd694d2adfa2c690eecbc1793ee',
+              '0x0000000000000000000000001234567890123456789012345678901234567890',
+            ]
+          ],
+          [
+            57,
+            web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Ethereum).address),
+            2,
+            web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
+            4,
+            web3Utils.toChecksumAddress('0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE'),
+            web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+            40000,
+            CloseToAssetType.DEBT,
+            60000,
+            CloseToAssetType.COLLATERAL,
+          ]
+        ],
+      ]
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(sparkEncode.closeOnPriceGeneric(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+  describe('When testing strategySubService.aaveV4Encode', () => {
+    describe('leverageManagement()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number
+        ]
+      ]> = [
+        [
+          [1,true,["0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001"],["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e","0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c","0x0000000000000000000000000000000000000000000000000000000000000001","0x00000000000000000000000000000000000000000000000014d1120d7b160000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"]],
+          [
+            1,
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            RatioState.UNDER,
+            150,
+            120,
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV4Encode.leverageManagement(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('leverageManagementOnPrice()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, targetRatio: number, price: string, priceState: RatioState, ratioState: RatioState
+        ]
+      ]> = [
+        [
+          [2,true,["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000005150ae84a8cdf000000000000000000000000000000000000000000000000000000000000000000000"],["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e","0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c","0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2","0x000000000000000000000000000000000000000000000000000000000000000a","0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","0x0000000000000000000000000000000000000000000000000000000000000014","0x0000000000000000000000000000000000000000000000000000000000000000","0x00000000000000000000000000000000000000000000000016345785d8a00000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"]],
+          [
+            2,
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            10,
+            web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+            20,
+            160,
+            '1500',
+            RatioState.OVER, // priceState - goes to trigger
+            RatioState.OVER, // ratioState - UNDER for repay, OVER for boost
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV4Encode.leverageManagementOnPrice(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('closeOnPrice()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, stopLossPrice: string, stopLossType: CloseToAssetType, takeProfitPrice: string, takeProfitType: CloseToAssetType
+        ]
+      ]> = [
+        [
+          [3,true,["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000004be4e7267b6ae000000000000000000000000000000000000000000000000000000000000000000000"],["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e","0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c","0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2","0x000000000000000000000000000000000000000000000000000000000000000a","0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","0x0000000000000000000000000000000000000000000000000000000000000014","0x0000000000000000000000000000000000000000000000000000000000000003","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"]],
+          [
+            3,
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            10,
+            web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+            20,
+            '1400',
+            CloseToAssetType.DEBT,
+            '0',
+            CloseToAssetType.COLLATERAL
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV4Encode.closeOnPrice(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('collateralSwitch()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, amountToSwitch: string, price: string, ratioState: RatioState
+        ]
+      ]> = [
+        [
+          [4,false,["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000005150ae84a8cdf000000000000000000000000000000000000000000000000000000000000000000001"],["0x0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e","0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c","0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2","0x000000000000000000000000000000000000000000000000000000000000000a","0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48","0x0000000000000000000000000000000000000000000000000000000000000014","0x0000000000000000000000000000000000000000000000000de0b6b3a7640000","0x0000000000000000000000000000000000000000000000000000000000000000","0x0000000000000000000000000000000000000000000000000000000000000000"]],
+          [
+            4,
+            web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+            web3Utils.toChecksumAddress('0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e'),
+            web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            10,
+            web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+            20,
+            '1000000000000000000',
+            '1500',
+            RatioState.UNDER,
+          ]
+        ]
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV4Encode.collateralSwitch(...actual)).to.eql(expected);
+        });
+      });
+    });
+  });
 });

package/src/services/strategySubService.ts

@@ -581,6 +581,28 @@ export const sparkEncode = {
 
     return subInput;
   },
+  leverageManagementOnPrice(
+    strategyOrBundleId: number,
+    isBundle: boolean = true,
+    triggerData: {
+      baseTokenAddr: EthereumAddress, quoteTokenAddr: EthereumAddress, price: number, ratioState: RatioState
+    },
+    subData: {
+      collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number,
+    },
+  ) {
+    const {
+      collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio,
+    } = subData;
+    const subDataEncoded = subDataService.sparkLeverageManagementOnPriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio);
+
+    const {
+      baseTokenAddr, quoteTokenAddr, price, ratioState,
+    } = triggerData;
+    const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddr, quoteTokenAddr, price, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+  },
   closeOnPriceGeneric(
     strategyOrBundleId: number,
     collAsset: EthereumAddress,
@@ -824,3 +846,121 @@ export const fluidEncode = {
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
 };
+
+export const aaveV4Encode = {
+  leverageManagement(
+    strategyOrBundleId: number,
+    owner: EthereumAddress,
+    spoke: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    const isBundle = true;
+    const subData = subDataService.aaveV4LeverageManagementSubData.encode(spoke, owner, ratioState, targetRatio);
+    const triggerData = triggerService.aaveV4RatioTrigger.encode(owner, spoke, triggerRatio, ratioState);
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+  leverageManagementOnPrice(
+    strategyOrBundleId: number,
+    owner: EthereumAddress,
+    spoke: EthereumAddress,
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    targetRatio: number,
+    price: string,
+    priceState: RatioState,
+    ratioState: RatioState, // UNDER for repay, OVER for boost
+  ) {
+    const isBundle = true;
+    const subData = subDataService.aaveV4LeverageManagementOnPriceSubData.encode(
+      spoke,
+      owner,
+      collAsset,
+      collAssetId,
+      debtAsset,
+      debtAssetId,
+      ratioState,
+      targetRatio,
+    );
+    const triggerData = triggerService.aaveV4QuotePriceTrigger.encode(
+      spoke,
+      collAssetId,
+      debtAssetId,
+      price,
+      priceState,
+    );
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+  closeOnPrice(
+    strategyOrBundleId: number,
+    owner: EthereumAddress,
+    spoke: EthereumAddress,
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    stopLossPrice: string = '0',
+    stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
+    takeProfitPrice: string = '0',
+    takeProfitType: CloseToAssetType = CloseToAssetType.COLLATERAL,
+  ) {
+    const isBundle = true;
+    const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+
+    const subData = subDataService.aaveV4CloseSubData.encode(
+      spoke,
+      owner,
+      collAsset,
+      collAssetId,
+      debtAsset,
+      debtAssetId,
+      closeType,
+    );
+    const triggerData = triggerService.aaveV4QuotePriceRangeTrigger.encode(
+      spoke,
+      collAssetId,
+      debtAssetId,
+      stopLossPrice,
+      takeProfitPrice,
+    );
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+  collateralSwitch(
+    strategyOrBundleId: number,
+    owner: EthereumAddress,
+    spoke: EthereumAddress,
+    fromAsset: EthereumAddress,
+    fromAssetId: number,
+    toAsset: EthereumAddress,
+    toAssetId: number,
+    amountToSwitch: string,
+    price: string,
+    ratioState: RatioState,
+  ) {
+    const isBundle = false;
+    const subData = subDataService.aaveV4CollateralSwitchSubData.encode(
+      spoke,
+      owner,
+      fromAsset,
+      fromAssetId,
+      toAsset,
+      toAssetId,
+      amountToSwitch,
+    );
+    const triggerData = triggerService.aaveV4QuotePriceTrigger.encode(
+      spoke,
+      fromAssetId, // baseTokenId
+      toAssetId, // quoteTokenId
+      price,
+      ratioState,
+    );
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+};