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

package/dist/src/tasks/index.js

@@ -5,8 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tasks = void 0;
 const waait_1 = __importDefault(require("waait"));
+const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
 const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
 const SyncLogSubmitEvents_1 = __importDefault(require("./InteropX/SyncLogSubmitEvents"));
+const ProcessSubmitSubmitEvents_1 = __importDefault(require("./InteropX/ProcessSubmitSubmitEvents"));
+const SyncLogValidateEvents_1 = __importDefault(require("./InteropX/SyncLogValidateEvents"));
+const ProcessValidateEvents_1 = __importDefault(require("./InteropX/ProcessValidateEvents"));
 class Tasks {
     constructor() {
         this.tasks = [
@@ -15,6 +19,13 @@ class Tasks {
             // InteropX
             new SyncLogSubmitEvents_1.default({ chainId: 137 }),
             new SyncLogSubmitEvents_1.default({ chainId: 43114 }),
+            new ProcessSubmitSubmitEvents_1.default({ chainId: 137 }),
+            new ProcessSubmitSubmitEvents_1.default({ chainId: 43114 }),
+            new SyncLogValidateEvents_1.default({ chainId: 137 }),
+            new SyncLogValidateEvents_1.default({ chainId: 43114 }),
+            new ProcessValidateEvents_1.default({ chainId: 137 }),
+            new ProcessValidateEvents_1.default({ chainId: 43114 }),
+            new SyncTransactionStatusTask_1.default(),
         ];
     }
     async start() {

package/dist/src/typechain/InstList.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/src/typechain/factories/InstList__factory.js

@@ -0,0 +1,249 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InstList__factory = void 0;
+const ethers_1 = require("ethers");
+const _abi = [
+    {
+        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",
+    },
+];
+class InstList__factory {
+    static createInterface() {
+        return new ethers_1.utils.Interface(_abi);
+    }
+    static connect(address, signerOrProvider) {
+        return new ethers_1.Contract(address, _abi, signerOrProvider);
+    }
+}
+exports.InstList__factory = InstList__factory;
+InstList__factory.abi = _abi;

package/dist/src/typechain/factories/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteropX__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
+exports.InteropX__factory = exports.InstList__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
@@ -8,5 +8,7 @@ var Erc20__factory_1 = require("./Erc20__factory");
 Object.defineProperty(exports, "Erc20__factory", { enumerable: true, get: function () { return Erc20__factory_1.Erc20__factory; } });
 var GnosisSafe__factory_1 = require("./GnosisSafe__factory");
 Object.defineProperty(exports, "GnosisSafe__factory", { enumerable: true, get: function () { return GnosisSafe__factory_1.GnosisSafe__factory; } });
+var InstList__factory_1 = require("./InstList__factory");
+Object.defineProperty(exports, "InstList__factory", { enumerable: true, get: function () { return InstList__factory_1.InstList__factory; } });
 var InteropX__factory_1 = require("./InteropX__factory");
 Object.defineProperty(exports, "InteropX__factory", { enumerable: true, get: function () { return InteropX__factory_1.InteropX__factory; } });

package/dist/src/typechain/index.js

@@ -23,11 +23,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteropX__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.factories = void 0;
+exports.InteropX__factory = exports.InstList__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.factories = void 0;
 exports.factories = __importStar(require("./factories"));
 var Erc20__factory_1 = require("./factories/Erc20__factory");
 Object.defineProperty(exports, "Erc20__factory", { enumerable: true, get: function () { return Erc20__factory_1.Erc20__factory; } });
 var GnosisSafe__factory_1 = require("./factories/GnosisSafe__factory");
 Object.defineProperty(exports, "GnosisSafe__factory", { enumerable: true, get: function () { return GnosisSafe__factory_1.GnosisSafe__factory; } });
+var InstList__factory_1 = require("./factories/InstList__factory");
+Object.defineProperty(exports, "InstList__factory", { enumerable: true, get: function () { return InstList__factory_1.InstList__factory; } });
 var InteropX__factory_1 = require("./factories/InteropX__factory");
 Object.defineProperty(exports, "InteropX__factory", { enumerable: true, get: function () { return InteropX__factory_1.InteropX__factory; } });

package/dist/src/utils/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LiquidityError = exports.generateGnosisTransaction = exports.getContract = exports.ContractError = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
+exports.encodeConnectorMethod = exports.LiquidityError = exports.generateGnosisTransaction = exports.getContract = exports.ContractError = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
 /**
  * @module util
  */
@@ -12,6 +12,8 @@ const axios_retry_1 = __importDefault(require("axios-retry"));
 const constants_1 = require("@/constants");
 const ethers_1 = require("ethers");
 const async_retry_1 = __importDefault(require("async-retry"));
+const connectors_1 = require("@/abi/connectors");
+const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 exports.http = axios_1.default.create();
 (0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
 function shortenHash(hash, length = 4) {
@@ -25,10 +27,10 @@ function shortenHash(hash, length = 4) {
 }
 exports.shortenHash = shortenHash;
 function short(buffer) {
-    return buffer.toString('hex').slice(0, 8) + '...';
+    return buffer.toString("hex").slice(0, 8) + "...";
 }
 exports.short = short;
-const signGnosisSafeTx = async ({ to, data = null, value = '0', operation = '1', baseGas = '0', gasPrice = "0", gasToken = "0x0000000000000000000000000000000000000000", refundReceiver = "0x0000000000000000000000000000000000000000", safeTxGas = "79668", nonce = "0", chainId = 137, }, { signer }) => {
+const signGnosisSafeTx = async ({ to, data = null, value = "0", operation = "1", baseGas = "0", gasPrice = "0", gasToken = "0x0000000000000000000000000000000000000000", refundReceiver = "0x0000000000000000000000000000000000000000", safeTxGas = "79668", nonce = "0", chainId = 137, }, { signer }) => {
     const gnosisSafe = constants_1.addresses[chainId].gnosisSafe;
     const domain = {
         verifyingContract: gnosisSafe,
@@ -36,16 +38,16 @@ const signGnosisSafeTx = async ({ to, data = null, value = '0', operation = '1',
     };
     const types = {
         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' },
+            { 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" },
         ],
     };
     const message = {
@@ -67,11 +69,11 @@ exports.signGnosisSafeTx = signGnosisSafeTx;
 const getRpcProviderUrl = (chainId) => {
     switch (chainId) {
         case 1:
-            return 'https://rpc.ankr.com/eth';
+            return "https://rpc.ankr.com/eth";
         case 137:
-            return 'https://rpc.ankr.com/polygon';
+            return "https://rpc.ankr.com/polygon";
         case 43114:
-            return 'https://rpc.ankr.com/avalanche';
+            return "https://rpc.ankr.com/avalanche";
         default:
             throw new Error(`Unknown chainId: ${chainId}`);
     }
@@ -93,16 +95,16 @@ exports.buildSignatureBytes = buildSignatureBytes;
 const asyncCallWithTimeout = async (asyncPromise, timeout) => {
     let timeoutHandle;
     const timeoutPromise = new Promise((_resolve, reject) => {
-        timeoutHandle = setTimeout(() => reject(new Error('Async call timeout limit reached')), timeout);
+        timeoutHandle = setTimeout(() => reject(new Error("Async call timeout limit reached")), timeout);
     });
-    return Promise.race([asyncPromise, timeoutPromise]).then(result => {
+    return Promise.race([asyncPromise, timeoutPromise]).then((result) => {
         clearTimeout(timeoutHandle);
         return result;
     });
 };
 exports.asyncCallWithTimeout = asyncCallWithTimeout;
 const generateInteropTransactionHash = (data) => {
-    return ethers_1.ethers.utils.solidityKeccak256(Array.from(Array(7), () => 'string'), [
+    return ethers_1.ethers.utils.solidityKeccak256(Array.from({ length: 7 }, () => "string"), [
         String(data.actionId),
         String(data.vnonce),
         String(data.sourceSender),
@@ -117,25 +119,27 @@ 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) {
+    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');
+    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)))) {
+            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) {
-                }
+                catch (error) { }
                 return async (...args) => {
                     try {
                         return await (0, async_retry_1.default)(async () => await value.bind(contract)(...args), { retries: isConstant ? 1 : 3 });
@@ -149,15 +153,21 @@ function getContract(address, contractInterface, signerOrProvider) {
                     }
                 };
             }
-            if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
+            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') {
+                        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 });
+                                    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}`);
@@ -168,7 +178,7 @@ function getContract(address, contractInterface, signerOrProvider) {
                                 }
                             };
                         }
-                    }
+                    },
                 });
             }
             return value;
@@ -180,7 +190,9 @@ const generateGnosisTransaction = async (transactionData, safeContract) => {
     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_1.ethers.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
+        transactionData.safeTxGas = ethers_1.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;
@@ -188,8 +200,24 @@ const generateGnosisTransaction = async (transactionData, safeContract) => {
 exports.generateGnosisTransaction = generateGnosisTransaction;
 class LiquidityError extends Error {
     constructor(message) {
-        super(message || 'Not enough liquidity');
+        super(message || "Not enough liquidity");
         Object.setPrototypeOf(this, new.target.prototype);
     }
 }
 exports.LiquidityError = LiquidityError;
+const encodeConnectorMethod = (params) => {
+    const connectorInterface = getInterface(connectors_1.connectors.versions[2][params.connector], params.method);
+    if (!connectorInterface)
+        throw new Error(`ConnectorInterface '${params.method}' not found`);
+    //@ts-ignore
+    return web3_eth_abi_1.default.encodeFunctionCall(connectorInterface, params.args);
+};
+exports.encodeConnectorMethod = encodeConnectorMethod;
+const getInterface = (abiItems, method) => {
+    const abiItem = abiItems.find((abiItem) => abiItem.name === method);
+    if (!abiItem) {
+        console.error(`${method} is an invalid method.`);
+        return;
+    }
+    return abiItem;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.50c72b9",
+  "version": "0.0.0-dev.55e8bb4",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -52,7 +52,9 @@
     "postinstall-postinstall": "^2.1.0",
     "sequelize": "6.18.0",
     "sqlite3": "^5.0.8",
-    "waait": "^1.0.5"
+    "waait": "^1.0.5",
+    "web3-eth-abi": "^1.7.3",
+    "web3-utils": "^1.7.3"
   },
   "bin": {
     "interop-x": "bin/interop-x",

package/src/abi/connectors/index.ts

@@ -0,0 +1,14 @@
+export * as connectorsV1 from './v1'
+export * as connectorsV2_M1 from './v2'
+
+import * as connectorsV1 from './v1'
+import { connectorsV2_M1 } from './v2'
+
+export type Connector = keyof typeof connectorsV1 | keyof typeof connectorsV2_M1 
+
+export const connectors = {
+    versions: {
+        1: connectorsV1,
+        2: connectorsV2_M1
+    }
+}