@defisaver/automation-sdk 2.0.5 → 2.0.8

package/src/services/ethereumService.test.ts

@@ -0,0 +1,256 @@
+import Web3 from 'web3';
+import { expect } from 'chai';
+import { getAssetInfo } from '@defisaver/tokens';
+import { PastEventOptions } from 'web3-eth-contract';
+
+import { ChainId } from '../types/enums';
+import type { BlockNumber, Multicall } from '../types';
+import { Contract } from '../types';
+import type { Erc20 } from '../types/contracts/generated';
+
+import { getEventsFromContract, multicall, } from './ethereumService';
+
+import { makeErc20Contract } from './contractService';
+
+require('dotenv').config({ path: '.env' });
+
+const Web3_1 = new Web3(process.env.RPC_1!);
+const Web3_10 = new Web3(process.env.RPC_10!);
+const Web3_42161 = new Web3(process.env.RPC_42161!);
+
+describe('Feature: ethereumService.ts', () => {
+  describe('When testing ethereumService.multicall', () => {
+    const examples: Array<[
+      Multicall.Payload,
+      [
+        web3: Web3,
+        chainId: ChainId,
+        calls: Multicall.Calls[],
+        block: BlockNumber,
+      ]
+    ]> = [
+      [
+        [{ 0: 'Wrapped Ether', '__length__': 1 }, { 0: '18', '__length__': 1 }],
+        [
+          Web3_1,
+          ChainId.Ethereum,
+          [
+            {
+              abiItem: {'constant':true,'inputs':[],'name':'name','outputs':[{'name':'','type':'string'}],'payable':false,'stateMutability':'view','type':'function'},
+              target: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              params: [],
+            },
+            {
+              abiItem: {'constant':true,'inputs':[],'name':'decimals','outputs':[{'name':'','type':'uint8'}],'payable':false,'stateMutability':'view','type':'function'},
+              target: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+              params: [],
+            }
+          ],
+          'latest',
+        ]
+      ],
+      [
+        [{ 0: 'Wrapped Ether', '__length__': 1 }, { 0: '18', '__length__': 1 }],
+        [
+          Web3_10,
+          ChainId.Optimism,
+          [
+            {
+              abiItem: {'constant':true,'inputs':[],'name':'name','outputs':[{'name':'','type':'string'}],'payable':false,'stateMutability':'view','type':'function'},
+              target: '0x4200000000000000000000000000000000000006',
+              params: [],
+            },
+            {
+              abiItem: {'constant':true,'inputs':[],'name':'decimals','outputs':[{'name':'','type':'uint8'}],'payable':false,'stateMutability':'view','type':'function'},
+              target: '0x4200000000000000000000000000000000000006',
+              params: [],
+            }
+          ],
+          'latest',
+        ]
+      ],
+      [
+        [{ 0: 'Wrapped Ether', '__length__': 1 }, { 0: '18', '__length__': 1 }],
+        [
+          Web3_42161,
+          ChainId.Arbitrum,
+          [
+            {
+              abiItem: {'constant':true,'inputs':[],'name':'name','outputs':[{'name':'','type':'string'}],'payable':false,'stateMutability':'view','type':'function'},
+              target: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
+              params: [],
+            },
+            {
+              abiItem: {'constant':true,'inputs':[],'name':'decimals','outputs':[{'name':'','type':'uint8'}],'payable':false,'stateMutability':'view','type':'function'},
+              target: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
+              params: [],
+            }
+          ],
+          'latest',
+        ]
+      ],
+    ];
+
+    examples.forEach(([expected, actual]) => {
+      it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, async () => {
+        expect(await multicall(...actual)).to.eql(expected);
+      });
+    });
+  });
+
+  describe('When testing ethereumService.getEventsFromContract', () => {
+    const examples: Array<[
+      any[],
+      [
+        contractWithMeta: Contract.WithMeta<Erc20>,
+        contractWithMetaFork: Contract.WithMeta<Erc20> | null,
+        event: string,
+        options?: PastEventOptions,
+      ]
+    ]> = [
+      [
+        [
+          {
+            'address': '0x5f98805A4E8be255a32880FDeC7F6728C6568bA0',
+            'blockHash': '0xb92cab2569456dbfbdb853d2c67d72c9a7580543dbcb55d483a77322b40755a4',
+            'blockNumber': 15166163,
+            'event': 'Transfer',
+            'id': 'log_e2258e3a',
+            'logIndex': 385,
+            'raw': {
+              'data': '0x0000000000000000000000000000000000000000000001b58c2186829983fca9',
+              'topics': [
+                '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+                '0x000000000000000000000000ea57dc30959eb17c506e4da095fa9181f3e0ac6d',
+                '0x0000000000000000000000009ccf93089cb14f94baeb8822f8ceffd91bd71649',
+              ],
+            },
+            'removed': false,
+            'returnValues': {
+              '0': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
+              '1': '0x9cCf93089cb14F94BAeB8822F8CeFfd91Bd71649',
+              '2': '8071324659946094853289',
+              'from': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
+              'to': '0x9cCf93089cb14F94BAeB8822F8CeFfd91Bd71649',
+              'value': '8071324659946094853289',
+            },
+            'signature': '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+            'transactionHash': '0x95b28d8f71719c219e09b428e6ff781d717088784fbf63681446da13de6b0c4a',
+            'transactionIndex': 187,
+          },
+        ],
+        [
+          makeErc20Contract(Web3_1, getAssetInfo('LUSD').address, ChainId.Ethereum),
+          null,
+          'Transfer',
+          {
+            fromBlock: 15166163,
+            toBlock: 15166163,
+            filter: {
+              from: '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
+              to: '0x9cCf93089cb14F94BAeB8822F8CeFfd91Bd71649',
+            }
+          },
+        ]
+      ],
+      [
+        [
+          {
+            'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
+            'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
+            'blockNumber': 5353002,
+            'event': 'Transfer',
+            'id': 'log_f49645b8',
+            'logIndex': 1,
+            'raw': {
+              'data': '0x000000000000000000000000000000000000000000000001158e460913d00000',
+              'topics': [
+                '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+                '0x000000000000000000000000ea57dc30959eb17c506e4da095fa9181f3e0ac6d',
+                '0x00000000000000000000000013a22f1bba428eaaf56960530ec11118da916c11',
+              ],
+            },
+            'removed': false,
+            'returnValues': {
+              '0': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
+              '1': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
+              '2': '20000000000000000000',
+              'from': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
+              'to': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
+              'value': '20000000000000000000',
+            },
+            'signature': '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+            'transactionHash': '0x37c886a97c938747299c0f6b3e4591304bdd47a938df7c8146454d6fee5a6501',
+            'transactionIndex': 0,
+          },
+        ],
+        [
+          makeErc20Contract(Web3_10, getAssetInfo('DAI', ChainId.Optimism).address, ChainId.Optimism),
+          null,
+          'Transfer',
+          {
+            fromBlock: 5353002,
+            toBlock: 5353002,
+            filter: {
+              from: '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
+              to: '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
+            }
+          },
+        ]
+      ],
+      [
+        [
+          {
+            'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
+            'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
+            'blockNumber': 5353002,
+            'event': 'Transfer',
+            'id': 'log_f49645b8',
+            'logIndex': 1,
+            'raw': {
+              'data': '0x000000000000000000000000000000000000000000000001158e460913d00000',
+              'topics': [
+                '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+                '0x000000000000000000000000ea57dc30959eb17c506e4da095fa9181f3e0ac6d',
+                '0x00000000000000000000000013a22f1bba428eaaf56960530ec11118da916c11',
+              ],
+            },
+            'removed': false,
+            'returnValues': {
+              '0': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
+              '1': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
+              '2': '20000000000000000000',
+              'from': '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
+              'to': '0x13A22f1bBa428eaAf56960530Ec11118DA916C11',
+              'value': '20000000000000000000',
+            },
+            'signature': '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+            'transactionHash': '0x37c886a97c938747299c0f6b3e4591304bdd47a938df7c8146454d6fee5a6501',
+            'transactionIndex': 0,
+          },
+        ],
+        [
+          makeErc20Contract(Web3_10, getAssetInfo('DAI', ChainId.Arbitrum).address, ChainId.Arbitrum),
+          null,
+          'Transfer',
+          {
+            fromBlock: 5353002,
+            toBlock: 5353002,
+            filter: {
+              from: '0xEA57Dc30959eb17c506E4dA095fa9181f3E0Ac6D',
+              to: '0x13a22f1bba428eaaf56960530ec11118da916c11',
+            }
+          },
+        ]
+      ],
+    ];
+
+    examples.forEach(([expected, actual]) => {
+      it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, async () => {
+        const data = await getEventsFromContract(...actual);
+        console.log(data);
+        expect(await getEventsFromContract(...actual)).to.eql(expected);
+      });
+    });
+  });
+});

