@instadapp/interop-x 0.0.0-dev.80722d6 → 0.0.0-dev.a168c79

package/dist/package.json

@@ -0,0 +1,69 @@
+{
+    "name": "@instadapp/interop-x",
+    "version": "0.0.0-dev.a168c79",
+    "license": "MIT",
+    "main": "dist/index.js",
+    "engines": {
+        "node": ">=16",
+        "yarn": "^1.22.0"
+    },
+    "scripts": {
+        "start": "yarn build && node bin/interop-x",
+        "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"
+    },
+    "nodemonConfig": {
+        "watch": [
+            "src"
+        ],
+        "ext": "ts",
+        "exec": "./node_modules/.bin/ts-node --files -r tsconfig-paths/register ./src/index.ts"
+    },
+    "dependencies": {
+        "@achingbrain/libp2p-gossipsub": "^0.12.2",
+        "axios": "^0.27.1",
+        "axios-retry": "^3.2.4",
+        "bignumber.js": "^9.0.2",
+        "chalk": "4.1.2",
+        "dotenv": "^16.0.0",
+        "ethereumjs-util": "^7.1.4",
+        "ethers": "^5.6.4",
+        "ethers-multisend": "^2.1.1",
+        "expand-home-dir": "^0.0.3",
+        "fastify": "^3.28.0",
+        "fastify-cors": "^6.0.3",
+        "libp2p": "^0.36.2",
+        "libp2p-bootstrap": "^0.14.0",
+        "libp2p-kad-dht": "^0.28.6",
+        "libp2p-mdns": "^0.18.0",
+        "libp2p-mplex": "^0.10.7",
+        "libp2p-noise": "^4.0.0",
+        "libp2p-pubsub-peer-discovery": "^4.0.0",
+        "libp2p-tcp": "^0.17.2",
+        "libp2p-websockets": "^0.16.2",
+        "luxon": "^2.3.2",
+        "module-alias": "^2.2.2",
+        "sequelize": "^6.19.0",
+        "sqlite3": "^5.0.5",
+        "waait": "^1.0.5"
+    },
+    "bin": {
+        "interop-x": "bin/interop-x",
+        "interopx": "bin/interop-x"
+    },
+    "devDependencies": {
+        "@typechain/ethers-v5": "^10.0.0",
+        "@types/bn.js": "^5.1.0",
+        "@types/fs-extra": "^9.0.13",
+        "@types/node": "^17.0.17",
+        "nodemon": "^2.0.15",
+        "replace-in-file": "^6.3.2",
+        "rimraf": "^3.0.2",
+        "ts-node": "^10.5.0",
+        "tsconfig-paths": "^3.12.0",
+        "typechain": "^8.0.0",
+        "typescript": "^4.5.5"
+    }
+}

package/dist/src/api/index.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startApiServer = void 0;
+const fastify_1 = __importDefault(require("fastify"));
+const fastify_cors_1 = __importDefault(require("fastify-cors"));
+const logger_1 = __importDefault(require("@/logger"));
+const db_1 = require("@/db");
+const logger = new logger_1.default("RPC");
+const server = (0, fastify_1.default)({ logger: false });
+server.register(fastify_cors_1.default, {});
+server.get('/', async () => 'Interop X API');
+const startApiServer = async () => {
+    const HOST = process.env.API_HOST || '0.0.0.0';
+    const PORT = process.env.API_PORT || '8080';
+    try {
+        server.get('/transactions', async (req) => {
+            return await db_1.Transaction.findAndCountAll({
+                limit: 20,
+                offset: 0,
+            });
+        });
+        await server.listen(PORT, HOST);
+        logger.log(`RPC Server listening at http://${HOST}:${PORT}`);
+    }
+    catch (err) {
+        logger.error(err);
+        process.exit(1);
+    }
+};
+exports.startApiServer = startApiServer;

package/dist/{constants → src/constants}/addresses.js

