@instadapp/interop-x 0.0.0-dev.14afa72 → 0.0.0-dev.1f933be

package/dist/src/net/protocol/index.js

@@ -33,19 +33,29 @@ class Protocol extends stream_1.EventEmitter {
                     Buffer.from(transaction.sourceStatus),
                     Buffer.from(transaction.sourceTransactionHash || ''),
                     transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
+                    transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
                     Buffer.from(transaction.targetStatus),
                     Buffer.from(transaction.targetTransactionHash || ''),
                     transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
+                    transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
                     Buffer.from(transaction.status),
                 ],
-                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
+                decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]) => ({
                     transactionHash: transactionHash.toString(),
                     sourceStatus: sourceStatus.toString(),
                     sourceTransactionHash: sourceTransactionHash.toString() || null,
                     sourceErrors: sourceErrors.map((e) => e.toString()),
+                    sourceLogs: sourceLogs.map(e => ({
+                        type: e[0].toString(),
+                        message: e[1].toString(),
+                    })),
                     targetStatus: targetStatus.toString(),
                     targetTransactionHash: targetTransactionHash.toString() || null,
                     targetErrors: targetErrors.map((e) => e.toString()),
+                    targetLogs: targetLogs.map(e => ({
+                        type: e[0].toString(),
+                        message: e[1].toString(),
+                    })),
                     status: status.toString(),
                 }),
             },

package/dist/src/tasks/{InteropBridge/ProcessWithdrawEvents.js → InteropXContract/ProcessBridgeRequestEvents.js}

@@ -10,24 +10,15 @@ const abi_1 = __importDefault(require("@/abi"));
 const db_1 = require("@/db");
 const utils_1 = require("@/utils");
 const constants_1 = require("@/constants");
-const config_1 = __importDefault(require("@/config"));
 const sequelize_1 = require("sequelize");
+const config_1 = __importDefault(require("@/config"));
 const waait_1 = __importDefault(require("waait"));
-const net_1 = require("@/net");
 const gnosis_1 = require("@/gnosis");
-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.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;
-};
-class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
+const net_1 = require("@/net");
+class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
     constructor({ chainId }) {
         super({
-            logger: new logger_1.default("InteropXGateway::ProcessWithdrawEvents"),
+            logger: new logger_1.default("InteropXContract::ProccessBridgeRequestEvents"),
         });
         this.leadNodeOnly = true;
         this.chainId = chainId;
@@ -38,19 +29,17 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         const transaction = await db_1.Transaction.findOne({
             where: {
                 status: 'pending',
-                sourceStatus: 'success',
-                targetStatus: 'uninitialised',
-                action: 'withdraw',
-                sourceCreatedAt: {
+                sourceStatus: 'uninitialised',
+                createdAt: {
                     [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
                 },
-                targetDelayUntil: {
+                sourceDelayUntil: {
                     [sequelize_1.Op.or]: {
                         [sequelize_1.Op.is]: null,
                         [sequelize_1.Op.lt]: new Date(),
                     }
                 },
-                sourceBlockNumber: {
+                requestBlockNumber: {
                     [sequelize_1.Op.lt]: blockNumber - 12,
                 },
                 sourceChainId: this.chainId,
@@ -62,27 +51,23 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         console.log(`Processing transaction ${transaction.transactionHash}`);
         transaction.targetStatus = 'pending';
         await transaction.save();
-        // refresh event data?
-        const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(transaction.targetChainId));
-        const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
-        const safeAddress = constants_1.addresses[transaction.targetChainId].gnosisSafe;
-        const safeContract = (0, utils_1.getContract)(safeAddress, abi_1.default.gnosisSafe, targetWallet);
-        const ownersThreshold = await safeContract.getThreshold();
+        const ownersThreshold = await this.safeContract.getThreshold();
         await (0, waait_1.default)(10000);
         let data, logs = [];
         try {
-            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction));
+            ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, 'source'));
         }
         catch (error) {
             console.log(error);
+            transaction.sourceStatus = 'failed';
+            transaction.sourceErrors = [error.message];
             transaction.targetStatus = 'failed';
-            transaction.targetErrors = [error.message];
             transaction.status = 'failed';
             await transaction.save();
             net_1.protocol.sendTransaction(transaction);
             return;
         }
-        let gnosisTx = await generateGnosisTransaction({
+        let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
             baseGas: "0",
             data,
             gasPrice: "0",
@@ -90,12 +75,12 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
             nonce: '0',
             operation: "1",
             refundReceiver: "0x0000000000000000000000000000000000000000",
-            safeAddress: safeAddress,
+            safeAddress: this.safeContractAddress,
             safeTxGas: "79668",
-            to: constants_1.addresses[transaction.targetChainId].multisend,
+            to: constants_1.addresses[transaction.sourceChainId].multisend,
             value: "0",
-        }, safeContract);
-        const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
+        }, this.safeContract);
+        const owners = await this.safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
         const ownerPeerIds = net_1.peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id);
         console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
         console.log(ownerPeerIds);