package/src/services/ethereumService.ts

@@ -44,7 +44,8 @@ export async function multicall(
 export async function getEventsFromContract<T extends BaseContract>(
   contractWithMeta: Contract.WithMeta<T>,
   contractWithMetaFork: Contract.WithMeta<T> | null,
-  event: string, options?: PastEventOptions,
+  event: string,
+  options?: PastEventOptions,
 ) {
   const events = await contractWithMeta.contract.getPastEvents(
     event,

package/src/services/strategiesService.test.ts

@@ -0,0 +1,103 @@
+import { expect } from 'chai';
+
+import { ProtocolIdentifiers, Strategies } from '../types/enums';
+import type { ParseData, Position } from '../types';
+
+import { parseStrategiesAutomatedPosition } from './strategiesService';
+
+describe('Feature: strategiesService.ts', () => {
+  describe('When testing strategiesService.parseStrategiesAutomatedPosition', async () => {
+    // TODO: we should probably write this for every strategy?
+    const examples: Array<[Position.Automated | null, ParseData]> = [
+      [
+        {
+          isEnabled: true,
+          chainId: 1,
+          subHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+          blockNumber: 18015756,
+          subId: 379,
+          owner: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+          protocol: {
+            id: ProtocolIdentifiers.StrategiesAutomation.AaveV3,
+            name: 'Aave',
+            slug: 'aave',
+            version: 'V3',
+            fullName: 'Aave V3'
+          },
+          strategy: {
+            isBundle: true,
+            strategyOrBundleId: 8,
+            strategyId: Strategies.IdOverrides.LeverageManagement,
+            protocol: {
+              id: ProtocolIdentifiers.StrategiesAutomation.AaveV3,
+              name: 'Aave',
+              slug: 'aave',
+              version: 'V3',
+              fullName: 'Aave V3'
+            }
+          },
+          strategyData: {
+            encoded: {
+              triggerData: [
+                '0x0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000019ac8532c27900000000000000000000000000000000000000000000000000000000000000000001',
+              ],
+              subData: [
+                '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                '0x0000000000000000000000000000000000000000000000000000000000000001',
+                '0x0000000000000000000000000000000000000000000000000000000000000001',
+                '0x0000000000000000000000000000000000000000000000000000000000000000'
+              ]
+            },
+            decoded: {
+              triggerData: {
+                owner: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+                market: '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e',
+                ratio: 185,
+                ratioState: 1
+              },
+              subData: { targetRatio: 200 }
+            }
+          },
+          specific: {
+            triggerRepayRatio: 185,
+            targetRepayRatio: 200,
+            repayEnabled: true,
+            subId1: 379,
+            mergeWithSameId: true
+          }
+        },
+        {
+          chainId: 1,
+          blockNumber: 18015756,
+          subscriptionEventData: {
+            subId: '379',
+            proxy: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+            subHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+            // @ts-ignore
+            subStruct:
+              {
+                strategyOrBundleId: '8',
+                isBundle: true,
+                triggerData: ['0x0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000019ac8532c27900000000000000000000000000000000000000000000000000000000000000000001'],
+                subData: [
+                  '0x0000000000000000000000000000000000000000000000001bc16d674ec80000', '0x0000000000000000000000000000000000000000000000000000000000000001',
+                  '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000000000000000000000',
+                ],
+              }
+          },
+          strategiesSubsData: {
+            userProxy: '0x9cb7e19861665366011899d74e75d4f2a419aeed',
+            isEnabled: true,
+            strategySubHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1'
+          }
+        },
+      ],
+    ];
+
+    examples.forEach(([expected, actual]) => {
+      it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, async () => {
+        expect(parseStrategiesAutomatedPosition(actual)).to.eql(expected);
+      });
+    });
+  });
+});

package/src/services/strategiesService.ts

@@ -4,6 +4,7 @@ import { cloneDeep } from 'lodash';
 import { BUNDLES_INFO, STRATEGIES_INFO } from '../constants';
 import type {
   Position, ParseData, StrategiesToProtocolVersionMapping, BundleOrStrategy, StrategyOrBundleIds,
+  BundleInfoUnion, StrategyInfoUnion,
 } from '../types';
 import type { ChainId } from '../types/enums';
 import { ProtocolIdentifiers, Strategies } from '../types/enums';
@@ -77,6 +78,7 @@ function parseMakerTrailingStop(position: Position.Automated, parseData: ParseDa
 
   return _position;
 }
+
 function parseMakerLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -112,6 +114,7 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
 
   return _position;
 }
+
 function parseLiquityCloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -299,6 +302,43 @@ function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseD
   return _position;
 }
 
