@instadapp/interop-x 0.0.0-dev.59f2858 → 0.0.0-dev.62ea999

package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js

@@ -0,0 +1,150 @@
+"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"));
+const sequelize_1 = require("sequelize");
+const waait_1 = __importDefault(require("waait"));
+const net_1 = require("@/net");
+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 ProcessDepositEvents extends BaseTask_1.BaseTask {
+    constructor({ chainId }) {
+        super({
+            logger: new logger_1.default("InteropXGateway::ProcessDepositEvents"),
+        });
+        this.leadNodeOnly = true;
+        this.chainId = chainId;
+    }
+    async pollHandler() {
+        var _a;
+        const blockNumber = await this.provider.getBlockNumber();
+        const transaction = await db_1.Transaction.findOne({
+            where: {
+                status: 'pending',
+                sourceStatus: 'success',
+                targetStatus: 'uninitialised',
+                action: 'deposit',
+                sourceCreatedAt: {
+                    [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
+                },
+                targetDelayUntil: {
+                    [sequelize_1.Op.or]: {
+                        [sequelize_1.Op.is]: null,
+                        [sequelize_1.Op.lt]: new Date(),
+                    }
+                },
+                sourceBlockNumber: {
+                    [sequelize_1.Op.lt]: blockNumber - 12,
+                },
+                sourceChainId: this.chainId,
+            }
+        });
+        if (!transaction) {
+            return;
+        }
+        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();
+        await (0, waait_1.default)(10000);
+        let gnosisTx = await generateGnosisTransaction({
+            baseGas: "0",
+            data: await (0, utils_1.buildDataForTransaction)(transaction),
+            gasPrice: "0",
+            gasToken: "0x0000000000000000000000000000000000000000",
+            nonce: '0',
+            operation: "1",
+            refundReceiver: "0x0000000000000000000000000000000000000000",
+            safeAddress: safeAddress,
+            safeTxGas: "79668",
+            to: constants_1.addresses[transaction.targetChainId].multisend,
+            value: "0",
+        }, safeContract);
+        const owners = await 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);
+        const signatures = await net_1.protocol.requestSignatures({
+            type: 'source',
+            transactionHash: transaction.transactionHash,
+            safeTxGas: gnosisTx.safeTxGas,
+            safeNonce: gnosisTx.nonce
+        }, ownerPeerIds);
+        const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x');
+        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';
+            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,
+            data: txData,
+        });
+        const receipt = await txSent.wait();
+        const parsedLogs = [];
+        receipt.logs.forEach((log) => {
+            try {
+                parsedLogs.push(safeContract.interface.parseLog(log));
+            }
+            catch (e) { }
+        });
+        if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
+            console.log('ExecutionSuccess');
+            transaction.targetStatus = 'success';
+            transaction.targetTransactionHash = txSent.hash;
+            transaction.status = 'success';
+            await transaction.save();
+        }
+        else {
+            console.log('ExecutionFailure');
+            transaction.targetStatus = 'failed';
+            transaction.targetTransactionHash = txSent.hash;
+            transaction.status = 'failed';
+            await transaction.save();
+        }
+        net_1.protocol.sendTransaction(transaction);
+    }
+    async start() {
+        this.logger.info(`Starting execution watcher on interop chain`);
+        this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
+        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.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        await super.start();
+    }
+}
+exports.default = ProcessDepositEvents;

package/dist/{tasks → src/tasks}/InteropXGateway/SyncDepositEvents.js

@@ -30,7 +30,7 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
                 const { sourceChainId, targetChainId, user, vnonce, amount, token } = event.args;
                 const uniqueIdentifier = {
                     action: 'deposit',
-                    sourceTransactionHash: event.transactionHash,
+                    submitTransactionHash: event.transactionHash,
                     sourceChainId: sourceChainId.toNumber(),
                     targetChainId: targetChainId.toNumber(),
                 };
@@ -38,15 +38,24 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
                     continue;
                 }
                 const tx = await event.getTransaction();
