@instadapp/interop-x 0.0.0-dev.92afe89 → 0.0.0-dev.f78418c

package/src/db/models/transaction.ts

@@ -0,0 +1,92 @@
+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 type: string;
+    declare from: string;
+    declare to: string;
+
+
+    declare sourceChainId: number;
+    declare sourceTransactionHash: string;
+    declare sourceBlockNumber: 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
+    },
+
+
+    transactionHash: DataTypes.STRING,
+    type: 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/index.ts

@@ -1,13 +1,24 @@
-import { assert } from "console";
+import 'module-alias/register';
+import assert from "assert";
 import dotenv from "dotenv";
-import { Tasks } from "tasks";
-import Logger from "./logger";
-import { startPeer } from "./net";
+import { ethers } from "ethers";
 dotenv.config();
 
+import Logger from "@/logger";
+const logger = new Logger('Process')
+
 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)
+}
+
+import { Tasks } from "@/tasks";
+import { startPeer } from "@/net";
+
 
 async function 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,11 @@
-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";
 
 export interface ISignatureRequest {
     type: string,
-    vnonce: string
+    transactionHash: string
     safeTxGas: string
     safeNonce: string
 }
@@ -21,17 +18,17 @@ 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 event: Transaction | null;
         let maxTimeout = 20000;
 
         do {
-            event = await Execution.findOne({ where: { vnonce: data.vnonce.toString() } })
+            event = await Transaction.findOne({ where: { transactionHash: data.transactionHash } })
 
             if (!event) {
                 await wait(1000);
@@ -47,16 +44,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,
-            safeTxGas: data.safeTxGas,
-        }, { signer });
+        // const signedData = await signGnosisSafeTx({
+        //     to: addresses[event.chainId as ChainId].multisend,
+        //     data: 'TODO',
+        //     chainId: event.chainId as ChainId,
+        //     safeTxGas: data.safeTxGas,
+        // }, { signer });
 
         return {
             signer: signer.address,
-            data: signedData,
+            data: null, //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/SyncDepositEvents.ts

@@ -0,0 +1,114 @@
+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 = {
+                    type: 'desposit',
+                    sourceTransactionHash: event.transactionHash,
+                    sourceChainId: sourceChainId.toNumber(),
+                    targetChainId: targetChainId.toNumber(),
+                }
+
+                if (await Transaction.findOne({ where: uniqueIdentifier })) {
+                    continue;
+                }
+
+                const tx = await event.getTransaction()
+
+                await Transaction.create({
+                    transactionHash: 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: {
+                        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;

package/src/tasks/index.ts

@@ -1,9 +1,12 @@
 import { BaseTask } from "./BaseTask";
+import SyncInteropXGatewayDepositEvents from "./InteropXGateway/SyncDepositEvents";
 
 export class Tasks {
     
     tasks: BaseTask[] = [
-    
+        new SyncInteropXGatewayDepositEvents({
+            chainId: 43114
+        })
     ];
 
     async start() {