@@ -6,23 +6,15 @@ exports.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/dist/{constants → src/constants}/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./addresses"), exports);
 __exportStar(require("./tokens"), exports);
+__exportStar(require("./itokens"), exports);

package/dist/src/constants/itokens.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.itokens = void 0;
+exports.itokens = {
+    1: [],
+    137: [
+        {
+            address: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
+            symbol: 'USDC',
+        }
+    ],
+    43114: []
+};

package/dist/{db → src/db}/models/transaction.js

@@ -12,8 +12,10 @@ Transaction.init({
         autoIncrement: true,
         primaryKey: true
     },
+    submitTransactionHash: sequelize_2.DataTypes.NUMBER,
+    submitBlockNumber: sequelize_2.DataTypes.NUMBER,
     transactionHash: sequelize_2.DataTypes.STRING,
-    type: sequelize_2.DataTypes.STRING,
+    action: sequelize_2.DataTypes.STRING,
     from: sequelize_2.DataTypes.STRING,
     to: sequelize_2.DataTypes.STRING,
     sourceChainId: sequelize_2.DataTypes.NUMBER,

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

@@ -9,6 +9,7 @@ module_alias_1.default.addAliases({
     "@/logger": __dirname + "/logger",
     "@/tasks": __dirname + "/tasks",
     "@/utils": __dirname + "/utils",
+    "@/api": __dirname + "/api",
     "@/net": __dirname + "/net",
     "@/db": __dirname + "/db",
     "@/config": __dirname + "/config",
@@ -21,6 +22,7 @@ module_alias_1.default.addAliases({
 const assert_1 = __importDefault(require("assert"));
 const dotenv_1 = __importDefault(require("dotenv"));
 const ethers_1 = require("ethers");
+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');
@@ -38,12 +40,15 @@ catch (e) {
     logger.error('Invalid private key');
     process.exit(1);
 }
+logger.debug(`Starting Interop X Node (v${package_json_1.default.version} - rev.a168c79)`);
 const tasks_1 = require("@/tasks");
 const net_1 = require("@/net");
+const api_1 = require("@/api");
 async function main() {
     (0, net_1.startPeer)({});
     const tasks = new tasks_1.Tasks();
     tasks.start();
+    (0, api_1.startApiServer)();
 }
 main()
     .then(() => {

package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js

@@ -8,6 +8,8 @@ const BaseDialProtocol_1 = require("./BaseDialProtocol");
 const waait_1 = __importDefault(require("waait"));
 const config_1 = __importDefault(require("@/config"));
 const db_1 = require("@/db");
+const utils_1 = require("@/utils");
+const constants_1 = require("@/constants");
 class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
     constructor(libp2p) {
         super(libp2p, '/interop-x/signatures');
@@ -15,31 +17,32 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
     }
     async response(data) {
         const signer = config_1.default.wallet;
-        let event;
+        let transaction;
         let maxTimeout = 20000;
         do {
-            event = await db_1.Transaction.findOne({ where: { transactionHash: data.transactionHash } });
-            if (!event) {
+            transaction = await db_1.Transaction.findOne({ where: { transactionHash: data.transactionHash } });
+            if (!transaction) {
                 await (0, waait_1.default)(1000);
                 maxTimeout -= 1000;
             }
-        } while (!event && maxTimeout > 0);
-        if (!event) {
+        } while (!transaction && maxTimeout > 0);
+        if (!transaction) {
             return {
                 signer: signer.address,
                 data: null,
                 error: 'Event not found'
             };
         }
-        // const signedData = await signGnosisSafeTx({
-        //     to: addresses[event.chainId as ChainId].multisend,
-        //     data: 'TODO',
-        //     chainId: event.chainId as ChainId,
-        //     safeTxGas: data.safeTxGas,
-        // }, { signer });
+        const signedData = await (0, utils_1.signGnosisSafeTx)({
+            //TODO: chain id depends on event type
+            to: constants_1.addresses[transaction.sourceChainId].multisend,
+            data: (0, utils_1.buildDataForTransaction)(transaction, data.type),
+            chainId: transaction.sourceChainId,
+            safeTxGas: data.safeTxGas,
+        }, { signer });
         return {
             signer: signer.address,
-            data: null, //signedData,
+            data: signedData
         };
     }
 }

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

@@ -0,0 +1,140 @@
+"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) => {
+    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',
+                action: 'deposit',
+                sourceCreatedAt: {
+                    [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
+                },
+                sourceBlockNumber: {
+                    [sequelize_1.Op.lt]: blockNumber - 12,
+                }
+            }
+        });
+        if (!transaction) {
+            return;
+        }
+        transaction.sourceStatus = '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 = new ethers_1.ethers.Contract(safeAddress, abi_1.default.gnosisSafe, targetWallet);
+        const ownersThreshold = await safeContract.getThreshold();
+        await (0, waait_1.default)(10000);
+        let gnosisTx = await generateGnosisTransaction({
+            baseGas: "0",
+            data: (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}`);
+        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.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.sourceStatus = 'pending';
+            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}` : ''));
+        }
+        const execTransactionParams = [
+            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(`Executing transaction for execution ${transaction.transactionHash}`);
+        console.log({
+            execTransactionParams
+        });
+        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));
+        const txSent = await targetWallet.sendTransaction({
+            from: targetWallet.address,
+            gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9),
+            gasLimit: ethers_1.BigNumber.from(6000000),
+            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');
+        }
+        else {
+            console.log('ExecutionFailure');
+        }
+    }
+    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 = new ethers_1.ethers.Contract(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

@@ -29,8 +29,8 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
                 }
                 const { sourceChainId, targetChainId, user, vnonce, amount, token } = event.args;
                 const uniqueIdentifier = {
-                    type: 'desposit',
-                    sourceTransactionHash: event.transactionHash,
+                    action: 'deposit',
+                    submitTransactionHash: event.transactionHash,
                     sourceChainId: sourceChainId.toNumber(),
                     targetChainId: targetChainId.toNumber(),
                 };
@@ -38,27 +38,23 @@ class SyncDepositEvents extends BaseTask_1.BaseTask {
                     continue;
                 }
                 const tx = await event.getTransaction();
-                await db_1.Transaction.create({
-                    transactionHash: (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier),
-                    type: 'deposit',
-                    from: tx.from,
-                    to: user,
-                    sourceChainId: sourceChainId.toNumber(),
-                    sourceTransactionHash: event.transactionHash,
-                    sourceBlockNumber: event.blockNumber,
-                    sourceStatus: "uninitialised",
-                    targetChainId: targetChainId.toNumber(),
-                    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(),
+                        vnonce: vnonce.toString(),
+                    }, sourceEvent: {
                         user,
                         sourceChainId: sourceChainId.toString(),
                         targetChainId: targetChainId.toString(),
                         token: token,
                         ammout: amount.toString(),
                         vnonce: vnonce.toString(),
-                    },
-                    status: "pending",
-                });
+                    }, status: "pending" }));
                 this.logger.info(`Execution queued: ${event.transactionHash} ${event.blockNumber}`);
             }
             catch (error) {

package/dist/{utils → 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.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
+exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
 /**
  * @module util
  */
@@ -11,6 +11,9 @@ 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) {
@@ -92,10 +95,43 @@ const asyncCallWithTimeout = async (asyncPromise, timeout) => {
 exports.asyncCallWithTimeout = asyncCallWithTimeout;
 const generateInteropTransactionHash = (data) => {
     return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
-        String(data.type),
-        String(data.sourceTransactionHash),
+        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';
+    const transactions = [];
+    if (transaction.action != 'deposit') {
+        throw new Error('Invalid 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 = new ethers_1.ethers.Contract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
+    const { data } = await interopBridgeContract.populateTransaction.mint(transaction.submitEvent.to, transaction.submitEvent.amount, transaction.sourceChainId, transaction.sourceTransactionHash);
+    transactions.push({
+        to: itoken.address,
+        data: data,
+        value: '0',
+        operation: ethers_multisend_1.OperationType.Call,
+    });
+    return (0, ethers_multisend_1.encodeMulti)(transactions).data;
+};
+exports.buildDataForTransaction = buildDataForTransaction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.80722d6",
+  "version": "0.0.0-dev.a168c79",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -32,6 +32,8 @@
     "ethers": "^5.6.4",
     "ethers-multisend": "^2.1.1",
     "expand-home-dir": "^0.0.3",
+    "fastify": "^3.28.0",
+    "fastify-cors": "^6.0.3",
     "libp2p": "^0.36.2",
     "libp2p-bootstrap": "^0.14.0",
     "libp2p-kad-dht": "^0.28.6",
@@ -48,7 +50,8 @@
     "waait": "^1.0.5"
   },
   "bin": {
-    "interop-x": "bin/interop-x"
+    "interop-x": "bin/interop-x",
+    "interopx": "bin/interop-x"
   },
   "devDependencies": {
     "@typechain/ethers-v5": "^10.0.0",

package/src/api/index.ts

@@ -0,0 +1,33 @@
+import fastify from "fastify"
+import cors from 'fastify-cors'
+import Logger from "@/logger"
+import { Transaction } from "@/db";
+
+const logger = new Logger("RPC");
+
+
+const server = fastify({ logger: false })
+
+server.register(cors, {})
+
+server.get('/', async () => 'Interop X API')
+
+export const startApiServer = async () => {
+    const HOST = process.env.API_HOST || '0.0.0.0';
+    const PORT = process.env.API_PORT || '8080';
+    try {
+        server.get('/transactions', async (req) => {
+            return await Transaction.findAndCountAll({
+                limit: 20,
+                offset: 0,
+            })
+        })
+
+        await server.listen(PORT, HOST)
+
+        logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
+    } catch (err) {
+        logger.error(err)
+        process.exit(1)
+    }
+}

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: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
+      symbol: 'USDC',
+    }
+  ],
+  43114: []
+};

package/src/db/models/transaction.ts

@@ -5,14 +5,16 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
     declare id: CreationOptional<number>;
 
     declare transactionHash: string;
-    declare type: string;
+    declare action: string;
     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,9 +47,11 @@ Transaction.init({
         primaryKey: true
     },
 
+    submitTransactionHash: DataTypes.NUMBER,
+    submitBlockNumber: DataTypes.NUMBER,
 
     transactionHash: DataTypes.STRING,
-    type: DataTypes.STRING,
+    action: DataTypes.STRING,
 
     from: DataTypes.STRING,
     to: DataTypes.STRING,

package/src/index.ts

@@ -5,6 +5,7 @@ moduleAlias.addAliases({
     "@/logger": __dirname + "/logger",
     "@/tasks": __dirname + "/tasks",
     "@/utils": __dirname + "/utils",
+    "@/api": __dirname + "/api",
     "@/net": __dirname + "/net",
     "@/db": __dirname + "/db",
     "@/config": __dirname + "/config",
@@ -18,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";
@@ -40,8 +42,11 @@ 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 { startApiServer } from '@/api';
 
 async function main() {
 
@@ -50,6 +55,8 @@ async function main() {
     const tasks = new Tasks()
 
     tasks.start();
+
+    startApiServer()
 }
 
 main()

package/src/net/protocol/dial/SignatureDialProtocol.ts

@@ -2,9 +2,12 @@ import { BaseDialProtocol } from "./BaseDialProtocol";
 import wait from "waait";
 import config from "@/config";
 import { Transaction } from "@/db";
+import { buildDataForTransaction, signGnosisSafeTx } from "@/utils";
+import { addresses } from "@/constants";
+import { ChainId } from "@/types";
 
 export interface ISignatureRequest {
-    type: string,
+    type: 'source' | 'target' ,
     transactionHash: string
     safeTxGas: string
     safeNonce: string
@@ -24,19 +27,19 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
     async response(data: ISignatureRequest): Promise<ISignatureResponse> {
         const signer = config.wallet;
 
-        let event: Transaction | null;
+        let transaction: Transaction | null;
         let maxTimeout = 20000;
 
         do {
-            event = await Transaction.findOne({ where: { transactionHash: data.transactionHash } })
+            transaction = await Transaction.findOne({ where: { transactionHash: data.transactionHash } })
 
-            if (!event) {
+            if (!transaction) {
                 await wait(1000);
                 maxTimeout -= 1000;
             }
-        } while (!event && maxTimeout > 0)
+        } while (!transaction && maxTimeout > 0)
 
-        if (!event) {
+        if (!transaction) {
             return {
                 signer: signer.address,
                 data: null,
@@ -44,16 +47,17 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
             };
         }
 
-        // const signedData = await signGnosisSafeTx({
-        //     to: addresses[event.chainId as ChainId].multisend,
-        //     data: 'TODO',
-        //     chainId: event.chainId as ChainId,
-        //     safeTxGas: data.safeTxGas,
-        // }, { signer });
+        const signedData = await signGnosisSafeTx({
+            //TODO: chain id depends on event type
+            to: addresses[transaction.sourceChainId].multisend,
+            data:  buildDataForTransaction(transaction, data.type),
+            chainId: transaction.sourceChainId as ChainId,
+            safeTxGas: data.safeTxGas,
+        }, { signer });
 
         return {
             signer: signer.address,
-            data: null, //signedData,
+            data: signedData
         }
     }
 }

package/src/tasks/InteropXGateway/ProcessDepositEvents.ts

@@ -0,0 +1,232 @@
+import { BaseTask } from "../BaseTask";
+import Logger from '@/logger';
+import { BigNumber, ethers } from "ethers";
+import abi from "@/abi";
+import { Transaction } from "@/db";
+import { buildDataForTransaction, buildSignatureBytes, getRpcProviderUrl, Signature } from "@/utils";
+import { addresses } from "@/constants";
+import { ChainId } from "@/types";
+import config from "@/config";
+import { GnosisSafe, InteropXGateway } from "@/typechain";
+import { Op } from "sequelize";
+import wait from "waait";
+import { peerPool, protocol } from "@/net";
+import { LogDescription } from "ethers/lib/utils";
+
+const generateGnosisTransaction = async (transactionData: any, safeContract: any) => {
+    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 = 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 {
+    contractAddress: string;
+    provider: ethers.providers.JsonRpcProvider;
+    contract: InteropXGateway;
+    chainId: ChainId;
+    leadNodeOnly = true
+
+    constructor({ chainId }: { chainId: ChainId }) {
+        super({
+            logger: new Logger("InteropXGateway::ProcessDepositEvents"),
+        })
+        this.chainId = chainId;
+    }
+
+    async pollHandler() {
+        const blockNumber = await this.provider.getBlockNumber()
+
+        const transaction = await Transaction.findOne({
+            where: {
+                status: 'pending',
+                sourceStatus: 'success',
+                action: 'deposit',
+                sourceCreatedAt: {
+                    [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
+                },
+                sourceBlockNumber: {
+                    [Op.lt]: blockNumber - 12,
+                }
+            }
+        })
+
+        if (!transaction) {
+            return;
+        }
+
+
+        transaction.sourceStatus = 'pending';
+        await transaction.save();
+
+
+        // refresh event data?
+
+        const targetChainProvider = new ethers.providers.JsonRpcProvider(
+            getRpcProviderUrl(transaction.targetChainId as ChainId)
+        );
+
+        const targetWallet = new ethers.Wallet(config.privateKey!, targetChainProvider);
+
+        const safeAddress = addresses[transaction.targetChainId].gnosisSafe;
+
+        const safeContract = new ethers.Contract(
+            safeAddress,
+            abi.gnosisSafe,
+            targetWallet
+        ) as GnosisSafe;
+
+        const ownersThreshold = await safeContract.getThreshold();
+
+        await wait(10000);
+
+        let gnosisTx = await generateGnosisTransaction({
+            baseGas: "0",
+            data: buildDataForTransaction(transaction),
+            gasPrice: "0",
+            gasToken: "0x0000000000000000000000000000000000000000",
+            nonce: '0',
+            operation: "1",
+            refundReceiver: "0x0000000000000000000000000000000000000000",
+            safeAddress: safeAddress,
+            safeTxGas: "79668",
+            to: addresses[transaction.targetChainId].multisend,
+            value: "0",
+        }, safeContract);
+
+        const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
+
+        const ownerPeerIds = peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id)
+
+        console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
+
+        const signatures = await protocol.requestSignatures({
+            type: 'source',
+            transactionHash: transaction.transactionHash,
+            safeTxGas: gnosisTx.safeTxGas,
+            safeNonce: gnosisTx.nonce
+        }, ownerPeerIds)
+
+
+        const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x') as Signature[];
+
+        console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
+
+        if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
+            await transaction.save();
+            transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
+            transaction.sourceStatus = 'pending'
+
+            await transaction.save();
+            const errorMessage = signatures.find(s => !!s.error)?.error;
+            throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
+        }
+
+        const execTransactionParams = [
+            gnosisTx.to,
+            gnosisTx.value,
+            gnosisTx.data,
+            gnosisTx.operation,
+            gnosisTx.safeTxGas,
+            gnosisTx.baseGas,
+            gnosisTx.gasPrice,
+            gnosisTx.gasToken,
+            gnosisTx.refundReceiver,
+            buildSignatureBytes(validSignatures),
+        ];
+
+        console.log(`Executing transaction for execution ${transaction.transactionHash}`)
+
+        console.log({
+            execTransactionParams
+        })
+
+        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,
+            buildSignatureBytes(validSignatures)
+        );
+
+        const txSent = await targetWallet.sendTransaction({
+            from: targetWallet.address,
+            gasPrice: BigNumber.from(120 * 10 ** 9),
+            gasLimit: BigNumber.from(6_000_000),
+            to: safeAddress,
+            data: txData,
+        })
+
+        const receipt = await txSent.wait();
+
+        const parsedLogs: LogDescription[] = [];
+
+        receipt.logs.forEach((log) => {
+            try {
+                parsedLogs.push(safeContract.interface.parseLog(log));
+            } catch (e) { }
+        });
+
+        if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
+            console.log('ExecutionSuccess')
+        } else {
+            console.log('ExecutionFailure')
+        }
+    }
+
+    async start(): Promise<void> {
+        this.logger.info(`Starting execution watcher on interop chain`);
+
+        this.contractAddress = addresses[this.chainId].interopXGateway;
+
+        this.provider = new ethers.providers.JsonRpcProvider(
+            getRpcProviderUrl(this.chainId)
+        );
+
+        this.contract = new ethers.Contract(
+            this.contractAddress,
+            abi.interopXGateway,
+            new ethers.Wallet(config.privateKey!, this.provider)
+        ) as InteropXGateway;
+
+        await super.start()
+    }
+}
+
+export default ProcessDepositEvents;

package/src/tasks/InteropXGateway/SyncDepositEvents.ts

@@ -43,8 +43,8 @@ class SyncDepositEvents extends BaseTask {
                 const { sourceChainId, targetChainId, user, vnonce, amount, token } = event.args;
 
                 const uniqueIdentifier = {
-                    type: 'desposit',
-                    sourceTransactionHash: event.transactionHash,
+                    action: 'deposit',
+                    submitTransactionHash: event.transactionHash,
                     sourceChainId: sourceChainId.toNumber(),
                     targetChainId: targetChainId.toNumber(),
                 }
@@ -56,17 +56,20 @@ class SyncDepositEvents extends BaseTask {
                 const tx = await event.getTransaction()
 
                 await Transaction.create({
+                    ...uniqueIdentifier,
                     transactionHash: generateInteropTransactionHash(uniqueIdentifier),
-                    type: 'deposit',
                     from: tx.from,
                     to: user,
 
-                    sourceChainId: sourceChainId.toNumber(),
+                    
+                    submitTransactionHash: event.transactionHash,
+                    submitBlockNumber: event.blockNumber,
+
+                    // submit & source are the same
                     sourceTransactionHash: event.transactionHash,
                     sourceBlockNumber: event.blockNumber,
-                    sourceStatus: "uninitialised",
+                    sourceStatus: "success",
 
-                    targetChainId: targetChainId.toNumber(),
                     targetStatus: "uninitialised",
 
                     submitEvent: {
@@ -77,6 +80,15 @@ class SyncDepositEvents extends BaseTask {
                         ammout: amount.toString(),
                         vnonce: vnonce.toString(),
                     },
+
+                    sourceEvent: {
+                        user,
+                        sourceChainId: sourceChainId.toString(),
+                        targetChainId: targetChainId.toString(),
+                        token: token,
+                        ammout: amount.toString(),
+                        vnonce: vnonce.toString(),
+                    },
                     status: "pending",
                 })
 

package/src/utils/index.ts

@@ -3,9 +3,14 @@
  */
 import axios from 'axios'
 import axiosRetry from "axios-retry";
-import { addresses } from '@/constants';
+import { addresses, itokens, tokens } from '@/constants';
 import { ChainId } from '@/types'
 import { ethers } from 'ethers';
+import { encodeMulti, MetaTransaction, OperationType } from 'ethers-multisend';
+import { Transaction } from '@/db';
+import config from '@/config';
+import abi from '@/abi';
+import { InteropBridgeToken } from '@/typechain';
 
 export const http = axios.create();
 
@@ -119,11 +124,62 @@ export const asyncCallWithTimeout = async <T>(asyncPromise: Promise<T>, timeout:
 }
 
 
-export const generateInteropTransactionHash = (data: { type: string, sourceTransactionHash: string, sourceChainId: string | number, targetChainId: string | number }) => {
+export const generateInteropTransactionHash = (data: { action: string, submitTransactionHash: string, sourceChainId: string | number, targetChainId: string | number }) => {
   return ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
-    String(data.type),
-    String(data.sourceTransactionHash),
+    String(data.action),
+    String(data.submitTransactionHash),
     String(data.sourceChainId),
     String(data.targetChainId),
   ]);
-}
+}
+
+export const buildDataForTransaction = async (transaction: Transaction, type?: 'source' | 'target') => {
+  type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
+
+  const transactions: MetaTransaction[] = [];
+
+  if(transaction.action != 'deposit') {
+    throw new Error('Invalid 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 = 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 = 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.providers.JsonRpcProvider(getRpcProviderUrl(transaction.targetChainId as ChainId));
+  const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
+  const interopBridgeContract = new ethers.Contract(itoken.address, abi.interopBridgeToken, targetWallet) as InteropBridgeToken;
+
+  const { data } = await interopBridgeContract.populateTransaction.mint(
+    transaction.submitEvent.to,
+    transaction.submitEvent.amount,
+    transaction.sourceChainId,
+    transaction.sourceTransactionHash,
+  );
+
+  transactions.push({
+    to: itoken.address,
+    data: data!,
+    value: '0',
+    operation: OperationType.Call,
+  });
+
+  return encodeMulti(transactions).data
+}