-                await db_1.Transaction.create(Object.assign(Object.assign({}, uniqueIdentifier), { transactionHash: (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier), from: tx.from, to: user, sourceBlockNumber: event.blockNumber, sourceStatus: "uninitialised", targetStatus: "uninitialised", submitEvent: {
+                await db_1.Transaction.create(Object.assign(Object.assign({}, uniqueIdentifier), { transactionHash: (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier), from: tx.from, to: user, submitTransactionHash: event.transactionHash, submitBlockNumber: event.blockNumber, 
+                    // submit & source are the same
+                    sourceTransactionHash: event.transactionHash, sourceBlockNumber: event.blockNumber, sourceStatus: "success", targetStatus: "uninitialised", submitEvent: {
                         user,
                         sourceChainId: sourceChainId.toString(),
                         targetChainId: targetChainId.toString(),
                         token: token,
-                        ammout: amount.toString(),
+                        amount: amount.toString(),
+                        vnonce: vnonce.toString(),
+                    }, sourceEvent: {
+                        user,
+                        sourceChainId: sourceChainId.toString(),
+                        targetChainId: targetChainId.toString(),
+                        token: token,
+                        amount: amount.toString(),
                         vnonce: vnonce.toString(),
                     }, status: "pending" }));
-                this.logger.info(`Execution queued: ${event.transactionHash} ${event.blockNumber}`);
+                this.logger.info(`Deposit queued: ${event.transactionHash} ${event.blockNumber}`);
             }
             catch (error) {
                 this.logger.error(error);
@@ -59,7 +68,7 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
         this.logger.info(`Starting execution watcher on interop chain`);
         this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
         this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
-        this.contract = new ethers_1.ethers.Contract(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
+        this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
         await super.start();
     }
 }

package/dist/{tasks → src/tasks}/index.js

@@ -4,12 +4,25 @@ 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 SyncWithdrawEvents_1 = __importDefault(require("./InteropBridge/SyncWithdrawEvents"));
+const ProcessWithdrawEvents_1 = __importDefault(require("./InteropBridge/ProcessWithdrawEvents"));
 class Tasks {
     constructor() {
         this.tasks = [
             new SyncDepositEvents_1.default({
                 chainId: 43114
+            }),
+            new ProcessDepositEvents_1.default({
+                chainId: 43114
+            }),
+            new SyncWithdrawEvents_1.default({
+                chainId: 137,
+                itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
+            }),
+            new ProcessWithdrawEvents_1.default({
+                chainId: 137,
             })
         ];
     }

package/dist/src/utils/index.js

@@ -0,0 +1,223 @@
+"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.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
+/**
+ * @module util
+ */
+const axios_1 = __importDefault(require("axios"));
+const axios_retry_1 = __importDefault(require("axios-retry"));
+const constants_1 = require("@/constants");
+const ethers_1 = require("ethers");
+const ethers_multisend_1 = require("ethers-multisend");
+const config_1 = __importDefault(require("@/config"));
+const abi_1 = __importDefault(require("@/abi"));
+exports.http = axios_1.default.create();
+(0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
+function short(buffer) {
+    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 gnosisSafe = constants_1.addresses[chainId].gnosisSafe;
+    const domain = {
+        verifyingContract: gnosisSafe,
+        chainId,
+    };
+    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' },
+        ],
+    };
+    const message = {
+        baseGas,
+        data,
+        gasPrice,
+        gasToken,
+        nonce: Number(nonce),
+        operation,
+        refundReceiver,
+        safeAddress: gnosisSafe,
+        safeTxGas: String(safeTxGas),
+        to,
+        value,
+    };
+    return await signer._signTypedData(domain, types, message);
+};
+exports.signGnosisSafeTx = signGnosisSafeTx;
+const getRpcProviderUrl = (chainId) => {
+    switch (chainId) {
+        case 1:
+            return 'https://rpc.instadapp.io/mainnet';
+        case 137:
+            return 'https://rpc.instadapp.io/polygon';
+        case 43114:
+            return 'https://rpc.instadapp.io/avalanche';
+        default:
+            throw new Error(`Unknown chainId: ${chainId}`);
+    }
+};
+exports.getRpcProviderUrl = getRpcProviderUrl;
+const buildSignatureBytes = (signatures) => {
+    signatures.sort((left, right) => left.signer.toLowerCase().localeCompare(right.signer.toLowerCase()));
+    let signatureBytes = "0x";
+    for (const sig of signatures) {
+        signatureBytes += sig.data.slice(2);
+    }
+    return signatureBytes;
+};
+exports.buildSignatureBytes = buildSignatureBytes;
+/**
+ * Call an async function with a maximum time limit (in milliseconds) for the timeout
+ *  Resolved promise for async function call, or an error if time limit reached
+ */
+const asyncCallWithTimeout = async (asyncPromise, timeout) => {
+    let timeoutHandle;
+    const timeoutPromise = new Promise((_resolve, reject) => {
+        timeoutHandle = setTimeout(() => reject(new Error('Async call timeout limit reached')), timeout);
+    });
+    return Promise.race([asyncPromise, timeoutPromise]).then(result => {
+        clearTimeout(timeoutHandle);
+        return result;
+    });
+};
+exports.asyncCallWithTimeout = asyncCallWithTimeout;
+const generateInteropTransactionHash = (data) => {
+    return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
+        String(data.action),
+        String(data.submitTransactionHash),
+        String(data.sourceChainId),
+        String(data.targetChainId),
+    ]);
+};
+exports.generateInteropTransactionHash = generateInteropTransactionHash;
+const buildDataForTransaction = async (transaction, type) => {
+    type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
+    switch (transaction.action) {
+        case "deposit":
+            return await (0, exports.buildDepositDataForTransaction)(transaction, type);
+        case "withdraw":
+            return await (0, exports.buildWithdrawDataForTransaction)(transaction, type);
+        default:
+            throw new Error(`Unknown action: ${transaction.action}`);
+    }
+};
+exports.buildDataForTransaction = buildDataForTransaction;
+const buildDepositDataForTransaction = async (transaction, type) => {
+    const transactions = [];
+    if (transaction.action !== 'deposit') {
+        throw new Error(`Invalid action: ${transaction.action}`);
+    }
+    if (transaction.action === 'deposit' && transaction.sourceStatus === 'pending') {
+        throw Error('Cannot build data for pending deposit transaction');
+    }
+    if (!transaction.submitEvent) {
+        throw Error('Cannot build data for transaction without submitEvent');
+    }
+    const token = constants_1.tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
+    if (!token) {
+        throw Error('Cannot build data for transaction without token');
+    }
+    const itoken = constants_1.itokens[transaction.targetChainId].find(itoken => itoken.symbol.toLowerCase() === token.symbol.toLowerCase());
+    if (!itoken) {
+        throw Error('Cannot build data for transaction without itoken');
+    }
+    const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
+    const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
+    const interopBridgeContract = getContract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
+    const { data } = await interopBridgeContract.populateTransaction.mint(transaction.submitEvent.user, ethers_1.ethers.BigNumber.from(transaction.submitEvent.amount.toString()), ethers_1.ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()), transaction.submitTransactionHash);
+    transactions.push({
+        to: itoken.address,
+        data: data,
+        value: '0',
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    return (0, ethers_multisend_1.encodeMulti)(transactions).data;
+};
+exports.buildDepositDataForTransaction = buildDepositDataForTransaction;
+const buildWithdrawDataForTransaction = async (transaction, type) => {
+    const transactions = [];
+    if (transaction.action !== 'withdraw') {
+        throw new Error(`Invalid action: ${transaction.action}`);
+    }
+    if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
+        throw Error('Cannot build data for pending withdraw transaction');
+    }
+    if (!transaction.submitEvent) {
+        throw Error('Cannot build data for transaction without submitEvent');
+    }
+    const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
+    const itoken = constants_1.itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
+    if (!itoken) {
+        throw Error('Cannot build data for transaction without itoken');
+    }
+    const token = constants_1.tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
+    if (!token) {
+        throw Error('Cannot build data for transaction without token');
+    }
+    const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
+    const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
+    const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
+    const interopBridgeContract = getContract(gatewayAddress, abi_1.default.interopXGateway, targetWallet);
+    const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(ethers_1.ethers.BigNumber.from(amount.toString()), to, token.address, ethers_1.ethers.BigNumber.from(transaction.sourceChainId.toString()), transaction.submitTransactionHash);
+    transactions.push({
+        to: gatewayAddress,
+        data: data,
+        value: '0',
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    return (0, ethers_multisend_1.encodeMulti)(transactions).data;
+};
+exports.buildWithdrawDataForTransaction = buildWithdrawDataForTransaction;
+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);
+    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)))) {
+                return async (...args) => {
+                    try {
+                        return await value.bind(contract)(...args);
+                    }
+                    catch (error) {
+                        throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
+                    }
+                };
+            }
+            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 value.bind(contract)(...args);
+                                }
+                                catch (error) {
+                                    throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
+                                }
+                            };
+                        }
+                    }
+                });
+            }
+            return value;
+        },
+    });
+}
+exports.getContract = getContract;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.59f2858",
+  "version": "0.0.0-dev.62ea999",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -12,7 +12,8 @@
     "build": "yarn generate-abi-types && export GIT_REF=$(git rev-parse --short HEAD) && rimraf ./dist && tsc -p tsconfig.json && replace-in-file '@GIT_SHORT_HASH@' $GIT_REF ./dist/**/*.js",
     "dev": "yarn generate-abi-types && NODE_ENV=development nodemon",
     "generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
