@instadapp/interop-x 0.0.0-dev.e916c22 → 0.0.0-dev.ea4acf6

package/src/typechain/factories/BalanceResolver__factory.ts

@@ -0,0 +1,235 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from "ethers";
+import type { Provider } from "@ethersproject/providers";
+import type {
+  BalanceResolver,
+  BalanceResolverInterface,
+} from "../BalanceResolver";
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "_wnativeToken",
+        type: "address",
+      },
+    ],
+    stateMutability: "nonpayable",
+    type: "constructor",
+  },
+  {
+    inputs: [
+      {
+        components: [
+          {
+            components: [
+              {
+                internalType: "address",
+                name: "sourceToken",
+                type: "address",
+              },
+              {
+                internalType: "address",
+                name: "targetToken",
+                type: "address",
+              },
+              {
+                internalType: "uint256",
+                name: "amount",
+                type: "uint256",
+              },
+            ],
+            internalType: "struct Variables.TokenInfo[]",
+            name: "supply",
+            type: "tuple[]",
+          },
+          {
+            components: [
+              {
+                internalType: "address",
+                name: "sourceToken",
+                type: "address",
+              },
+              {
+                internalType: "address",
+                name: "targetToken",
+                type: "address",
+              },
+              {
+                internalType: "uint256",
+                name: "amount",
+                type: "uint256",
+              },
+            ],
+            internalType: "struct Variables.TokenInfo[]",
+            name: "withdraw",
+            type: "tuple[]",
+          },
+        ],
+        internalType: "struct Variables.Position",
+        name: "position",
+        type: "tuple",
+      },
+      {
+        internalType: "address",
+        name: "liquidityContract",
+        type: "address",
+      },
+      {
+        internalType: "bool",
+        name: "isSupply",
+        type: "bool",
+      },
+      {
+        internalType: "bool",
+        name: "isTargetToken",
+        type: "bool",
+      },
+    ],
+    name: "checkLiquidity",
+    outputs: [
+      {
+        components: [
+          {
+            internalType: "bool",
+            name: "isOk",
+            type: "bool",
+          },
+          {
+            components: [
+              {
+                internalType: "address",
+                name: "token",
+                type: "address",
+              },
+              {
+                internalType: "uint256",
+                name: "liquidityAvailable",
+                type: "uint256",
+              },
+              {
+                internalType: "uint256",
+                name: "liquidityShort",
+                type: "uint256",
+              },
+            ],
+            internalType: "struct Helpers.LiquidityData[]",
+            name: "supply",
+            type: "tuple[]",
+          },
+          {
+            components: [
+              {
+                internalType: "address",
+                name: "token",
+                type: "address",
+              },
+              {
+                internalType: "uint256",
+                name: "liquidityAvailable",
+                type: "uint256",
+              },
+              {
+                internalType: "uint256",
+                name: "liquidityShort",
+                type: "uint256",
+              },
+            ],
+            internalType: "struct Helpers.LiquidityData[]",
+            name: "withdraw",
+            type: "tuple[]",
+          },
+        ],
+        internalType: "struct Helpers.PositionData",
+        name: "p",
+        type: "tuple",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address[]",
+        name: "tokens",
+        type: "address[]",
+      },
+      {
+        internalType: "address",
+        name: "liquidityContract",
+        type: "address",
+      },
+    ],
+    name: "getLiquidity",
+    outputs: [
+      {
+        components: [
+          {
+            internalType: "address",
+            name: "token",
+            type: "address",
+          },
+          {
+            internalType: "uint256",
+            name: "liquidityAvailable",
+            type: "uint256",
+          },
+          {
+            internalType: "uint256",
+            name: "liquidityShort",
+            type: "uint256",
+          },
+        ],
+        internalType: "struct Helpers.LiquidityData[]",
+        name: "l",
+        type: "tuple[]",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "nativeToken",
+    outputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "wnativeToken",
+    outputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+];
+
+export class BalanceResolver__factory {
+  static readonly abi = _abi;
+  static createInterface(): BalanceResolverInterface {
+    return new utils.Interface(_abi) as BalanceResolverInterface;
+  }
+  static connect(
+    address: string,
+    signerOrProvider: Signer | Provider
+  ): BalanceResolver {
+    return new Contract(address, _abi, signerOrProvider) as BalanceResolver;
+  }
+}

package/src/typechain/factories/index.ts

@@ -1,6 +1,9 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+export { AaveV2Resolver__factory } from "./AaveV2Resolver__factory";
+export { AaveV3Resolver__factory } from "./AaveV3Resolver__factory";
+export { BalanceResolver__factory } from "./BalanceResolver__factory";
 export { Erc20__factory } from "./Erc20__factory";
 export { GnosisSafe__factory } from "./GnosisSafe__factory";
 export { InstList__factory } from "./InstList__factory";

package/src/typechain/index.ts

@@ -1,11 +1,17 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+export type { AaveV2Resolver } from "./AaveV2Resolver";
+export type { AaveV3Resolver } from "./AaveV3Resolver";
+export type { BalanceResolver } from "./BalanceResolver";
 export type { Erc20 } from "./Erc20";
 export type { GnosisSafe } from "./GnosisSafe";
 export type { InstList } from "./InstList";
 export type { InteropX } from "./InteropX";
 export * as factories from "./factories";
+export { AaveV2Resolver__factory } from "./factories/AaveV2Resolver__factory";
+export { AaveV3Resolver__factory } from "./factories/AaveV3Resolver__factory";
+export { BalanceResolver__factory } from "./factories/BalanceResolver__factory";
 export { Erc20__factory } from "./factories/Erc20__factory";
 export { GnosisSafe__factory } from "./factories/GnosisSafe__factory";
 export { InstList__factory } from "./factories/InstList__factory";

package/src/utils/async.ts

@@ -0,0 +1,22 @@
+/**
+ * Call an async function with a maximum time limit (in milliseconds) for the timeout
+ *  Resolved promise for async function call, or an error if time limit reached
+ */
+export const asyncCallWithTimeout = async <T>(
+    asyncPromise: Promise<T>,
+    timeout: number
+) => {
+    let timeoutHandle;
+
+    const timeoutPromise = new Promise((_resolve, reject) => {
+        timeoutHandle = setTimeout(
+            () => reject(new Error("Async call timeout limit reached")),
+            timeout
+        );
+    });
+
+    return Promise.race([asyncPromise, timeoutPromise]).then((result) => {
+        clearTimeout(timeoutHandle);
+        return result;
+    }) as Promise<T>;
+};

package/src/utils/dsa.ts

@@ -0,0 +1,56 @@
+import Web3EthAbi from "web3-eth-abi";
+import { connectors } from "@/abi/connectors";
+import { getContract, getRpcProviderUrl } from "./web3";
+import { InstList } from "@/typechain";
+import { addresses } from "@/constants";
+import abi from "@/abi";
+import { JsonRpcRetryProvider } from "@/providers";
+import { ChainId } from "@/types";
+import { ethers } from "ethers";
+
+export const encodeConnectorMethod = (params: {
+    connector: string;
+    method: string;
+    args: string[];
+}) => {
+    const connectorInterface = getInterface(
+        connectors.versions[2][params.connector],
+        params.method
+    );
+
+    if (!connectorInterface)
+        throw new Error(`ConnectorInterface '${params.method}' not found`);
+
+    //@ts-ignore
+    return Web3EthAbi.encodeFunctionCall(connectorInterface, params.args);
+};
+
+const getInterface = (abiItems: any[], method: string) => {
+    const abiItem = abiItems.find((abiItem) => abiItem.name === method);
+
+    if (!abiItem) {
+        console.error(`${method} is an invalid method.`);
+        return;
+    }
+
+    return abiItem;
+};
+
+
+export const getDsaAccountAddress = async ({
+    dsaId,
+    chainId,
+    provider = null as ethers.providers.Provider | null,
+}) => {
+    if (!dsaId) throw new Error("DSA id is required");
+
+    provider = provider || new JsonRpcRetryProvider(getRpcProviderUrl(chainId));
+
+    const instListContract = getContract<InstList>(
+        addresses[chainId].instList,
+        abi.instList,
+        provider,
+    );
+
+    return await instListContract.accountAddr(dsaId)
+}

package/src/utils/formatting.ts

@@ -0,0 +1,68 @@
+const locale = "en-US";
+
+export function formatUsd(value: any, fractionDigits = 0) {
+    const formatter = new Intl.NumberFormat(locale, {
+        style: "currency",
+        currency: "USD",
+        minimumFractionDigits: fractionDigits,
+        maximumFractionDigits: fractionDigits
+    });
+
+    return formatter.format(value);
+}
+
+export function shortenHash(hash: string, length: number = 4) {
+    if (!hash) return;
+
+    if (hash.length < 12) return hash;
+
+    const beginningChars = hash.startsWith("0x") ? length + 2 : length;
+
+    const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
+
+    return shortened;
+}
+
+export function short(buffer: Buffer): string {
+    return buffer.toString("hex").slice(0, 8) + "...";
+}
+
+export const chainIdToName = (chainId: string | number) => {
+    switch (String(chainId)) {
+        case "1":
+            return "Mainnet";
+        case "137":
+            return "Polygon";
+        case "43114":
+            return "Avalanche";
+        default:
+            return "Mainnet";
+    }
+};
+
+export const getChainIdNativeSymbol = (chainId: string | number) => {
+    switch (String(chainId)) {
+        case "137":
+            return "MATIC";
+        case "43114":
+            return "AVAX";
+        case "1":
+            return "ETH";
+        default:
+            return "ETH";
+    }
+};
+
+
+export const getExplorerUrl = (chainId: string | number, suffix = '/') => {
+    switch (String(chainId)) {
+        case "1":
+            return `https://etherscan.io${suffix}`;
+        case "137":
+            return `https://polygonscan.com${suffix}`;
+        case "43114":
+            return `https://snowtrace.io${suffix}`;
+        default:
+            return `https://etherscan.io${suffix}`;
+    }
+}

package/src/utils/gnosis.ts

@@ -0,0 +1,166 @@
+import { addresses } from "@/constants";
+import { peerPool } from "@/net";
+import { GnosisSafe } from "@/typechain";
+import { ChainId } from "@/types";
+import { messagePrefix } from "@ethersproject/hash";
+import { ethers, Wallet } from "ethers";
+
+export interface Signature {
+  signer: string;
+  hash?: string;
+  data: string;
+}
+
+export const buildSignatureBytes = (signatures: Signature[]): string => {
+  signatures.sort((left, right) =>
+    left.signer.toLowerCase().localeCompare(right.signer.toLowerCase())
+  );
+  let signatureBytes = "0x";
+  for (const sig of signatures) {
+    signatureBytes += sig.data.slice(2);
+  }
+  return signatureBytes;
+};
+
+const gnosisSignatureTypes = {
+  SafeTx: [
+    { type: "address", name: "to" },
+    { type: "uint256", name: "value" },
+    { type: "bytes", name: "data" },
+    { type: "uint8", name: "operation" },
+    { type: "uint256", name: "safeTxGas" },
+    { type: "uint256", name: "baseGas" },
+    { type: "uint256", name: "gasPrice" },
+    { type: "address", name: "gasToken" },
+    { type: "address", name: "refundReceiver" },
+    { type: "uint256", name: "nonce" },
+  ],
+};
+
+export const getGnosisSignatureAddress = ({ signature, message, chainId }: { signature: string, message: Record<string, any>, chainId: ChainId }) => {
+
+  const gnosisSafe = addresses[chainId].gnosisSafe;
+
+  const domain = {
+    verifyingContract: gnosisSafe,
+    chainId,
+  };
+
+  return ethers.utils.verifyTypedData(domain, gnosisSignatureTypes, message, signature)
+
+}
+
+export const generateGnosisSignatureMessage = ({
+  to,
+  data = null as any,
+  value = "0",
+  operation = "1",
+  baseGas = "0",
+  gasPrice = "0",
+  gasToken = "0x0000000000000000000000000000000000000000",
+  refundReceiver = "0x0000000000000000000000000000000000000000",
+  safeTxGas = "79668" as string | number,
+  nonce = "0",
+  chainId = 137 as ChainId,
+}) => {
+  const gnosisSafe = addresses[chainId].gnosisSafe;
+
+  const message = {
+    baseGas,
+    data,
+    gasPrice,
+    gasToken,
+    nonce: Number(nonce),
+    operation,
+    refundReceiver,
+    safeAddress: gnosisSafe,
+    safeTxGas: String(safeTxGas),
+    to,
+    value,
+  };
+
+  return message;
+}
+
+export const signGnosisSafeTx = async ({
+  to,
+  data = null as any,
+  value = "0",
+  operation = "1",
+  baseGas = "0",
+  gasPrice = "0",
+  gasToken = "0x0000000000000000000000000000000000000000",
+  refundReceiver = "0x0000000000000000000000000000000000000000",
+  safeTxGas = "79668" as string | number,
+  nonce = "0",
+  chainId = 137 as ChainId,
+}, { signer }: { signer: Wallet }
+) => {
+  const gnosisSafe = addresses[chainId].gnosisSafe;
+
+  const domain = {
+    verifyingContract: gnosisSafe,
+    chainId,
+  };
+
+  const message = generateGnosisSignatureMessage({ to, data, value, operation, baseGas, gasPrice, gasToken, refundReceiver, safeTxGas, nonce, chainId });
+
+  return await signer._signTypedData(domain, gnosisSignatureTypes, message);
+};
+
+export const generateGnosisTransaction = async (
+  transactionData: any,
+  safeContract: GnosisSafe
+) => {
+  console.log(transactionData);
+
+  let isExecuted = await safeContract.dataHashes(
+    await safeContract.getTransactionHash(
+      transactionData.to,
+      transactionData.value,
+      transactionData.data,
+      transactionData.operation,
+      transactionData.safeTxGas,
+      transactionData.baseGas,
+      transactionData.gasPrice,
+      transactionData.gasToken,
+      transactionData.refundReceiver,
+      transactionData.nonce
+    )
+  );
+
+  while (isExecuted == 1) {
+    transactionData.safeTxGas = ethers.BigNumber.from(
+      String(transactionData.safeTxGas)
+    )
+      .add(1)
+      .toString();
+
+    isExecuted = await safeContract.dataHashes(
+      await safeContract.getTransactionHash(
+        transactionData.to,
+        transactionData.value,
+        transactionData.data,
+        transactionData.operation,
+        transactionData.safeTxGas,
+        transactionData.baseGas,
+        transactionData.gasPrice,
+        transactionData.gasToken,
+        transactionData.refundReceiver,
+        transactionData.nonce
+      )
+    );
+  }
+
+  return transactionData;
+};
+
+export const getGnosisOwnerPeerIds = async ({ gnosisContract = null as unknown as GnosisSafe }) => {
+  const owners = await gnosisContract
+    .getOwners()
+    .then((owners) => owners.map((owner) => owner.toLowerCase()));
+
+  return peerPool.activePeers
+    .filter((peer) => owners.includes(peer.publicAddress.toLowerCase()))
+    .map((peer) => peer.id);
+}

package/src/utils/http.ts

@@ -0,0 +1,6 @@
+import axios from "axios";
+import axiosRetry from "axios-retry";
+
+export const http = axios.create();
+
+axiosRetry(http, { retries: 3, retryDelay: axiosRetry.exponentialDelay });