+function parseAaveV3CloseOnPriceWithMaximumGasPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.aaveV3QuotePriceWithMaximumGasPriceTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.aaveV3QuotePriceSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.specific = {
+    collAsset: subData.collAsset,
+    collAssetId: subData.collAssetId,
+    debtAsset: subData.debtAsset,
+    debtAssetId: subData.debtAssetId,
+    baseToken: triggerData.baseTokenAddress,
+    quoteToken: triggerData.quoteTokenAddress,
+    price: triggerData.price,
+    maximumGasPrice: triggerData.maximumGasPrice,
+    ratioState: triggerData.ratioState,
+  };
+
+  const { ratioState } = getRatioStateInfoForAaveCloseStrategy(
+    _position.specific.ratioState,
+    wethToEthByAddress(_position.specific.collAsset, parseData.chainId),
+    wethToEthByAddress(_position.specific.debtAsset, parseData.chainId),
+    parseData.chainId,
+  );
+
+  _position.strategy.strategyId = isRatioStateOver(ratioState)
+    ? Strategies.IdOverrides.TakeProfitWithGasPrice
+    : Strategies.IdOverrides.StopLossWithGasPrice;
+
+  return _position;
+}
+
 function parseCompoundV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -412,6 +452,7 @@ function parseExchangeDca(position: Position.Automated, parseData: ParseData, ch
 
   return _position;
 }