-    "prepublishOnly": "yarn build"
+    "prepublishOnly": "yarn build",
+    "postinstall": "patch-package"
   },
   "nodemonConfig": {
     "watch": [
@@ -45,7 +46,7 @@
     "libp2p-websockets": "^0.16.2",
     "luxon": "^2.3.2",
     "module-alias": "^2.2.2",
-    "sequelize": "^6.19.0",
+    "sequelize": "6.18.0",
     "sqlite3": "^5.0.5",
     "waait": "^1.0.5"
   },
@@ -59,6 +60,8 @@
     "@types/fs-extra": "^9.0.13",
     "@types/node": "^17.0.17",
     "nodemon": "^2.0.15",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0",
     "replace-in-file": "^6.3.2",
     "rimraf": "^3.0.2",
     "ts-node": "^10.5.0",

package/patches/@ethersproject+properties+5.6.0.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@ethersproject/properties/lib/index.js b/node_modules/@ethersproject/properties/lib/index.js
+index 41e0b52..4c7a9e3 100644
+--- a/node_modules/@ethersproject/properties/lib/index.js
++++ b/node_modules/@ethersproject/properties/lib/index.js
+@@ -44,7 +44,7 @@ function defineReadOnly(object, name, value) {
+     Object.defineProperty(object, name, {
+         enumerable: true,
+         value: value,
+-        writable: false,
++        writable: true,
+     });
+ }
+ exports.defineReadOnly = defineReadOnly;

package/src/constants/addresses.ts

@@ -3,23 +3,15 @@ export const addresses = {
     gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
     multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
     interopXGateway: '',
-    interopBridgeTokens: [],
   },
   137: {
     gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
     multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
     interopXGateway: '',
-    interopBridgeTokens: [
-      {
-        address: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
-        symbol : 'USDC',
-      }
-    ],
   },
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
     interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
-    interopBridgeTokens: [],
   }
 }

