@defisaver/automation-sdk 3.1.8-dev-2 → 3.1.9-dev-fluid

package/src/index.ts

@@ -1,39 +1,39 @@
-// TODO
-//  [] 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)
-
-import './configuration';
-
-import LegacyMakerAutomation from './automation/public/legacy/LegacyMakerAutomation';
-import LegacyAaveAutomation from './automation/public/legacy/LegacyAaveAutomation';
-import LegacyCompoundAutomation from './automation/public/legacy/LegacyCompoundAutomation';
-
-import EthereumStrategies from './automation/public/EthereumStrategies';
-import OptimismStrategies from './automation/public/OptimismStrategies';
-import ArbitrumStrategies from './automation/public/ArbitrumStrategies';
-import BaseStrategies from './automation/public/BaseStrategies';
-
-import * as triggerService from './services/triggerService';
-import * as subDataService from './services/subDataService';
-import * as strategySubService from './services/strategySubService';
-import * as strategiesService from './services/strategiesService';
-import * as constants from './constants';
-
-import * as enums from './types/enums';
-import type * as types from './types';
-
-import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId } from './services/utils';
-
-const utils = {
-  getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId,
-};
-
-export {
-  LegacyMakerAutomation, LegacyAaveAutomation, LegacyCompoundAutomation,
-  EthereumStrategies, OptimismStrategies, ArbitrumStrategies, BaseStrategies,
-  triggerService, subDataService, strategySubService, utils,
-  enums, constants, strategiesService,
-};
-
-export type { types };
+// TODO
+//  [] 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)
+
+import './configuration';
+
+import LegacyMakerAutomation from './automation/public/legacy/LegacyMakerAutomation';
+import LegacyAaveAutomation from './automation/public/legacy/LegacyAaveAutomation';
+import LegacyCompoundAutomation from './automation/public/legacy/LegacyCompoundAutomation';
+
+import EthereumStrategies from './automation/public/EthereumStrategies';
+import OptimismStrategies from './automation/public/OptimismStrategies';
+import ArbitrumStrategies from './automation/public/ArbitrumStrategies';
+import BaseStrategies from './automation/public/BaseStrategies';
+
+import * as triggerService from './services/triggerService';
+import * as subDataService from './services/subDataService';
+import * as strategySubService from './services/strategySubService';
+import * as strategiesService from './services/strategiesService';
+import * as constants from './constants';
+
+import * as enums from './types/enums';
+import type * as types from './types';
+
+import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId } from './services/utils';
+
+const utils = {
+  getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId,
+};
+
+export {
+  LegacyMakerAutomation, LegacyAaveAutomation, LegacyCompoundAutomation,
+  EthereumStrategies, OptimismStrategies, ArbitrumStrategies, BaseStrategies,
+  triggerService, subDataService, strategySubService, utils,
+  enums, constants, strategiesService,
+};
+
+export type { types };

package/src/services/contractService.ts

