@instadapp/interop-x 0.0.0-dev.75809ae → 0.0.0-dev.7a02577

package/src/db/models/transaction.ts

@@ -0,0 +1,96 @@
+import { sequelize } from '@/db/sequelize'
+import { CreationOptional, InferAttributes, InferCreationAttributes, Model, DataTypes } from 'sequelize';
+
+export class Transaction extends Model<InferAttributes<Transaction>, InferCreationAttributes<Transaction>> {
+    declare id: CreationOptional<number>;
+
+    declare transactionHash: string;
+    declare action: string;
+    declare from: string;
+    declare to: string;
+
+    declare submitTransactionHash: string;
+    declare submitBlockNumber: number;
+
+    declare sourceChainId: number;
+    declare sourceTransactionHash: CreationOptional<string>;
+    declare sourceBlockNumber: CreationOptional<number>;
+    declare sourceStatus: string;
+    declare sourceErrors: CreationOptional<string[]>;
+    declare sourceCreatedAt: CreationOptional<Date>;
+    declare sourceDelayUntil: CreationOptional<Date>;
+
+    declare targetChainId: number;
+    declare targetTransactionHash: CreationOptional<string>;
+    declare targetBlockNumber: CreationOptional<number>;
+    declare targetStatus: string;
+    declare targetErrors: CreationOptional<string[]>;
+    declare targetCreatedAt: CreationOptional<Date>;
+    declare targetDelayUntil: CreationOptional<Date>;
+
+    declare submitEvent: any;
+    declare sourceEvent: CreationOptional<any>;
+    declare targetEvent: CreationOptional<any>;
+
+    declare metadata: CreationOptional<any>;
+
+    declare status: string;
+
+    declare createdAt: CreationOptional<Date>;
+    declare updatedAt: CreationOptional<Date>;
+}
+
+Transaction.init({
+    id: {
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
+        primaryKey: true
+    },
+
+    submitTransactionHash: DataTypes.NUMBER,
+    submitBlockNumber: DataTypes.NUMBER,
+
+    transactionHash: DataTypes.STRING,
+    action: DataTypes.STRING,
+
+    from: DataTypes.STRING,
+    to: DataTypes.STRING,
+
+    sourceChainId: DataTypes.NUMBER,
+    sourceTransactionHash: DataTypes.STRING,
+    sourceBlockNumber: DataTypes.NUMBER,
+    sourceStatus: DataTypes.STRING,
+    sourceErrors: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
+    sourceCreatedAt: {
+        type: DataTypes.DATE,
+        defaultValue: Date.now()
+    },
+    sourceDelayUntil: DataTypes.STRING,
+
+    targetChainId: DataTypes.NUMBER,
+    targetTransactionHash: DataTypes.STRING,
+    targetBlockNumber: DataTypes.NUMBER,
+    targetStatus: DataTypes.STRING,
+    targetErrors: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
+    targetCreatedAt: DataTypes.DATE,
+    targetDelayUntil: DataTypes.DATE,
+
+    submitEvent: DataTypes.JSON,
+    sourceEvent: DataTypes.JSON,
+    targetEvent: DataTypes.JSON,
+
+    metadata: DataTypes.JSON,
+
+    status: {
+        type: DataTypes.STRING,
+        defaultValue: 'pending'
+    },
+    createdAt: DataTypes.DATE,
+    updatedAt: DataTypes.DATE,
+}, { sequelize, tableName: 'transactions' });

package/src/db/sequelize.ts

@@ -1,9 +1,10 @@
 //@ts-ignore
+import config from "@/config";
 import expandHomeDir from "expand-home-dir";
 
 import { Sequelize } from 'sequelize';
 