package/src/constants/index.ts

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

package/src/constants/itokens.ts

@@ -0,0 +1,10 @@
+export const itokens = {
+  1: [],
+  137: [
+    {
+      address: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
+      symbol: 'USDC',
+    }
+  ],
+  43114: []
+};

package/src/db/models/transaction.ts

@@ -9,10 +9,12 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
     declare from: string;
     declare to: string;
 
+    declare submitTransactionHash: string;
+    declare submitBlockNumber: number;
 
     declare sourceChainId: number;
-    declare sourceTransactionHash: string;
-    declare sourceBlockNumber: number;
+    declare sourceTransactionHash: CreationOptional<string>;
+    declare sourceBlockNumber: CreationOptional<number>;
     declare sourceStatus: string;
     declare sourceErrors: CreationOptional<string[]>;
     declare sourceCreatedAt: CreationOptional<Date>;
@@ -45,6 +47,8 @@ Transaction.init({
         primaryKey: true
     },
 
+    submitTransactionHash: DataTypes.NUMBER,
+    submitBlockNumber: DataTypes.NUMBER,
 
     transactionHash: DataTypes.STRING,
     action: DataTypes.STRING,

package/src/index.ts

@@ -19,6 +19,7 @@ moduleAlias();
 import assert from "assert";
 import dotenv from "dotenv";
 import { ethers } from "ethers";
+import packageJson from '../package.json'
 dotenv.config();
 
 import Logger from "@/logger";
@@ -41,9 +42,12 @@ try {
     process.exit(1)
 }
 
+logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
+
 import { Tasks } from "@/tasks";
-import { startPeer } from "@/net";
+import { startPeer, protocol, peerPool } from "@/net";
 import { startApiServer } from '@/api';
+import { Transaction } from './db';
 
 async function main() {
 
@@ -54,6 +58,30 @@ async function main() {
     tasks.start();
 
     startApiServer()
+
+    protocol.on('TransactionStatus', async (payload) => {
+        if (!peerPool.isLeadNode(payload.peerId)) {
+            return;
+        }
+
+        const transaction = await Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } })
+
+        if (!transaction) {
+            return;
+        }
+
+        transaction.sourceStatus = payload.data.sourceStatus
+        transaction.sourceTransactionHash = payload.data.sourceTransactionHash
+        transaction.sourceErrors = payload.data.sourceErrors
+
+        transaction.targetStatus = payload.data.targetStatus
+        transaction.targetTransactionHash = payload.data.targetTransactionHash
+        transaction.targetErrors = payload.data.targetErrors
+
+        transaction.status = payload.data.status
+
+        await transaction.save()
+    })
 }
 
 main()