@instadapp/interop-x 0.0.0-dev.50c72b9 → 0.0.0-dev.55e8bb4

package/src/abi/connectors/v2/index.ts

@@ -0,0 +1,87 @@
+import {ONEINCH_A} from './1INCH-A'
+import {AAVE_CLAIM_A} from './AAVE-CLAIM-A'
+import {AAVE_CLAIM_B} from './AAVE-CLAIM-B'
+import {AAVE_STAKE_A} from './AAVE-STAKE-A'
+import {AAVE_V1} from './AAVE-V1-A'
+import {AAVE_V2} from './AAVE-V2-A'
+import {AUTHORITY_A} from './AUTHORITY-A'
+import {BASIC_A} from './BASIC-A'
+import {COMP_A} from './COMP-A'
+import {COMPOUND_A} from './COMPOUND-A'
+import {MAKERDAO_A} from './MAKERDAO-A'
+import {POLYGON_BRIDGE_A} from './POLYGON-BRIDGE-A'
+import {UNISWAP_A} from './UNISWAP-A'
+import {AAVE_V1_IMPORT_A} from './AAVE-V1-IMPORT-A'
+import {AAVE_V2_IMPORT_A} from './AAVE-V2-IMPORT-A'
+import {COMPOUND_IMPORT_A} from './COMPOUND-IMPORT-A'
+import {INSTAPOOL_A} from './INSTAPOOL-A'
+import {PARASWAP_A} from './PARASWAP-A'
+
+import {AAVE_V2_IMPORT_B} from './AAVE-V2-IMPORT-B'
+import {COMPOUND_IMPORT_B} from './COMPOUND-IMPORT-B'
+import {MAKERDAO_CLAIM_A} from './MAKERDAO-CLAIM-A'
+import {G_UNISWAP_A} from './G-UNISWAP-A'
+import {STAKE_ERC20_A} from './STAKE-ERC20-A'
+import {INST_STAKING_A} from './INST-STAKING-A'
+import {ONEINCH_B} from './1INCH-B'
+import {WETH_A} from './WETH-A'
+import {INST_A} from './INST-A'
+import {REFINANCE_A} from './REFINANCE-A'
+import {INST_LM_A} from './INST-LM-A'
+import {UNISWAP_V2_A} from './UNISWAP-V2-A'
+import {LIQUITY_A} from './LIQUITY-A'
+import {REFLEXER_A} from './REFLEXER-A'
+import {UNISWAP_V3_A} from './UNISWAP-V3-A'
+import {B_COMPOUND_A} from './B-COMPOUND-A'
+import {B_MAKERDAO_A} from './B-MAKERDAO-A'
+import {B_LIQUITY_A} from './B-LIQUITY-A'
+import {BASIC_B} from './BASIC-B'
+import {BASIC_C} from './BASIC-C'
+import {UNISWAP_V3_STAKE_A} from './UNISWAP-V3-STAKE-A'
+import {YEARN_VAULT_A} from './YEARN-VAULT-A'
+import {INST_STAKING_B} from './INST-STAKING-B'
+import {GELATO_AAVE_A} from './GELATO-AAVE-A'
+export const connectorsV2_M1 =  {
+    "GELATO-AAVE-A": GELATO_AAVE_A,
+    "INST-STAKING-B": INST_STAKING_B,
+    "YEARN-VAULT-A": YEARN_VAULT_A,
+    "UNISWAP-V3-STAKE-A": UNISWAP_V3_STAKE_A,
+    "BASIC-C": BASIC_C,
+    "BASIC-B": BASIC_B,
+    "B-LIQUITY-A": B_LIQUITY_A,
+    "B-MAKERDAO-A": B_MAKERDAO_A,
+    "B-COMPOUND-A": B_COMPOUND_A,
+    "UNISWAP-V3-A": UNISWAP_V3_A,
+    "REFLEXER-A": REFLEXER_A,
+    "LIQUITY-A": LIQUITY_A,
+    "UNISWAP-V2-A": UNISWAP_V2_A,
+    "INST-LM-A": INST_LM_A,
+    "REFINANCE-A": REFINANCE_A,
+    "INST-A": INST_A,
+    "WETH-A": WETH_A,
+    "1INCH-B": ONEINCH_B,
+    "INST-STAKING-A": INST_STAKING_A,
+    "STAKE-ERC20-A": STAKE_ERC20_A,
+    "G-UNISWAP-A": G_UNISWAP_A,
+    "INSTAPOOL-A": INSTAPOOL_A,
+    "COMPOUND-IMPORT-A": COMPOUND_IMPORT_A,
+    "AAVE-V2-IMPORT-A": AAVE_V2_IMPORT_A,
+    "AAVE-V1-IMPORT-A": AAVE_V1_IMPORT_A,
+    "1INCH-A": ONEINCH_A,
+    "AAVE-CLAIM-A": AAVE_CLAIM_A,
+    "AAVE-CLAIM-B": AAVE_CLAIM_B,
+    "AAVE-V1-A": AAVE_V1,
+    "AAVE-V2-A": AAVE_V2,
+    "AUTHORITY-A": AUTHORITY_A,
+    "BASIC-A": BASIC_A,
+    "COMP-A": COMP_A,
+    "COMPOUND-A": COMPOUND_A,
+    "MAKERDAO-A": MAKERDAO_A,
+    "UNISWAP-A": UNISWAP_A,
+    "POLYGON-BRIDGE-A": POLYGON_BRIDGE_A,
+    "AAVE-STAKE-A": AAVE_STAKE_A,
+    "PARASWAP-A": PARASWAP_A,
+    "COMPOUND-IMPORT-B": COMPOUND_IMPORT_B,
+    "AAVE-V2-IMPORT-B": AAVE_V2_IMPORT_B,
+    "MAKERDAO-CLAIM-A": MAKERDAO_CLAIM_A,
+}