@@ -109,31 +94,26 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
         if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
             await transaction.save();
-            transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
-            transaction.targetStatus = 'uninitialised';
+            transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.sourceStatus = 'uninitialised';
             await transaction.save();
             const errorMessage = (_a = signatures.find(s => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
             throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
         }
         console.log(`Executing transaction for execution ${transaction.transactionHash}`);
-        const { data: txData } = await safeContract.populateTransaction.execTransaction(gnosisTx.to, gnosisTx.value, gnosisTx.data, gnosisTx.operation, gnosisTx.safeTxGas, gnosisTx.baseGas, gnosisTx.gasPrice, gnosisTx.gasToken, gnosisTx.refundReceiver, (0, utils_1.buildSignatureBytes)(validSignatures));
-        console.log({
-            from: targetWallet.address,
-            gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9).toString(),
-            to: safeAddress,
-            data: txData,
-        });
-        const txSent = await targetWallet.sendTransaction({
-            from: targetWallet.address,
-            gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9),
-            to: safeAddress,
+        const { data: txData } = await this.safeContract.populateTransaction.execTransaction(gnosisTx.to, gnosisTx.value, gnosisTx.data, gnosisTx.operation, gnosisTx.safeTxGas, gnosisTx.baseGas, gnosisTx.gasPrice, gnosisTx.gasToken, gnosisTx.refundReceiver, (0, utils_1.buildSignatureBytes)(validSignatures));
+        const txSent = await this.sourceWallet.sendTransaction({
+            from: this.sourceWallet.address,
+            gasPrice: ethers_1.ethers.BigNumber.from(120 * 10 ** 9),
+            to: this.safeContractAddress,
             data: txData,
         });
+        console.log(txSent);
         const receipt = await txSent.wait();
         const parsedLogs = [];
         receipt.logs.forEach((log) => {
             try {
-                parsedLogs.push(safeContract.interface.parseLog(log));
+                parsedLogs.push(this.safeContract.interface.parseLog(log));
             }
             catch (e) { }
         });
@@ -155,8 +135,13 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
         net_1.protocol.sendTransaction(transaction);
     }
     async start() {
+        this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
+        this.sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider);
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, this.sourceWallet);
+        this.safeContractAddress = constants_1.addresses[this.chainId].gnosisSafe;
+        this.safeContract = (0, utils_1.getContract)(this.safeContractAddress, abi_1.default.gnosisSafe, this.sourceWallet);
         await super.start();
     }
 }
-exports.default = ProcessWithdrawEvents;
+exports.default = ProccessBridgeRequestEvents;

package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js