+
 function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseData, chainId: ChainId): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -424,6 +465,7 @@ function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseD
 
   return _position;
 }
+
 function parseLiquityLeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -551,6 +593,24 @@ function parseLiquitySavingsLiqProtection(position: Position.Automated, parseDat
   return _position;
 }
 
+function parseDebtInFrontRepay(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.liquityDebtInFrontWithLimitTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.liquityDebtInFrontRepaySubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.specific = {
+    debtInFrontMin: triggerData.debtInFrontMin,
+    targetRepayRatioIncrease: subData.targetRatioIncrease,
+  };
+
+  return _position;
+}
 
 const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
@@ -570,6 +630,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.Boost]: parseLiquityLeverageManagement,
     [Strategies.Identifiers.SavingsDsrPayback]: parseLiquitySavingsLiqProtection,
     [Strategies.Identifiers.SavingsDsrSupply]: parseLiquitySavingsLiqProtection,
+    [Strategies.Identifiers.DebtInFrontRepay]: parseDebtInFrontRepay,
   },
   [ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
     [Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,
@@ -579,7 +640,9 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.Repay]: parseAaveV3LeverageManagement,
     [Strategies.Identifiers.Boost]: parseAaveV3LeverageManagement,
     [Strategies.Identifiers.CloseToDebt]: parseAaveV3CloseOnPrice,
+    [Strategies.Identifiers.CloseToDebtWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
     [Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice,
+    [Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
     [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -623,12 +686,12 @@ export function parseStrategiesAutomatedPosition(parseData: ParseData): Position
   } = subscriptionEventData;
   const { isEnabled } = strategiesSubsData;
 
-  const id = subStruct.strategyOrBundleId as StrategyOrBundleIds;
+  const id = subStruct.strategyOrBundleId as unknown as StrategyOrBundleIds;
 
   const strategyOrBundleInfo = (
     subStruct.isBundle
-      ? BUNDLES_INFO[chainId][id]
-      : STRATEGIES_INFO[chainId][id]
+      ? BUNDLES_INFO[chainId][id as keyof BundleInfoUnion]
+      : STRATEGIES_INFO[chainId][id as keyof StrategyInfoUnion]
   ) as BundleOrStrategy;
 
   if (!strategyOrBundleInfo) return null;