@@ -1,78 +1,78 @@
-import type Web3 from 'web3';
-import type { AbiItem } from 'web3-utils';
-
-import type {
-  BlockNumber, Contract, EthereumAddress,
-} from '../types';
-import type { BaseContract } from '../types/contracts/generated/types';
-import type {
-  Legacy_AuthCheck, SubStorage, UniMulticall, Erc20,
-} from '../types/contracts/generated';
-
-import {
-  UniMulticallJson, SubStorageJson, AuthCheckJson, Erc20Json,
-} from '../abis';
-
-import { isDefined } from './utils';
-import { ChainId } from '../types/enums';
-
-export function getAbiItem(abi: AbiItem[], itemName: string) {
-  const abiItem = abi.find(i => i.name === itemName);
-  if (isDefined(abiItem)) {
-    return abiItem;
-  }
-  throw new Error(`Can't find abi item for itemName: ${itemName}`);
-}
-
-function makeContract<T extends BaseContract>(
-  web3: Web3,
-  contractJson: Contract.Json,
-  chainId: ChainId,
-): Contract.WithMeta<T> {
-  const { abi } = contractJson;
-
-  let _address = '';
-  let _createdBlock: BlockNumber = 'earliest';
-
-  if (contractJson.networks) {
-    const { address, createdBlock } = contractJson.networks[chainId];
-
-    _address = address;
-
-    if (isDefined(createdBlock)) {
-      _createdBlock = createdBlock;
-    }
-  }
-
-  return {
-    abi,
-    address: _address,
-    createdBlock: _createdBlock,
-    contract: new web3.eth.Contract(abi, _address) as any as T,
-  };
-}
-
-export function makeUniMulticallContract(web3: Web3, chainId: ChainId) {
-  return makeContract<UniMulticall>(web3, UniMulticallJson, chainId);
-}
-
-export function makeSubStorageContract(web3: Web3, chainId: ChainId) {
-  return makeContract<SubStorage>(web3, SubStorageJson, chainId);
-}
-
-export function makeAuthCheckerContract(web3: Web3, chainId: ChainId) {
-  return makeContract<Legacy_AuthCheck>(web3, AuthCheckJson, chainId);
-}
-
-export function makeLegacySubscriptionContract<T extends BaseContract>(web3: Web3, contractJson: Contract.Json) {
-  return makeContract<T>(web3, contractJson, ChainId.Ethereum);
-}
-
-export function makeErc20Contract(web3: Web3, tokenAddress: EthereumAddress, chainId: ChainId) {
-  return makeContract<Erc20>(web3, {
-    ...Erc20Json,
-    networks: {
-      [chainId]: { address: tokenAddress },
-    },
-  }, chainId);
+import type Web3 from 'web3';
+import type { AbiItem } from 'web3-utils';
+
+import type {
+  BlockNumber, Contract, EthereumAddress,
+} from '../types';
+import type { BaseContract } from '../types/contracts/generated/types';
+import type {
+  Legacy_AuthCheck, SubStorage, UniMulticall, Erc20,
+} from '../types/contracts/generated';
+
+import {
+  UniMulticallJson, SubStorageJson, AuthCheckJson, Erc20Json,
+} from '../abis';
+
+import { isDefined } from './utils';
+import { ChainId } from '../types/enums';
+
+export function getAbiItem(abi: AbiItem[], itemName: string) {
+  const abiItem = abi.find(i => i.name === itemName);
+  if (isDefined(abiItem)) {
+    return abiItem;
+  }
+  throw new Error(`Can't find abi item for itemName: ${itemName}`);
+}
+
+function makeContract<T extends BaseContract>(
+  web3: Web3,
+  contractJson: Contract.Json,
+  chainId: ChainId,
+): Contract.WithMeta<T> {
+  const { abi } = contractJson;
+
+  let _address = '';
+  let _createdBlock: BlockNumber = 'earliest';
+
+  if (contractJson.networks) {
+    const { address, createdBlock } = contractJson.networks[chainId];
+
+    _address = address;
+
+    if (isDefined(createdBlock)) {
+      _createdBlock = createdBlock;
+    }
+  }
+
+  return {
+    abi,
+    address: _address,
+    createdBlock: _createdBlock,
+    contract: new web3.eth.Contract(abi, _address) as any as T,
+  };
+}
+
+export function makeUniMulticallContract(web3: Web3, chainId: ChainId) {
+  return makeContract<UniMulticall>(web3, UniMulticallJson, chainId);
+}
+
+export function makeSubStorageContract(web3: Web3, chainId: ChainId) {
+  return makeContract<SubStorage>(web3, SubStorageJson, chainId);
+}
+
+export function makeAuthCheckerContract(web3: Web3, chainId: ChainId) {
+  return makeContract<Legacy_AuthCheck>(web3, AuthCheckJson, chainId);
+}
+
+export function makeLegacySubscriptionContract<T extends BaseContract>(web3: Web3, contractJson: Contract.Json) {
+  return makeContract<T>(web3, contractJson, ChainId.Ethereum);
+}
+
+export function makeErc20Contract(web3: Web3, tokenAddress: EthereumAddress, chainId: ChainId) {
+  return makeContract<Erc20>(web3, {
+    ...Erc20Json,
+    networks: {
+      [chainId]: { address: tokenAddress },
+    },
+  }, chainId);
 }