package/src/abi/index.ts

@@ -1,9 +1,13 @@
 import gnosisSafe from "./gnosisSafe.json";
 import erc20 from "./erc20.json";
 import interopX from "./interopX.json";
+import { connectors } from "./connectors";
+import instList from "./instList.json";
 
 export default {
-    gnosisSafe,
-    erc20,
-    interopX,
-}
+  gnosisSafe,
+  erc20,
+  interopX,
+  connectors,
+  instList,
+};

package/src/abi/instList.json

@@ -0,0 +1,232 @@
+[
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "_instaIndex",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "nonpayable",
+        "type": "constructor"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            }
+        ],
+        "name": "accountAddr",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "accountID",
+        "outputs": [
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            }
+        ],
+        "name": "accountLink",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "first",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "last",
+                "type": "address"
+            },
+            {
+                "internalType": "uint64",
+                "name": "count",
+                "type": "uint64"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            },
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "accountList",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "prev",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "next",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "accounts",
+        "outputs": [
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "_owner",
+                "type": "address"
+            }
+        ],
+        "name": "addAuth",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "_account",
+                "type": "address"
+            }
+        ],
+        "name": "init",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "instaIndex",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "_owner",
+                "type": "address"
+            }
+        ],
+        "name": "removeAuth",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "name": "userLink",
+        "outputs": [
+            {
+                "internalType": "uint64",
+                "name": "first",
+                "type": "uint64"
+            },
+            {
+                "internalType": "uint64",
+                "name": "last",
+                "type": "uint64"
+            },
+            {
+                "internalType": "uint64",
+                "name": "count",
+                "type": "uint64"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            },
+            {
+                "internalType": "uint64",
+                "name": "",
+                "type": "uint64"
+            }
+        ],
+        "name": "userList",
+        "outputs": [
+            {
+                "internalType": "uint64",
+                "name": "prev",
+                "type": "uint64"
+            },
+            {
+                "internalType": "uint64",
+                "name": "next",
+                "type": "uint64"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    }
+]

package/src/constants/addresses.ts

@@ -3,10 +3,14 @@ export const addresses = {
     gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
     multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
     interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
+    dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
+    instList: "0x839c2D3aDe63DF5b0b8F3E57D5e145057Ab41556",
   },
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-    interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
+    interopX: '0xA82A87096709E3D8648c9d9a22f31133bC4B6d32',
+    dsaAddress: '0xFcB7d826E32081c4799de2f83b47b49df600dc8c',
+    instList: "0x9926955e0Dd681Dc303370C52f4Ad0a4dd061687",
   }
-} as Record<number, { gnosisSafe: string, multisend: string, interopX: string }>
+} as Record<number, { gnosisSafe: string, multisend: string, interopX: string, dsaAddress: string, instList: string }>

package/src/constants/blockConfirmations.ts

@@ -0,0 +1,5 @@
+export const blockConfirmations = {
+  "1": 12,
+  "137": 32,
+  "43114": 12,
+};

package/src/constants/index.ts

@@ -1,2 +1,3 @@
 export * from './addresses';
 export * from './tokens';
+export * from './blockConfirmations';

