@instadapp/interop-x 0.0.0-dev.ee3d74b → 0.0.0-dev.ef7acff

package/dist/src/utils/validate.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateChains = void 0;
+const constants_1 = require("@/constants");
+const errors_1 = require("@/errors");
+const validateChains = ({ sourceChainId, targetChainId }) => {
+    if (!sourceChainId) {
+        throw new errors_1.InvalidChaindIdError("Source chain id is required");
+    }
+    if (!targetChainId) {
+        throw new errors_1.InvalidChaindIdError("Target chain id is required");
+    }
+    if (sourceChainId == targetChainId) {
+        throw new errors_1.InvalidChaindIdError("Source and target chain cannot be the same");
+    }
+    if (!constants_1.addresses[sourceChainId]) {
+        throw new errors_1.InvalidChaindIdError("Invalid source chain id");
+    }
+    if (!constants_1.addresses[targetChainId]) {
+        throw new errors_1.InvalidChaindIdError("Invalid target chain id");
+    }
+};
+exports.validateChains = validateChains;

package/dist/src/utils/web3.js

@@ -0,0 +1,92 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getContract = exports.ContractError = exports.getRpcProviderUrl = void 0;
+const async_retry_1 = __importDefault(require("async-retry"));
+const ethers_1 = require("ethers");
+const getRpcProviderUrl = (chainId) => {
+    switch (chainId) {
+        case 1:
+            return "https://rpc.ankr.com/eth";
+        case 137:
+            return "https://rpc.ankr.com/polygon";
+        case 43114:
+            return "https://rpc.ankr.com/avalanche";
+        default:
+            throw new Error(`Unknown chainId: ${chainId}`);
+    }
+};
+exports.getRpcProviderUrl = getRpcProviderUrl;
+class ContractError extends Error {
+}
+exports.ContractError = ContractError;
+function getContract(address, contractInterface, signerOrProvider) {
+    if (!ethers_1.ethers.utils.getAddress(address) ||
+        address === ethers_1.ethers.constants.AddressZero) {
+        throw Error(`Invalid 'address' parameter '${address}'.`);
+    }
+    const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
+    // Make sure the contract properties is writable
+    const desc = Object.getOwnPropertyDescriptor(contract, "functions");
+    if (!desc || desc.writable !== true) {
+        return contract;
+    }
+    return new Proxy(contract, {
+        get(target, prop, receiver) {
+            const value = Reflect.get(target, prop, receiver);
+            if (typeof value === "function" &&
+                (contract.functions.hasOwnProperty(prop) ||
+                    ["queryFilter"].includes(String(prop)))) {
+                let isConstant = false;
+                try {
+                    isConstant = contract.interface.getFunction(String(prop)).constant;
+                }
+                catch (error) { }
+                return async (...args) => {
+                    try {
+                        return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: isConstant ? 1 : 3 });
+                    }
+                    catch (error) {
+                        const err = new ContractError(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
+                        err.method = String(prop);
+                        err.address = address;
+                        err.args = [...args];
+                        throw err;
+                    }
+                };
+            }
+            if (typeof value === "object" &&
+                [
+                    "populateTransaction",
+                    "estimateGas",
+                    "functions",
+                    "callStatic",
+                ].includes(String(prop))) {
+                const parentProp = String(prop);
+                return new Proxy(value, {
+                    get(target, prop, receiver) {
+                        const value = Reflect.get(target, prop, receiver);
+                        if (typeof value === "function") {
+                            return async (...args) => {
+                                try {
+                                    return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: parentProp === "callStatic" ? 3 : 1 });
+                                }
+                                catch (error) {
+                                    const err = new ContractError(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
+                                    err.method = String(prop);
+                                    err.address = address;
+                                    err.args = [...args];
+                                    throw err;
+                                }
+                            };
+                        }
+                    },
+                });
+            }
+            return value;
+        },
+    });
+}
+exports.getContract = getContract;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.ee3d74b",
+  "version": "0.0.0-dev.ef7acff",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -53,6 +53,7 @@
     "sequelize": "6.18.0",
     "sqlite3": "^5.0.8",
     "waait": "^1.0.5",
+    "web3-eth-abi": "^1.7.3",
     "web3-utils": "^1.7.3"
   },
   "bin": {
@@ -61,6 +62,7 @@
   },
   "devDependencies": {
     "@typechain/ethers-v5": "^10.0.0",
+    "@types/async-retry": "^1.4.4",
     "@types/bn.js": "^5.1.0",
     "@types/fs-extra": "^9.0.13",
     "@types/node": "^17.0.33",

package/src/abi/index.ts

@@ -2,10 +2,12 @@ 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,
   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/api/index.ts

@@ -26,6 +26,14 @@ export const startApiServer = async () => {
             })
         })
 
+        server.get('/transactions/:transaction', async (req) => {
+            return await Transaction.findOne({
+                where: {
+                    transactionHash: (req.params as any).transaction
+                }
+            })
+        })
+
         await server.listen(PORT, HOST)
 
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`)

package/src/constants/addresses.ts

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

package/src/db/models/transaction.ts

@@ -1,74 +1,116 @@
-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 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;
-        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 executeEvent: CreationOptional<{
+    sourceSpells: Array<{ connector: string; data: string }>;
+    targetSpells: 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,
@@ -86,20 +128,20 @@ Transaction.init({
     sourceTransactionHash: DataTypes.STRING,
     sourceBlockNumber: DataTypes.NUMBER,
     sourceStatus: {
-        type: DataTypes.STRING,
-        defaultValue: 'pending'
+      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 +150,41 @@ Transaction.init({
     targetTransactionHash: DataTypes.STRING,
     targetBlockNumber: DataTypes.NUMBER,
     targetStatus: {
-        type: DataTypes.STRING,
-        defaultValue: 'pending'
+      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,
+    },
+
+    executeEvent: {
+      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" }
+);