-const basePath = expandHomeDir('~/.interop-x/data');
+const basePath = expandHomeDir(`~/.interop-x/data/${config.publicAddress}/${config.staging ? 'staging' : ''}`);
 
 export const sequelize = new Sequelize({
     dialect: 'sqlite',

package/src/index.ts

@@ -1,13 +1,52 @@
-import { assert } from "console";
+import moduleAlias from 'module-alias';
+
+moduleAlias.addAliases({
+    "@/": __dirname + "/",
+    "@/logger": __dirname + "/logger",
+    "@/tasks": __dirname + "/tasks",
+    "@/utils": __dirname + "/utils",
+    "@/api": __dirname + "/api",
+    "@/net": __dirname + "/net",
+    "@/db": __dirname + "/db",
+    "@/config": __dirname + "/config",
+    "@/types": __dirname + "/types",
+    "@/abi": __dirname + "/abi",
+    "@/constants": __dirname + "/constants",
+    "@/typechain": __dirname + "/typechain"
+})
+
+moduleAlias();
+import assert from "assert";
 import dotenv from "dotenv";
-import { Tasks } from "tasks";
-import Logger from "./logger";
-import { startPeer } from "./net";
+import { ethers } from "ethers";
+import packageJson from '../package.json'
 dotenv.config();
 
+import Logger from "@/logger";
+const logger = new Logger('Process')
+
+
+if (process.argv.at(-1) === 'help') {
+    console.log('Usage:')
+    console.log('   PRIVATE_KEY=abcd1234 interop-x')
+    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x')
+    process.exit(0)
+}
+
 assert(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
 
-const logger = new Logger('Process')
+try {
+    new ethers.Wallet(process.env.PRIVATE_KEY!)
+} catch (e) {
+    logger.error('Invalid private key')
+    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() {
 
@@ -16,6 +55,8 @@ async function main() {
     const tasks = new Tasks()
 
     tasks.start();
+
+    startApiServer()
 }
 
 main()

package/src/net/peer/index.ts

@@ -5,7 +5,7 @@ import WS from "libp2p-websockets";
 //@ts-ignore
 import Mplex from "libp2p-mplex";
 import { NOISE } from "libp2p-noise";
-import Logger from "../../logger";
+import Logger from "@/logger";
 import Bootstrap from "libp2p-bootstrap";
 import wait from "waait";
 import Gossipsub from "@achingbrain/libp2p-gossipsub";
@@ -15,8 +15,8 @@ import MulticastDNS from "libp2p-mdns";
 import KadDHT from "libp2p-kad-dht";
 //@ts-ignore
 import PubsubPeerDiscovery from "libp2p-pubsub-peer-discovery";
-import { protocol } from "../protocol";
-import config from "../../config";
+import { protocol } from "@/net";
+import config from "@/config";
 
 const logger = new Logger("Peer");
 

package/src/net/pool/index.ts

@@ -1,5 +1,5 @@
-import { Event } from "../../types";
-import config from "../../config";
+import { Event } from "@/types";
+import config from "@/config";
 
 export interface IPeerInfo {
     id: string;

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

@@ -1,7 +1,7 @@
 import pipe from 'it-pipe';
 import Libp2p from 'libp2p';
 import PeerId from 'peer-id';
-import { asyncCallWithTimeout } from '../../../utils';
+import { asyncCallWithTimeout } from '@/utils';
 import wait from 'waait';
 
 export class BaseDialProtocol<TRequest extends any, TResponse extends any> {

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

@@ -1,14 +1,14 @@
-import { signGnosisSafeTx } from "../../../utils";
 import { BaseDialProtocol } from "./BaseDialProtocol";
 import wait from "waait";
-import { ChainId } from "../../../types";
-import config from "config";
-import { addresses } from "../../../constants";
-import { Execution } from "db";
+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,
-    vnonce: string
+    type: 'source' | 'target' ,
+    transactionHash: string
     safeTxGas: string
     safeNonce: string
 }
@@ -21,25 +21,25 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
     protected timeout = 30000;
 
     constructor(libp2p) {
-        super(libp2p, '/signatures')
+        super(libp2p, '/interop-x/signatures')
     }
 
     async response(data: ISignatureRequest): Promise<ISignatureResponse> {
         const signer = config.wallet;
 
-        let event: Execution | null;
+        let transaction: Transaction | null;
         let maxTimeout = 20000;
 
         do {
-            event = await Execution.findOne({ where: { vnonce: data.vnonce.toString() } })
+            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,
@@ -48,15 +48,16 @@ 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,
+            //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: signedData,
+            data: signedData
         }
     }
 }

package/src/net/protocol/index.ts

@@ -3,8 +3,8 @@ import Libp2p from 'libp2p';
 import { bufferToInt, rlp } from 'ethereumjs-util'
 import { SignatureDialProtocol, ISignatureRequest, ISignatureResponse } from "./dial/SignatureDialProtocol";
 import { IPeerInfo, peerPool } from "..";
-import config from "config";
-import { Event } from "types";
+import config from "@/config";
+import { Event } from "@/types";
 
 export interface ProtocolOptions {
     /* Handshake timeout in ms (default: 8000) */
@@ -58,7 +58,7 @@ class Protocol extends EventEmitter {
 
     start({ libp2p, topic = null, }) {
         this.libp2p = libp2p
-        this.topic = topic || 'protocol'
+        this.topic = topic || 'itnerop-x-protocol'
 
         if (this.libp2p.isStarted()) this.init()
 

package/src/tasks/BaseTask.ts

@@ -1,8 +1,7 @@
-import config from "config";
-import { ethers } from "ethers";
+import config from "@/config";
 import EventEmitter from "events";
 import wait from "waait";
-import Logger from "../logger";
+import Logger from "@/logger";
 
 export interface IBaseTask {
     pollCheck(): Promise<void>

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

@@ -0,0 +1,126 @@
+import { BaseTask } from "../BaseTask";
+import Logger from '@/logger';
+import { ethers } from "ethers";
+import abi from "@/abi";
+import { Transaction } from "@/db";
+import { generateInteropTransactionHash, getRpcProviderUrl } from "@/utils";
+import { addresses } from "@/constants";
+import { ChainId } from "@/types";
+import config from "@/config";
+import { InteropXGateway } from "@/typechain";
+
+class SyncDepositEvents extends BaseTask {
+    contractAddress: string;
+    provider: ethers.providers.JsonRpcProvider;
+    contract: InteropXGateway;
+    chainId: ChainId;
+
+    constructor({ chainId }: { chainId: ChainId }) {
+        super({
+            logger: new Logger("InteropXGateway::SyncDepositEvents"),
+        })
+        this.chainId = chainId;
+    }
+
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+
+        const events = await this.contract.queryFilter(
+            this.contract.filters.LogGatewayDeposit(),
+            currentBlock - 2000,
+            currentBlock,
+        );
+
+        let processedEvents = 0;
+
+        for (const event of events) {
+
+            try {
+                if (!event.args) {
+                    continue;
+                }
+
+                const { sourceChainId, targetChainId, user, vnonce, amount, token } = event.args;
+
+                const uniqueIdentifier = {
+                    action: 'deposit',
+                    submitTransactionHash: event.transactionHash,
+                    sourceChainId: sourceChainId.toNumber(),
+                    targetChainId: targetChainId.toNumber(),
+                }
+
+                if (await Transaction.findOne({ where: uniqueIdentifier })) {
+                    continue;
+                }
+
+                const tx = await event.getTransaction()
+
+                await Transaction.create({
+                    ...uniqueIdentifier,
+                    transactionHash: 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",
+                })
+
+                this.logger.info(
+                    `Execution queued: ${event.transactionHash} ${event.blockNumber}`
+                );
+            } catch (error) {
+                this.logger.error(error);
+            }
+        }
+
+        if (processedEvents > 0)
+            this.logger.info(`${processedEvents} events processed`);
+    }
+
+    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 SyncDepositEvents;