@instadapp/interop-x 0.0.0-dev.76d0265 → 0.0.0-dev.7738003

package/dist/src/api/index.js

@@ -21,7 +21,7 @@ const startApiServer = async () => {
                 limit: 20,
                 offset: 0,
                 order: [
-                    ['createdAt', 'DESC']
+                    ['updatedAt', 'DESC']
                 ]
             });
         });

package/dist/src/constants/addresses.js

@@ -2,19 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addresses = void 0;
 exports.addresses = {
-    // 1: {
-    //   gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
-    //   multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-    //   interopXContract: '',
-    // },
     137: {
         gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXContract: '0x28f175FBEAce469c27ed587016aD7Bb72f286759',
+        interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopXContract: '0x54d77C42Dae3Fc0f48b4Fdd5a193E776D07C1EEC',
+        interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
     }
 };

package/dist/src/db/models/transaction.js

@@ -12,17 +12,21 @@ Transaction.init({
         autoIncrement: true,
         primaryKey: true
     },
-    requestTransactionHash: sequelize_2.DataTypes.NUMBER,
-    requestBlockNumber: sequelize_2.DataTypes.NUMBER,
     transactionHash: sequelize_2.DataTypes.STRING,
     actionId: sequelize_2.DataTypes.STRING,
-    bridger: sequelize_2.DataTypes.STRING,
+    vnonce: sequelize_2.DataTypes.STRING,
+    sourceSender: sequelize_2.DataTypes.STRING,
+    submitChainId: sequelize_2.DataTypes.NUMBER,
+    submitTransactionHash: sequelize_2.DataTypes.STRING,
+    submitBlockNumber: sequelize_2.DataTypes.NUMBER,
+    submitCreatedAt: sequelize_2.DataTypes.DATE,
     sourceChainId: sequelize_2.DataTypes.NUMBER,
+    sourceDsaId: sequelize_2.DataTypes.STRING,
     sourceTransactionHash: sequelize_2.DataTypes.STRING,
     sourceBlockNumber: sequelize_2.DataTypes.NUMBER,
     sourceStatus: {
         type: sequelize_2.DataTypes.STRING,
-        defaultValue: 'uninitialised'
+        defaultValue: 'pending'
     },
     sourceErrors: {
         type: sequelize_2.DataTypes.JSON,
@@ -38,11 +42,12 @@ Transaction.init({
     },
     sourceDelayUntil: sequelize_2.DataTypes.STRING,
     targetChainId: sequelize_2.DataTypes.NUMBER,
+    targetDsaId: sequelize_2.DataTypes.STRING,
     targetTransactionHash: sequelize_2.DataTypes.STRING,
     targetBlockNumber: sequelize_2.DataTypes.NUMBER,
     targetStatus: {
         type: sequelize_2.DataTypes.STRING,
-        defaultValue: 'uninitialised'
+        defaultValue: 'pending'
     },
     targetErrors: {
         type: sequelize_2.DataTypes.JSON,
@@ -54,13 +59,10 @@ Transaction.init({
     },
     targetCreatedAt: sequelize_2.DataTypes.DATE,
     targetDelayUntil: sequelize_2.DataTypes.DATE,
-    requestEvent: {
+    submitEvent: {
         type: sequelize_2.DataTypes.JSON,
         allowNull: false
     },
-    requestSentEvent: sequelize_2.DataTypes.JSON,
-    committedEvent: sequelize_2.DataTypes.JSON,
-    completedEvent: sequelize_2.DataTypes.JSON,
     status: {
         type: sequelize_2.DataTypes.STRING,
         defaultValue: 'pending'

package/dist/src/gnosis/actions/withdraw/index.js

@@ -1,115 +1,114 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const abi_1 = __importDefault(require("@/abi"));
-const config_1 = __importDefault(require("@/config"));
-const constants_1 = require("@/constants");
-const utils_1 = require("@/utils");
-const ethers_1 = require("ethers");
-const ethers_multisend_1 = require("ethers-multisend");
-const getBridgeAmounts = async (user, tokens, chainId) => {
-    const sourceChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(chainId));
-    const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
-    const contractAddress = constants_1.addresses[chainId].interopXContract;
-    const contract = (0, utils_1.getContract)(contractAddress, abi_1.default.interopXContract, sourceWallet);
-    const data = await contract.getBridgeAmounts(user, tokens);
-    return data.map((item, index) => ({
-        token: tokens[index],
-        deposit: item.deposit,
-        withdraw: item.withdraw,
-    }));
-};
+// const getBridgeAmounts = async (user: string, tokens: string[], chainId: ChainId) => {
+//     const sourceChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(chainId));
+//     const sourceWallet = new ethers.Wallet(config.privateKey, sourceChainProvider);
+//     const contractAddress = addresses[chainId].interopX;
+//     const contract = getContract<InteropX>(contractAddress, abi.interopX, sourceWallet);
+//     const data = await contract.getBridgeAmounts(user, tokens);
+//     return data.map((item, index) => ({
+//         token: tokens[index],
+//         deposit: item.deposit,
+//         withdraw: item.withdraw,
+//     }))
+// }
 async function default_1(transaction, type) {
     const transactions = [];
     const logs = [];
-    if (transaction.actionId !== 'withdraw') {
-        throw new Error(`Invalid action: ${transaction.actionId}`);
-    }
-    if (type !== 'source') {
-        throw new Error(`[WIP] Type not supported: ${type}`);
-    }
-    if (transaction.sourceStatus === 'pending') {
-        throw Error('Source transaction already processesing');
-    }
-    if (transaction.sourceStatus === 'pending') {
-        throw Error('Source transaction already processed');
-    }
-    if (!transaction.requestEvent) {
-        throw Error('Something went wrong, source transaction has no request event');
-    }
-    const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = transaction.requestEvent;
-    const sourceChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(sourceChainId));
-    const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
-    const contractAddress = constants_1.addresses[sourceChainId].interopXContract;
-    const contract = (0, utils_1.getContract)(contractAddress, abi_1.default.interopXContract, sourceWallet);
-    const sourceToken = constants_1.tokens[sourceChainId].find(t => t.address.toLowerCase() === position.withdraw[0].sourceToken.toLowerCase());
-    if (!sourceToken) {
-        throw Error('Source token not found');
-    }
-    const targetToken = constants_1.tokens[targetChainId].find(t => t.address.toLowerCase() === position.withdraw[0].targetToken.toLowerCase());
-    if (!targetToken) {
-        throw Error('Target token not found');
-    }
-    if (!sourceToken.aliases.some(alias => targetToken.aliases.includes(alias))) {
-        throw Error('Source and target token must be the same');
-    }
-    const networks = [137, 43114];
-    const networkUserData = {};
-    for (const network of networks) {
-        networkUserData[network] = await getBridgeAmounts(bridger, constants_1.tokens[network].map(t => t.address), network);
-    }
-    for (const tokenSymbol of ["dai", "usdc", "usdt", "eth", "wbtc"]) {
-        let totalDeposit = ethers_1.BigNumber.from(0);
-        let totalWithdraw = ethers_1.BigNumber.from(0);
-        for (const network of networks) {
-            // on avax might we have 2 usdc/usdt tokens
-            const matchedTokens = constants_1.tokens[network].filter(t => t.aliases.includes(tokenSymbol));
-            for (const matchedToken of matchedTokens) {
-                const data = networkUserData[network].find(t => t.token.toLowerCase() === matchedToken.address.toLowerCase());
-                if (data) {
-                    totalDeposit = totalDeposit.add(data.deposit);
-                    totalWithdraw = totalWithdraw.add(data.withdraw);
-                }
-            }
-            //  on Mainent add weth too
-            if (tokenSymbol === "eth" && network === 1) {
-                const weth = constants_1.tokens[1].find(t => t.symbol === 'WETH');
-                if (weth) {
-                    const data = networkUserData[1].find(t => t.token.toLowerCase() === weth.address.toLowerCase());
-                    if (data) {
-                        totalDeposit = totalDeposit.add(data.deposit);
-                        totalWithdraw = totalWithdraw.add(data.withdraw);
-                    }
-                }
-            }
-            if (totalWithdraw.gt(totalDeposit)) {
-                throw Error(`if withdraw > deposit, user has debt and we can't process the withdraw and reject it`);
-            }
-            if (totalWithdraw.lt(totalDeposit)) {
-                throw Error('Something went wrong');
-            }
-        }
-    }
-    let balance = ethers_1.BigNumber.from(0);
-    if (position.withdraw[0].sourceToken.toLowerCase() === '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'.toLowerCase()) {
-        balance = await sourceChainProvider.getBalance(bridger);
-    }
-    else {
-        const erc20 = (0, utils_1.getContract)(position.withdraw[0].sourceToken, abi_1.default.erc20, sourceChainProvider);
-        balance = await erc20.balanceOf(constants_1.addresses[sourceChainId].gnosisSafe);
-    }
-    if (balance.lt(position.withdraw[0].amount)) {
-        throw new utils_1.LiquidityError();
-    }
-    const { data } = await contract.populateTransaction.withdrawRequested(actionId, bridger, position.withdraw[0].sourceToken, position.withdraw[0].targetToken, position.withdraw[0].amount, targetChainId, transaction.requestTransactionHash, metadata);
-    transactions.push({
-        to: contractAddress,
-        data: data,
-        value: '0',
-        operation: ethers_multisend_1.OperationType.Call,
-    });
+    // if (transaction.actionId !== 'withdraw') {
+    //     throw new Error(`Invalid action: ${transaction.actionId}`)
+    // }
+    // if (type !== 'source') {
+    //     throw new Error(`[WIP] Type not supported: ${type}`)
+    // }
+    // if (transaction.sourceStatus === 'pending') {
+    //     throw Error('Source transaction already processesing')
+    // }
+    // if (transaction.sourceStatus === 'pending') {
+    //     throw Error('Source transaction already processed')
+    // }
+    // if (!transaction.requestEvent) {
+    //     throw Error('Something went wrong, source transaction has no request event')
+    // }
+    // const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = transaction.requestEvent;
+    // const sourceChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(sourceChainId as ChainId));
+    // const sourceWallet = new ethers.Wallet(config.privateKey, sourceChainProvider);
+    // const contractAddress = addresses[sourceChainId].interopX;
+    // const contract = getContract<InteropX>(contractAddress, abi.interopX, sourceWallet);
+    // const sourceToken = tokens[sourceChainId].find(t => t.address.toLowerCase() === position.withdraw[0].sourceToken.toLowerCase());
+    // if (!sourceToken) {
+    //     throw Error('Source token not found')
+    // }
+    // const targetToken = tokens[targetChainId].find(t => t.address.toLowerCase() === position.withdraw[0].targetToken.toLowerCase());
+    // if (!targetToken) {
+    //     throw Error('Target token not found')
+    // }
+    // if (!sourceToken.aliases.some(alias => targetToken.aliases.includes(alias))) {
+    //     throw Error('Source and target token must be the same')
+    // }
+    // const networks: ChainId[] = [137, 43114];
+    // const networkUserData = {}
+    // for (const network of networks) {
+    //     networkUserData[network] = await getBridgeAmounts(bridger, tokens[network].map(t => t.address), network)
+    // }
+    // for (const tokenSymbol of ["dai", "usdc", "usdt", "eth", "wbtc"]) {
+    //     let totalDeposit = BigNumber.from(0)
+    //     let totalWithdraw = BigNumber.from(0)
+    //     for (const network of networks) {
+    //         // on avax might we have 2 usdc/usdt tokens
+    //         const matchedTokens = tokens[network].filter(t => t.aliases.includes(tokenSymbol));
+    //         for (const matchedToken of matchedTokens) {
+    //             const data = networkUserData[network].find(t => t.token.toLowerCase() === matchedToken.address.toLowerCase());
+    //             if (data) {
+    //                 totalDeposit = totalDeposit.add(data.deposit)
+    //                 totalWithdraw = totalWithdraw.add(data.withdraw)
+    //             }
+    //         }
+    //         //  on Mainent add weth too
+    //         if (tokenSymbol === "eth" && network === 1) {
+    //             const weth = tokens[1].find(t => t.symbol === 'WETH');
+    //             if (weth) {
+    //                 const data = networkUserData[1].find(t => t.token.toLowerCase() === weth.address.toLowerCase());
+    //                 if (data) {
+    //                     totalDeposit = totalDeposit.add(data.deposit)
+    //                     totalWithdraw = totalWithdraw.add(data.withdraw)
+    //                 }
+    //             }
+    //         }
+    //     }
+    //     if (totalWithdraw.gt(totalDeposit)) {
+    //         throw Error(`if withdraw > deposit, user has debt and we can't process the withdraw and reject it`)
+    //     }
+    //     if (totalWithdraw.lt(totalDeposit)) {
+    //         throw Error('Something went wrong')
+    //     }
+    // }
+    // let balance = BigNumber.from(0);
+    // if (position.withdraw[0].sourceToken.toLowerCase() === '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'.toLowerCase()) {
+    //     balance = await sourceChainProvider.getBalance(bridger);
+    // } else {
+    //     const erc20 = getContract<Erc20>(position.withdraw[0].sourceToken, abi.erc20, sourceChainProvider);
+    //     balance = await erc20.balanceOf(addresses[sourceChainId].gnosisSafe);
+    // }
+    // if (balance.lt(position.withdraw[0].amount)) {
+    //     throw new LiquidityError()
+    // }
+    // const { data } = await contract.populateTransaction.withdrawRequested(
+    //     actionId,
+    //     bridger,
+    //     position.withdraw[0].sourceToken,
+    //     position.withdraw[0].targetToken,
+    //     position.withdraw[0].amount,
+    //     targetChainId,
+    //     transaction.requestTransactionHash,
+    //     metadata,
+    // );
+    // transactions.push({
+    //     to: contractAddress,
+    //     data: data!,
+    //     value: '0',
+    //     operation: OperationType.Call,
+    // });
     return { transactions, logs };
 }
 exports.default = default_1;

package/dist/src/index.js

@@ -13,7 +13,7 @@ const package_json_1 = __importDefault(require("../package.json"));
 dotenv_1.default.config();
 const logger_1 = __importDefault(require("@/logger"));
 const logger = new logger_1.default('Process');
-const GIT_SHORT_HASH = '76d0265';
+const GIT_SHORT_HASH = '7738003';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);

package/dist/src/tasks/{InteropXContract/SyncBridgeRequestEvents.js → InteropX/SyncLogSubmitEvents.js}

@@ -11,38 +11,41 @@ const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const constants_1 = require("@/constants");
 const config_1 = __importDefault(require("@/config"));
-class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
+class SyncLogSubmitEvents extends BaseTask_1.BaseTask {
     constructor({ chainId }) {
         super({
-            logger: new logger_1.default("InteropXContract::SyncBridgeRequestEvents"),
+            logger: new logger_1.default("InteropX::SyncLogSubmitEvents"),
         });
         this.chainId = chainId;
     }
     async pollHandler() {
         const currentBlock = await this.provider.getBlockNumber();
-        const events = await this.contract.queryFilter(this.contract.filters.LogBridgeRequest(), currentBlock - 2000, currentBlock);
+        const events = await this.contract.queryFilter(this.contract.filters.LogSubmit(), currentBlock - 2000, currentBlock);
         let processedEvents = 0;
         for (const event of events) {
             try {
                 if (!event.args) {
                     continue;
                 }
-                const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = event.args;
+                const { position, actionId, actionIdHashHash, sourceSender, sourceDsaId, targetDsaId, sourceChainId, targetChainId, vnonce, metadata, } = event.args;
                 const uniqueIdentifier = {
                     actionId,
-                    bridger,
-                    requestTransactionHash: event.transactionHash,
+                    vnonce: vnonce.toString(),
+                    sourceSender: sourceSender.toString(),
                     sourceChainId: sourceChainId.toNumber(),
                     targetChainId: targetChainId.toNumber(),
+                    sourceDsaId: sourceDsaId.toString(),
+                    targetDsaId: targetDsaId.toString(),
                 };
                 let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
                 const transaction = await db_1.Transaction.findOne({ where: { transactionHash } });
                 if (transaction) {
                     continue;
                 }
-                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { requestBlockNumber: event.blockNumber, requestEvent: {
+                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { submitChainId: this.chainId, submitTransactionHash: event.transactionHash, submitBlockNumber: event.blockNumber, submitCreatedAt: new Date(), submitEvent: {
                         actionId,
-                        bridger,
+                        actionIdHashHash,
+                        vnonce: vnonce.toString(),
                         position: {
                             withdraw: position.withdraw.map((v) => ({
                                 sourceToken: v.sourceToken,
@@ -57,9 +60,12 @@ class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
                         },
                         sourceChainId: sourceChainId.toNumber(),
                         targetChainId: targetChainId.toNumber(),
+                        sourceSender,
+                        sourceDsaId: sourceDsaId.toString(),
+                        targetDsaId: targetDsaId.toString(),
                         metadata,
                     } }));
-                this.logger.info(`New bridge request received: ${transactionHash} `);
+                this.logger.info(`New InteropX tranaction: ${transactionHash} `);
             }
             catch (error) {
                 this.logger.error(error);
@@ -69,10 +75,10 @@ class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
             this.logger.info(`${processedEvents} events processed`);
     }
     async start() {
-        this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
+        this.contractAddress = constants_1.addresses[this.chainId].interopX;
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopX, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
         await super.start();
     }
 }
-exports.default = SyncBridgeRequestEvents;
+exports.default = SyncLogSubmitEvents;

package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js

@@ -24,9 +24,11 @@ class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
         }
         const transaction = await db_1.Transaction.findOne({
             where: {
-                status: 'pending',
+                sourceStatus: {
+                    [sequelize_1.Op.notIn]: ['success', 'failed'],
+                },
                 sourceCreatedAt: {
-                    [sequelize_1.Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
+                    [sequelize_1.Op.gte]: new Date(Date.now() - 15 * 60 * 1000),
                 },
             }
         });

package/dist/src/tasks/index.js

@@ -6,24 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tasks = void 0;
 const waait_1 = __importDefault(require("waait"));
 const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
-const SyncBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/SyncBridgeRequestEvents"));
-const ProcessBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/ProcessBridgeRequestEvents"));
-const SyncBridgeRequestSentEvents_1 = __importDefault(require("./InteropXContract/SyncBridgeRequestSentEvents"));
-const SyncBridgeCommittedEvents_1 = __importDefault(require("./InteropXContract/SyncBridgeCommittedEvents"));
+const SyncLogSubmitEvents_1 = __importDefault(require("./InteropX/SyncLogSubmitEvents"));
 class Tasks {
     constructor() {
         this.tasks = [
             // new SyncTransactionStatusTask(),
             new AutoUpdateTask_1.default(),
-            // InteropXContract
-            new SyncBridgeRequestEvents_1.default({ chainId: 137 }),
-            new SyncBridgeRequestEvents_1.default({ chainId: 43114 }),
-            new SyncBridgeRequestSentEvents_1.default({ chainId: 137 }),
-            new SyncBridgeRequestSentEvents_1.default({ chainId: 43114 }),
-            new SyncBridgeCommittedEvents_1.default({ chainId: 137 }),
-            new SyncBridgeCommittedEvents_1.default({ chainId: 43114 }),
-            new ProcessBridgeRequestEvents_1.default({ chainId: 137 }),
-            new ProcessBridgeRequestEvents_1.default({ chainId: 43114 }),
+            // InteropX
+            new SyncLogSubmitEvents_1.default({ chainId: 137 }),
+            new SyncLogSubmitEvents_1.default({ chainId: 43114 }),
         ];
     }
     async start() {