@defisaver/automation-sdk 2.0.1 → 2.0.3

package/src/automation/private/LegacyAutomation.ts

@@ -1,6 +1,6 @@
 import type Web3 from 'web3';
 import type {
-  EthereumAddress, Position, Interfaces, Contract, PlaceholderType,
+  EthereumAddress, Position, Interfaces, Contract, PlaceholderType, SubscriptionOptions,
 } from '../../types';
 import type {
   Legacy_AaveV2Subscriptions, Legacy_CompoundV2Subscriptions, Legacy_MakerSubscriptions, Legacy_AuthCheck,
@@ -85,8 +85,8 @@ export default class LegacyAutomation extends Automation {
     return this.protocol.id === ProtocolIdentifiers.LegacyAutomation.MakerDAO ? 'owner' : 'user';
   }
 
-  protected async _getSubscriptions(addresses?: EthereumAddress[]): Promise<PlaceholderType> { // TODO PlaceholderType
-    let subscriptions = await this.subscriptionsContract.contract.methods.getSubscribers().call();
+  protected async _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<PlaceholderType> { // TODO PlaceholderType
+    let subscriptions = await this.subscriptionsContract.contract.methods.getSubscribers().call({}, options?.fromBlock || 'latest');
 
     if (addresses) {
       const _addresses = addresses.map(a => a.toLowerCase());
@@ -98,14 +98,15 @@ export default class LegacyAutomation extends Automation {
     return subscriptions;
   }
 
-  protected async getParsedSubscriptions(addresses?: EthereumAddress[]): Promise<Position.LegacyAutomated[]> {
-    const subscriptions = await this._getSubscriptions(addresses);
+  protected async getParsedSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<Position.LegacyAutomated[]> {
+    const subscriptions = await this._getSubscriptions(addresses, options);
 
     // @ts-ignore
     return subscriptions.map((sub) => ({
       chainId: this.chainId,
       owner: sub[this.getOwnerPropName()],
-      isEnabled: true,
+      isEnabled: (options?.fromBlock && options?.fromBlock !== 'latest')
+        ? options?.fromBlock > 18213086 : false, // Legacy automation was disabled on block 18213086
       protocol: this.protocol,
       specific: { ...sub },
       strategy: {
@@ -115,11 +116,11 @@ export default class LegacyAutomation extends Automation {
     }));
   }
 
-  public async getSubscriptions(): Promise<Position.LegacyAutomated[]> {
-    return this.getParsedSubscriptions();
+  public async getSubscriptions(options?: SubscriptionOptions): Promise<Position.LegacyAutomated[]> {
+    return this.getParsedSubscriptions(undefined, options);
   }
 
-  public async getSubscriptionsFor(addresses: EthereumAddress[]): Promise<Position.LegacyAutomated[]> {
-    return this.getParsedSubscriptions(addresses);
+  public async getSubscriptionsFor(addresses: EthereumAddress[], options?: SubscriptionOptions): Promise<Position.LegacyAutomated[]> {
+    return this.getParsedSubscriptions(addresses, options);
   }
 }

package/src/automation/private/StrategiesAutomation.ts

@@ -2,11 +2,10 @@ import Dec from 'decimal.js';
 import type Web3 from 'web3';
 import type { PastEventOptions } from 'web3-eth-contract';
 import type {
-  Position, Interfaces, EthereumAddress,
-  SubscriptionOptions, Contract, ParseData, PlaceholderType,
+  Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, PlaceholderType, BlockNumber,
 } from '../../types';
 import type {
-  Subscribe, StrategyModel, SubStorage, UpdateData,
+  StrategyModel, SubStorage,
 } from '../../types/contracts/generated/SubStorage';
 import type { ChainId } from '../../types/enums';
 
@@ -49,7 +48,7 @@ export default class StrategiesAutomation extends Automation {
     return getEventsFromContract<SubStorage>(this.subStorageContract, this.subStorageContractFork, event, options);
   }
 
-  protected async getStrategiesSubs(subIds: number[]): Promise<StrategyModel.StoredSubDataStructOutputStruct[]> {
+  protected async getStrategiesSubs(subIds: number[], fromBlock: BlockNumber = 'latest'): Promise<StrategyModel.StoredSubDataStructOutputStruct[]> {
     let options : any;
     let web3: Web3;
 
@@ -68,7 +67,7 @@ export default class StrategiesAutomation extends Automation {
     }
 
     const multicallCalls = subIds.map((subId) => ({ ...options, params: [subId] }));
-    return multicall(web3, this.chainId, multicallCalls);
+    return multicall(web3, this.chainId, multicallCalls, fromBlock);
   }
 
   protected async getSubscriptionEventsFromSubStorage(options?: PastEventOptions) {
@@ -98,7 +97,7 @@ export default class StrategiesAutomation extends Automation {
 
     if (subscriptionEvents) {
       // @ts-ignore
-      const strategiesSubs = await this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId));
+      const strategiesSubs = await this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.fromBlock);
 
       subscriptions = await Promise.all(strategiesSubs.map(async (sub, index: number) => {
         let latestUpdate = subscriptionEvents[index].returnValues;

package/src/configuration.ts

@@ -1,8 +1,5 @@
-import Web3 from 'web3';
 import Dec from 'decimal.js';
 
-process.mockedWeb3 = new Web3('');
-
 Dec.set({
   rounding: Dec.ROUND_DOWN,
   toExpPos: 9e15,

package/src/constants/index.ts

@@ -80,6 +80,16 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     strategyId: Strategies.Identifiers.LimitOrder,
     protocol: PROTOCOLS.Exchange,
   },
+  [Strategies.MainnetIds.LIQUITY_DSR_PAYBACK]: {
+    strategyOrBundleId: Strategies.MainnetIds.LIQUITY_DSR_PAYBACK,
+    strategyId: Strategies.Identifiers.SavingsDsrPayback,
+    protocol: PROTOCOLS.Liquity,
+  },
+  [Strategies.MainnetIds.LIQUITY_DSR_SUPPLY]: {
+    strategyOrBundleId: Strategies.MainnetIds.LIQUITY_DSR_SUPPLY,
+    strategyId: Strategies.Identifiers.SavingsDsrSupply,
+    protocol: PROTOCOLS.Liquity,
+  },
 };
 
 export const OPTIMISM_STRATEGIES_INFO = {

package/src/index.ts

@@ -2,7 +2,6 @@
 //  [] Check @ts-ignores and PlaceholderType
 //  [] Improve typing for subData, trigger and strategySub services
 //  [] Make possible to use any provider not only web3 (This requires changes throughout the package)
-//  [] Write unit tests
 
 import './configuration';
 

package/src/services/ethereumService.ts

@@ -1,3 +1,5 @@
+import AbiCoder from 'web3-eth-abi';
+
 import type Web3 from 'web3';
 import type { PastEventOptions } from 'web3-eth-contract';
 import type {
@@ -9,8 +11,6 @@ import { addToObjectIf, isDefined } from './utils';
 import type { BaseContract } from '../types/contracts/generated/types';
 import type { ChainId } from '../types/enums';
 
-const { mockedWeb3 } = process;
-
 export async function multicall(
   web3: Web3,
   chainId: ChainId,
@@ -20,7 +20,7 @@ export async function multicall(
   const multicallContract = makeUniMulticallContract(web3, chainId).contract;
 
   const formattedCalls: Multicall.FormattedCalls[] = calls.map((call) => ({
-    callData: mockedWeb3.eth.abi.encodeFunctionCall(call.abiItem, call.params),
+    callData: AbiCoder.encodeFunctionCall(call.abiItem, call.params),
     target: call.target || '0x0',
     gasLimit: call.gasLimit || 1e6,
   }));
@@ -33,12 +33,12 @@ export async function multicall(
 
   callResult.returnData.forEach(([success, gasUsed, result], i) => {
     const formattedRes = (result !== '0x'
-      ? mockedWeb3.eth.abi.decodeParameters(calls[i].abiItem.outputs!, result)
-      : undefined) as Multicall.Payload;
+      ? AbiCoder.decodeParameters(calls[i].abiItem.outputs!, result)
+      : undefined);
     formattedResult = [...formattedResult, formattedRes];
   });
 
-  return formattedResult;
+  return formattedResult as Multicall.Payload;
 }
 
 export async function getEventsFromContract<T extends BaseContract>(

package/src/services/strategiesService.ts

@@ -530,6 +530,28 @@ function parseSparkCloseOnPrice(position: Position.Automated, parseData: ParseDa
   return _position;
 }
 
+function parseLiquitySavingsLiqProtection(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct } = parseData.subscriptionEventData;
+
+  const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.makerRepayFromSavingsSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  _position.specific = {
+    triggerRepayRatio: triggerData.ratio,
+    targetRepayRatio: subData.targetRatio,
+    repayEnabled: true,
+    boostEnabled: false,
+  };
+
+  return _position;
+}
+
+
 const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -546,6 +568,8 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.BondProtection]: parseLiquityBondProtection,
     [Strategies.Identifiers.Repay]: parseLiquityLeverageManagement,
     [Strategies.Identifiers.Boost]: parseLiquityLeverageManagement,
+    [Strategies.Identifiers.SavingsDsrPayback]: parseLiquitySavingsLiqProtection,
+    [Strategies.Identifiers.SavingsDsrSupply]: parseLiquitySavingsLiqProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
     [Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,

package/src/services/strategySubService.ts

@@ -164,6 +164,36 @@ export const liquityEncode = {
       boostEnabled,
     ];
   },
+  dsrPayback(
+    proxyAddress: EthereumAddress,
+    triggerRatio: number,
+    targetRatio: number,
+  ) {
+    requireAddress(proxyAddress);
+    const subData = subDataService.liquityDsrPaybackSubData.encode(targetRatio);
+    const triggerData = triggerService.liquityRatioTrigger.encode(proxyAddress, triggerRatio, RatioState.UNDER);
+
+    const strategyOrBundleId = Strategies.MainnetIds.LIQUITY_DSR_PAYBACK;
+
+    const isBundle = false;
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
+  dsrSupply(
+    proxyAddress: EthereumAddress,
+    triggerRatio: number,
+    targetRatio: number,
+  ) {
+    requireAddress(proxyAddress);
+    const subData = subDataService.liquityDsrSupplySubData.encode(targetRatio);
+    const triggerData = triggerService.liquityRatioTrigger.encode(proxyAddress, triggerRatio, RatioState.UNDER);
+
+    const strategyOrBundleId = Strategies.MainnetIds.LIQUITY_DSR_SUPPLY;
+
+    const isBundle = false;
+
+    return [strategyOrBundleId, isBundle, triggerData, subData];
+  },
 };
 
 export const chickenBondsEncode = {

package/src/services/subDataService.ts

@@ -1,16 +1,15 @@
 import Dec from 'decimal.js';
+import AbiCoder from 'web3-eth-abi';
 import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { otherAddresses } from '@defisaver/sdk';
 
 import type { EthereumAddress, SubData } from '../types';
-import { ChainId } from '../types/enums';
+import { ChainId, RatioState } from '../types/enums';
 
 import { ZERO_ADDRESS } from '../constants';
 
 import { compareAddresses, ratioPercentageToWei, weiToRatioPercentage } from './utils';
 
-const { mockedWeb3 } = process;
-
 export const makerRepayFromSavingsSubData = {
   encode(
     vaultId: number,
@@ -23,22 +22,22 @@ export const makerRepayFromSavingsSubData = {
     // @ts-ignore // TODO - this requires change in @defisaver/tokens
     const _mcdCdpManagerAddr = mcdCdpManagerAddr || otherAddresses(chainId).McdCdpManager;
 
-    const vaultIdEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', vaultId.toString());
+    const vaultIdEncoded = AbiCoder.encodeParameter('uint256', vaultId.toString());
     const targetRatioWei = ratioPercentageToWei(targetRatioPercentage);
-    const targetRatioEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', targetRatioWei);
-    const daiAddrEncoded = mockedWeb3.eth.abi.encodeParameter('address', _daiAddr);
-    const mcdManagerAddrEncoded = mockedWeb3.eth.abi.encodeParameter('address', _mcdCdpManagerAddr);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', targetRatioWei);
+    const daiAddrEncoded = AbiCoder.encodeParameter('address', _daiAddr);
+    const mcdManagerAddrEncoded = AbiCoder.encodeParameter('address', _mcdCdpManagerAddr);
 
     return [vaultIdEncoded, targetRatioEncoded, daiAddrEncoded, mcdManagerAddrEncoded];
   },
   decode(subData: SubData): { vaultId: number, daiAddr: string, mcdManagerAddr: string, targetRatio: number } {
-    const vaultId = +mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]).toString();
+    const vaultId = +AbiCoder.decodeParameter('uint256', subData[0])!.toString();
 
-    const weiRatio = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]) as any as string;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
     const targetRatio = weiToRatioPercentage(weiRatio);
 
-    const daiAddr = mockedWeb3.eth.abi.decodeParameter('address', subData[2]).toString();
-    const mcdManagerAddr = mockedWeb3.eth.abi.decodeParameter('address', subData[3]).toString();
+    const daiAddr = AbiCoder.decodeParameter('address', subData[2])!.toString();
+    const mcdManagerAddr = AbiCoder.decodeParameter('address', subData[3])!.toString();
 
     return {
       vaultId, targetRatio, daiAddr, mcdManagerAddr,
@@ -58,23 +57,23 @@ export const makerCloseSubData = {
     // @ts-ignore // TODO - this requires change in @defisaver/tokens
     const _mcdCdpManagerAddr = mcdCdpManagerAddr || otherAddresses(chainId).McdCdpManager;
 
-    const vaultIdEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', vaultId.toString());
-    const daiAddrEncoded = mockedWeb3.eth.abi.encodeParameter('address', _daiAddr);
-    const mcdManagerAddrEncoded = mockedWeb3.eth.abi.encodeParameter('address', _mcdCdpManagerAddr);
+    const vaultIdEncoded = AbiCoder.encodeParameter('uint256', vaultId.toString());
+    const daiAddrEncoded = AbiCoder.encodeParameter('address', _daiAddr);
+    const mcdManagerAddrEncoded = AbiCoder.encodeParameter('address', _mcdCdpManagerAddr);
 
     if (compareAddresses(closeToAssetAddr, _daiAddr)) {
       // Close to DAI strategy
       return [vaultIdEncoded, daiAddrEncoded, mcdManagerAddrEncoded];
     }
     // Close to collateral strategy
-    const collAddrEncoded = mockedWeb3.eth.abi.encodeParameter('address', closeToAssetAddr);
+    const collAddrEncoded = AbiCoder.encodeParameter('address', closeToAssetAddr);
     return [vaultIdEncoded, collAddrEncoded, daiAddrEncoded, mcdManagerAddrEncoded];
   },
   decode(subData: SubData): { vaultId: number, closeToAssetAddr: EthereumAddress } {
-    const vaultId = +mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]);
+    const vaultId = +AbiCoder.decodeParameter('uint256', subData[0])!;
     // if closing to collateral, asset addr will be 2nd param out of 4
     // if closing to DAI, will return 2nd param out of 3, which will be DAI addr
-    const closeToAssetAddr = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString().toLowerCase();
+    const closeToAssetAddr = AbiCoder.decodeParameter('address', subData[1])!.toString().toLowerCase();
 
     return {
       vaultId, closeToAssetAddr,
@@ -92,15 +91,15 @@ export const makerLeverageManagementSubData = {
   //   boostEnabled,
   // ],
   decode: (subData:SubData) => {
-    const vaultId = +mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]).toString();
-    const weiRatio = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]) as any as string;
+    const vaultId = +AbiCoder.decodeParameter('uint256', subData[0])!.toString();
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
     const targetRatio = weiToRatioPercentage(weiRatio);
     return { vaultId, targetRatio };
   },
 };
 export const liquityLeverageManagementSubData = {
   decode: (subData:SubData) => {
-    const weiRatio = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]) as any as string;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
     const targetRatio = weiToRatioPercentage(weiRatio);
     return { targetRatio };
   },
@@ -115,8 +114,8 @@ export const liquityCloseSubData = {
     const _collAddr = collAddr || getAssetInfo('WETH', chainId).address;
     const _debtAddr = debtAddr || getAssetInfo('LUSD', chainId).address;
 
-    const collAddrEncoded = mockedWeb3.eth.abi.encodeParameter('address', _collAddr);
-    const debtAddrEncoded = mockedWeb3.eth.abi.encodeParameter('address', _debtAddr);
+    const collAddrEncoded = AbiCoder.encodeParameter('address', _collAddr);
+    const debtAddrEncoded = AbiCoder.encodeParameter('address', _debtAddr);
     // if (compareAddresses(closeToAssetAddr, daiAddr)) { // TODO - Uhm, wth?
     //   // close to LUSD strategy
     //   return [daiAddrEncoded, mcdManagerAddrEncoded];
@@ -125,8 +124,8 @@ export const liquityCloseSubData = {
     return [collAddrEncoded, debtAddrEncoded];
   },
   decode(subData: SubData): { closeToAssetAddr: EthereumAddress, debtAddr: string } {
-    const closeToAssetAddr = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString().toLowerCase();
-    const debtAddr = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString().toLowerCase();
+    const closeToAssetAddr = AbiCoder.decodeParameter('address', subData[0])!.toString().toLowerCase();
+    const debtAddr = AbiCoder.decodeParameter('address', subData[1])!.toString().toLowerCase();
 
     return { closeToAssetAddr, debtAddr };
   },
@@ -150,7 +149,7 @@ export const aaveV2LeverageManagementSubData = {
     ];
   },
   decode(subData: SubData): { targetRatio: number } {
-    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]) as any as string;
+    const ratioWei = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
     const targetRatio = weiToRatioPercentage(ratioWei);
 
     return { targetRatio };
@@ -159,7 +158,7 @@ export const aaveV2LeverageManagementSubData = {
 
 export const aaveV3LeverageManagementSubData = { // TODO encode?
   decode(subData: SubData): { targetRatio: number } {
-    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]) as any as string;
+    const ratioWei = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
     const targetRatio = weiToRatioPercentage(ratioWei);
 
     return { targetRatio };
@@ -174,22 +173,22 @@ export const aaveV3QuotePriceSubData = {
     debtAssetId: number,
     nullAddress: EthereumAddress = ZERO_ADDRESS,
   ): SubData {
-    const encodedColl = mockedWeb3.eth.abi.encodeParameter('address', collAsset);
-    const encodedCollId = mockedWeb3.eth.abi.encodeParameter('uint8', collAssetId);
+    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
 
-    const encodedDebt = mockedWeb3.eth.abi.encodeParameter('address', debtAsset);
-    const encodedDebtId = mockedWeb3.eth.abi.encodeParameter('uint8', debtAssetId);
+    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
 
-    const encodedNullAddress = mockedWeb3.eth.abi.encodeParameter('address', nullAddress);
+    const encodedNullAddress = AbiCoder.encodeParameter('address', nullAddress);
 
     return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedNullAddress];
   },
   decode(subData: SubData): { collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number } {
-    const collAsset = mockedWeb3.eth.abi.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const collAssetId = Number(mockedWeb3.eth.abi.decodeParameter('uint8', subData[1]));
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
 
-    const debtAsset = mockedWeb3.eth.abi.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
-    const debtAssetId = Number(mockedWeb3.eth.abi.decodeParameter('uint8', subData[3]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
 
     return {
       collAsset, collAssetId, debtAsset, debtAssetId,
@@ -215,7 +214,7 @@ export const compoundV2LeverageManagementSubData = {
     ];
   },
   decode(subData: SubData): { targetRatio: number } {
-    const weiRatio = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]) as any as string;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
     const targetRatio = weiToRatioPercentage(weiRatio);
 
     return { targetRatio };
@@ -245,7 +244,7 @@ export const compoundV3LeverageManagementSubData = {
     ];
   },
   decode(subData: SubData): { targetRatio: number } {
-    const weiRatio = mockedWeb3.eth.abi.decodeParameter('uint256', subData[3]) as any as string;
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
     const targetRatio = weiToRatioPercentage(weiRatio);
 
     return { targetRatio };
@@ -270,7 +269,7 @@ export const morphoAaveV2LeverageManagementSubData = {
     ];
   },
   decode(subData: SubData): { targetRatio: number } {
-    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[1]) as any as string;
+    const ratioWei = AbiCoder.decodeParameter('uint128', subData[1]) as any as string;
     const targetRatio = weiToRatioPercentage(ratioWei);
 
     return { targetRatio };
@@ -279,11 +278,11 @@ export const morphoAaveV2LeverageManagementSubData = {
 
 export const cBondsRebondSubData = {
   encode(bondId: number | string): SubData {
-    const bondIdEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', bondId);
+    const bondIdEncoded = AbiCoder.encodeParameter('uint256', bondId);
     return [bondIdEncoded];
   },
   decode(subData: SubData): { bondId: string } {
-    const bondId = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]).toString();
+    const bondId = AbiCoder.decodeParameter('uint256', subData[1])!.toString();
     return { bondId };
   },
 };
@@ -295,16 +294,16 @@ export const liquityPaybackUsingChickenBondSubData = {
    * @param chainId
    */
   encode: (sourceId: string, sourceType: number, chainId: ChainId = ChainId.Ethereum): SubData => {
-    const sourceIdEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', sourceId);
-    const sourceTypeEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', sourceType);
-    const lusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', getAssetInfo('LUSD', chainId).address);
-    const bLusdAddressEncoded = mockedWeb3.eth.abi.encodeParameter('address', getAssetInfo('bLUSD', chainId).address);
+    const sourceIdEncoded = AbiCoder.encodeParameter('uint256', sourceId);
+    const sourceTypeEncoded = AbiCoder.encodeParameter('uint256', sourceType);
+    const lusdAddressEncoded = AbiCoder.encodeParameter('address', getAssetInfo('LUSD', chainId).address);
+    const bLusdAddressEncoded = AbiCoder.encodeParameter('address', getAssetInfo('bLUSD', chainId).address);
 
     return [sourceIdEncoded, sourceTypeEncoded, lusdAddressEncoded, bLusdAddressEncoded];
   },
   decode: (subData: SubData) => {
-    const sourceId = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]).toString();
-    const sourceType = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]).toString();
+    const sourceId = AbiCoder.decodeParameter('uint256', subData[0])!.toString();
+    const sourceType = AbiCoder.decodeParameter('uint256', subData[1])!.toString();
 
     return { sourceId, sourceType };
   },
@@ -312,18 +311,18 @@ export const liquityPaybackUsingChickenBondSubData = {
 
 export const exchangeDcaSubData = {
   encode: (fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, interval: number) : SubData => {
-    const sellTokenEncoded = mockedWeb3.eth.abi.encodeParameter('address', fromToken);
-    const buyTokenEncoded = mockedWeb3.eth.abi.encodeParameter('address', toToken);
-    const amountEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', amount);
-    const intervalEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', interval);
+    const sellTokenEncoded = AbiCoder.encodeParameter('address', fromToken);
+    const buyTokenEncoded = AbiCoder.encodeParameter('address', toToken);
+    const amountEncoded = AbiCoder.encodeParameter('uint256', amount);
+    const intervalEncoded = AbiCoder.encodeParameter('uint256', interval);
 
     return [sellTokenEncoded, buyTokenEncoded, amountEncoded, intervalEncoded];
   },
   decode: (subData: SubData, chainId: ChainId) => {
-    const fromToken = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString();
-    const toToken = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString();
-    const amount = assetAmountInEth(mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString(), getAssetInfoByAddress(fromToken, chainId).symbol);
-    const interval = mockedWeb3.eth.abi.decodeParameter('uint256', subData[3]).toString();
+    const fromToken = AbiCoder.decodeParameter('address', subData[0])!.toString();
+    const toToken = AbiCoder.decodeParameter('address', subData[1])!.toString();
+    const amount = assetAmountInEth(AbiCoder.decodeParameter('uint256', subData[2])!.toString(), getAssetInfoByAddress(fromToken, chainId).symbol);
+    const interval = AbiCoder.decodeParameter('uint256', subData[3])!.toString();
     return {
       fromToken,
       toToken,
@@ -345,16 +344,16 @@ export const exchangeLimitOrderSubData = {
     ];
   },
   decode: (subData: SubData, chainId: ChainId) => {
-    const fromToken = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString();
-    const toToken = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString();
-    const amount = assetAmountInEth(mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString(), getAssetInfoByAddress(fromToken, chainId).symbol);
+    const fromToken = AbiCoder.decodeParameter('address', subData[0])!.toString();
+    const toToken = AbiCoder.decodeParameter('address', subData[1])!.toString();
+    const amount = assetAmountInEth(AbiCoder.decodeParameter('uint256', subData[2])!.toString(), getAssetInfoByAddress(fromToken, chainId).symbol);
     return { fromToken, toToken, amount };
   },
 };
 
 export const sparkLeverageManagementSubData = { // TODO encode?
   decode(subData: SubData): { targetRatio: number } {
-    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]) as any as string;
+    const ratioWei = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
     const targetRatio = weiToRatioPercentage(ratioWei);
 
     return { targetRatio };
@@ -369,25 +368,63 @@ export const sparkQuotePriceSubData = {
     debtAssetId: number,
     nullAddress: EthereumAddress = ZERO_ADDRESS,
   ): SubData {
-    const encodedColl = mockedWeb3.eth.abi.encodeParameter('address', collAsset);
-    const encodedCollId = mockedWeb3.eth.abi.encodeParameter('uint8', collAssetId);
+    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
 
-    const encodedDebt = mockedWeb3.eth.abi.encodeParameter('address', debtAsset);
-    const encodedDebtId = mockedWeb3.eth.abi.encodeParameter('uint8', debtAssetId);
+    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
 
-    const encodedNullAddress = mockedWeb3.eth.abi.encodeParameter('address', nullAddress);
+    const encodedNullAddress = AbiCoder.encodeParameter('address', nullAddress);
 
     return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedNullAddress];
   },
   decode(subData: SubData): { collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number } {
-    const collAsset = mockedWeb3.eth.abi.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const collAssetId = Number(mockedWeb3.eth.abi.decodeParameter('uint8', subData[1]));
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
 
-    const debtAsset = mockedWeb3.eth.abi.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
-    const debtAssetId = Number(mockedWeb3.eth.abi.decodeParameter('uint8', subData[3]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
 
     return {
       collAsset, collAssetId, debtAsset, debtAssetId,
     };
   },
 };
+
+export const liquityDsrPaybackSubData = {
+  encode: (targetRatio: number) => {
+    const daiAddress = getAssetInfo('DAI').address;
+    const lusdAddress = getAssetInfo('LUSD').address;
+
+    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', RatioState.UNDER);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const daiAddressEncoded = AbiCoder.encodeParameter('address', daiAddress);
+    const lusdAddressEncoded = AbiCoder.encodeParameter('address', lusdAddress);
+
+    return [ratioStateEncoded, targetRatioEncoded, daiAddressEncoded, lusdAddressEncoded];
+  },
+  decode: (subData: SubData) => {
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+    return { targetRatio };
+  },
+};
+
+export const liquityDsrSupplySubData = {
+  encode: (targetRatio: number) => {
+    const daiAddress = getAssetInfo('DAI').address;
+    const wethAddress = getAssetInfo('WETH').address;
+
+    const ratioStateEncoded = AbiCoder.encodeParameter('uint8', RatioState.UNDER);
+    const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const daiAddressEncoded = AbiCoder.encodeParameter('address', daiAddress);
+    const wethAddressEncoded = AbiCoder.encodeParameter('address', wethAddress);
+
+    return [ratioStateEncoded, targetRatioEncoded, daiAddressEncoded, wethAddressEncoded];
+  },
+  decode: (subData: SubData) => {
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+    return { targetRatio };
+  },
+};