package/src/db/models/transaction.ts

@@ -1,74 +1,100 @@
-import { sequelize } from '@/db/sequelize'
-import { CreationOptional, InferAttributes, InferCreationAttributes, Model, DataTypes } from 'sequelize';
+import { sequelize } from "@/db/sequelize";
+import {
+  CreationOptional,
+  InferAttributes,
+  InferCreationAttributes,
+  Model,
+  DataTypes,
+} from "sequelize";
 
 export interface IPositionTokenInfo {
-    amount: string;
-    sourceToken: string;
-    targetToken: string;
+  amount: string;
+  sourceToken: string;
+  targetToken: string;
 }
 
 export interface IPosition {
-    supply: IPositionTokenInfo[];
-    withdraw: IPositionTokenInfo[];
+  supply: IPositionTokenInfo[];
+  withdraw: IPositionTokenInfo[];
 }
 
-export class Transaction extends Model<InferAttributes<Transaction>, InferCreationAttributes<Transaction>> {
-    declare id: CreationOptional<number>;
-
-    declare transactionHash: string;
-    declare vnonce: string;
-    declare actionId: string;
-    declare sourceSender: string;
-
-    declare requestChainId: number;
-    declare requestTransactionHash: CreationOptional<string>;
-    declare requestBlockNumber: CreationOptional<number>;
-    declare requestCreatedAt: CreationOptional<Date>;
-
-    declare sourceChainId: number;
-    declare sourceDsaId: string;
-    declare sourceTransactionHash: CreationOptional<string>;
-    declare sourceBlockNumber: CreationOptional<number>;
-    declare sourceStatus: CreationOptional<string>;
-    declare sourceErrors: CreationOptional<string[]>;
-    declare sourceLogs: CreationOptional<any[]>;
-    declare sourceCreatedAt: CreationOptional<Date>;
-    declare sourceDelayUntil: CreationOptional<Date>;
-
-    declare targetChainId: number;
-    declare targetDsaId: string;
-    declare targetTransactionHash: CreationOptional<string>;
-    declare targetBlockNumber: CreationOptional<number>;
-    declare targetStatus: CreationOptional<string>;
-    declare targetErrors: CreationOptional<string[]>;
-    declare targetLogs: CreationOptional<any[]>;
-    declare targetCreatedAt: CreationOptional<Date>;
-    declare targetDelayUntil: CreationOptional<Date>;
-
-    declare submitEvent: {
-        position: IPosition;
-        actionId: string;
-        actionIdHashHash: string;
-        sourceSender: string;
-        sourceDsaId: string;
-        targetDsaId: string;
-        sourceChainId: number;
-        targetChainId: number;
-        vnonce: string;
-        metadata: string;
-    };
-
-    declare status: CreationOptional<string>;
-
-    declare createdAt: CreationOptional<Date>;
-    declare updatedAt: CreationOptional<Date>;
+export class Transaction extends Model<
+  InferAttributes<Transaction>,
+  InferCreationAttributes<Transaction>
+> {
+  declare id: CreationOptional<number>;
+
+  declare transactionHash: string;
+  declare vnonce: string;
+  declare actionId: string;
+  declare sourceSender: string;
+
+  declare submitChainId: number;
+  declare submitTransactionHash: string;
+  declare submitBlockNumber: number;
+  declare submitCreatedAt: Date;
+
+  declare sourceChainId: number;
+  declare sourceDsaId: string;
+  declare sourceTransactionHash: CreationOptional<string>;
+  declare sourceBlockNumber: CreationOptional<number>;
+  declare sourceStatus: CreationOptional<string>;
+  declare sourceErrors: CreationOptional<string[]>;
+  declare sourceLogs: CreationOptional<any[]>;
+  declare sourceCreatedAt: CreationOptional<Date>;
+  declare sourceDelayUntil: CreationOptional<Date>;
+
+  declare targetChainId: number;
+  declare targetDsaId: string;
+  declare targetTransactionHash: CreationOptional<string>;
+  declare targetBlockNumber: CreationOptional<number>;
+  declare targetStatus: CreationOptional<string>;
+  declare targetErrors: CreationOptional<string[]>;
+  declare targetLogs: CreationOptional<any[]>;
+  declare targetCreatedAt: CreationOptional<Date>;
+  declare targetDelayUntil: CreationOptional<Date>;
+
+  declare submitEvent: {
+    position: IPosition;
+    actionId: string;
+    actionIdHashHash: string;
+    actionIdHash: string;
+    sourceSender: string;
+    sourceDsaId: string;
+    targetDsaId: string;
+    sourceChainId: number;
+    targetChainId: number;
+    vnonce: string;
+    metadata: string;
+  };
+
+  declare validateEvent: CreationOptional<{
+    sourceSpells: Array<{ connector: string; data: string }>;
+    position: IPosition;
+    actionId: string;
+    actionIdHashHash: string;
+    actionIdHash: string;
+    sourceSender: string;
+    sourceDsaId: string;
+    targetDsaId: string;
+    sourceChainId: number;
+    targetChainId: number;
+    vnonce: string;
+    metadata: string;
+  }>;
+
+  declare status: CreationOptional<string>;
+
+  declare createdAt: CreationOptional<Date>;
+  declare updatedAt: CreationOptional<Date>;
 }
 
-Transaction.init({
+Transaction.init(
+  {
     id: {
-        type: DataTypes.INTEGER,
-        autoIncrement: true,
-        primaryKey: true
+      type: DataTypes.INTEGER,
+      autoIncrement: true,
+      primaryKey: true,
     },
 
     transactionHash: DataTypes.STRING,
@@ -76,30 +102,30 @@ Transaction.init({
     vnonce: DataTypes.STRING,
     sourceSender: DataTypes.STRING,
 
-    requestChainId: DataTypes.NUMBER,
-    requestTransactionHash: DataTypes.STRING,
-    requestBlockNumber: DataTypes.NUMBER,
-    requestCreatedAt: DataTypes.DATE,
+    submitChainId: DataTypes.NUMBER,
+    submitTransactionHash: DataTypes.STRING,
+    submitBlockNumber: DataTypes.NUMBER,
+    submitCreatedAt: DataTypes.DATE,
 
     sourceChainId: DataTypes.NUMBER,
     sourceDsaId: DataTypes.STRING,
     sourceTransactionHash: DataTypes.STRING,
     sourceBlockNumber: DataTypes.NUMBER,
     sourceStatus: {
-        type: DataTypes.STRING,
-        defaultValue: 'uninitialised'
+      type: DataTypes.STRING,
+      defaultValue: "pending",
     },
     sourceErrors: {
-        type: DataTypes.JSON,
-        // defaultValue: [],
+      type: DataTypes.JSON,
+      // defaultValue: [],
     },
     sourceLogs: {
-        type: DataTypes.JSON,
-        // defaultValue: [],
+      type: DataTypes.JSON,
+      // defaultValue: [],
     },
     sourceCreatedAt: {
-        type: DataTypes.DATE,
-        defaultValue: Date.now()
+      type: DataTypes.DATE,
+      defaultValue: Date.now(),
     },
     sourceDelayUntil: DataTypes.STRING,
 
@@ -108,29 +134,36 @@ Transaction.init({
     targetTransactionHash: DataTypes.STRING,
     targetBlockNumber: DataTypes.NUMBER,
     targetStatus: {
-        type: DataTypes.STRING,
-        defaultValue: 'uninitialised'
+      type: DataTypes.STRING,
+      defaultValue: "pending",
     },
     targetErrors: {
-        type: DataTypes.JSON,
-        // defaultValue: [],
+      type: DataTypes.JSON,
+      // defaultValue: [],
     },
     targetLogs: {
-        type: DataTypes.JSON,
-        // defaultValue: [],
+      type: DataTypes.JSON,
+      // defaultValue: [],
     },
     targetCreatedAt: DataTypes.DATE,
     targetDelayUntil: DataTypes.DATE,
 
     submitEvent: {
-        type: DataTypes.JSON,
-        allowNull: false
+      type: DataTypes.JSON,
+      allowNull: false,
+    },
+
+    validateEvent: {
+      type: DataTypes.JSON,
+      allowNull: true,
     },
 
     status: {
-        type: DataTypes.STRING,
-        defaultValue: 'pending'
+      type: DataTypes.STRING,
+      defaultValue: "pending",
     },
     createdAt: DataTypes.DATE,
     updatedAt: DataTypes.DATE,
-}, { sequelize, tableName: 'transactions' });
+  },
+  { sequelize, tableName: "transactions" }
+);

package/src/gnosis/actions/aaveV2/index.ts

@@ -0,0 +1,9 @@
+import { Transaction } from "@/db";
+import source from "./source";
+import target from "./target";
+
+
+
+export default async function (transaction: Transaction, type: 'source' | 'target') {
+    return type === 'source' ? source(transaction) : target(transaction);
+}