@@ -0,0 +1,78 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const BaseTask_1 = require("../BaseTask");
+const logger_1 = __importDefault(require("@/logger"));
+const ethers_1 = require("ethers");
+const abi_1 = __importDefault(require("@/abi"));
+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 {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropXContract::SyncBridgeRequestEvents"),
+        });
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+        const events = await this.contract.queryFilter(this.contract.filters.LogBridgeRequest(), currentBlock - 2000, currentBlock);
+        let processedEvents = 0;
+        for (const event of events) {
+            try {
+                if (!event.args) {
+                    continue;
+                }
+                const { bridger, position, sourceChainId, targetChainId, metadata } = event.args;
+                const uniqueIdentifier = {
+                    action: 'withdraw',
+                    bridger,
+                    requestTransactionHash: event.transactionHash,
+                    sourceChainId: sourceChainId.toNumber(),
+                    targetChainId: targetChainId.toNumber(),
+                };
+                let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
+                const transaction = await db_1.Transaction.findOne({ where: { transactionHash } });
+                if (transaction) {
+                    return;
+                }
+                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { position,
+                    metadata, requestBlockNumber: event.blockNumber, requestEvent: {
+                        bridger,
+                        position: {
+                            withdraw: position.withdraw.map((v) => ({
+                                sourceToken: v.sourceToken,
+                                targetToken: v.targetToken,
+                                amount: v.amount.toString()
+                            })),
+                            supply: position.supply.map((v) => ({
+                                sourceToken: v.sourceToken,
+                                targetToken: v.targetToken,
+                                amount: v.amount.toString()
+                            })),
+                        },
+                        sourceChainId: sourceChainId.toNumber(),
+                        targetChainId: targetChainId.toNumber(),
+                        metadata,
+                    } }));
+                this.logger.info(`New bridge request received: ${transactionHash} `);
+            }
+            catch (error) {
+                this.logger.error(error);
+            }
+        }
+        if (processedEvents > 0)
+            this.logger.info(`${processedEvents} events processed`);
+    }
+    async start() {
+        this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
+        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));
+        await super.start();
+    }
+}
+exports.default = SyncBridgeRequestEvents;

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

@@ -42,9 +42,11 @@ class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
         transaction.sourceStatus = transactionStatus.sourceStatus;
         transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash;
         transaction.sourceErrors = transactionStatus.sourceErrors;
+        transaction.sourceLogs = transactionStatus.sourceLogs;
         transaction.targetStatus = transactionStatus.targetStatus;
         transaction.targetTransactionHash = transactionStatus.targetTransactionHash;
         transaction.targetErrors = transactionStatus.targetErrors;
+        transaction.targetLogs = transactionStatus.targetLogs;
         transaction.status = transactionStatus.status;
         await transaction.save();
         this.logger.info(`Updated transaction status for ${transaction.transactionHash}`);

package/dist/src/tasks/index.js

@@ -4,47 +4,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tasks = void 0;
-const ProcessDepositEvents_1 = __importDefault(require("./InteropXGateway/ProcessDepositEvents"));
-const SyncDepositEvents_1 = __importDefault(require("./InteropXGateway/SyncDepositEvents"));
-const SyncWithdrawtEvents_1 = __importDefault(require("./InteropXGateway/SyncWithdrawtEvents"));
-const ProcessWithdrawEvents_1 = __importDefault(require("./InteropBridge/ProcessWithdrawEvents"));
-const SyncBurnEvents_1 = __importDefault(require("./InteropBridge/SyncBurnEvents"));
-const SyncMintEvents_1 = __importDefault(require("./InteropBridge/SyncMintEvents"));
-const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
 const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
+const SyncBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/SyncBridgeRequestEvents"));
+const ProcessBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/ProcessBridgeRequestEvents"));
+const waait_1 = __importDefault(require("waait"));
 class Tasks {
     constructor() {
         this.tasks = [
-            new SyncTransactionStatusTask_1.default(),
+            // new SyncTransactionStatusTask(),
             new AutoUpdateTask_1.default(),
-            // InteropXGateway
-            new SyncDepositEvents_1.default({
-                chainId: 43114
-            }),
-            new ProcessDepositEvents_1.default({
-                chainId: 43114
-            }),
-            new SyncWithdrawtEvents_1.default({
-                chainId: 43114
-            }),
-            // InteropBridge
-            new ProcessWithdrawEvents_1.default({
-                chainId: 137,
-            }),
-            new SyncMintEvents_1.default({
-                chainId: 137,
-                itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
-            }),
-            new SyncBurnEvents_1.default({
-                chainId: 137,
-                itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
-            })
+            // InteropXContract
+            new SyncBridgeRequestEvents_1.default({ chainId: 137 }),
+            new SyncBridgeRequestEvents_1.default({ chainId: 43114 }),
+            new ProcessBridgeRequestEvents_1.default({ chainId: 137 }),
+            new ProcessBridgeRequestEvents_1.default({ chainId: 43114 }),
         ];
     }
     async start() {
         for (const task of this.tasks) {
             try {
                 task.start();
+                await (0, waait_1.default)(1000);
             }
             catch (error) {
                 console.error(`Error starting task: ${task.constructor.name}`);