@instadapp/interop-x 0.0.0-dev.b3789e6 → 0.0.0-dev.b8c571d

package/dist/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

@@ -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.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
  */
@@ -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) {
@@ -93,9 +96,128 @@ exports.asyncCallWithTimeout = asyncCallWithTimeout;
 const generateInteropTransactionHash = (data) => {
     return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
         String(data.action),
-        String(data.sourceTransactionHash),
+        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.submitEvent.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.b3789e6",
+  "version": "0.0.0-dev.b8c571d",
   "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/net/peer/index.ts

@@ -88,12 +88,13 @@ export const startPeer = async ({ }: IPeerOptions) => {
     libp2p: node
   })
 
-  node.on("peer:discovery", (peer) =>
-    logger.log(`Discovered peer ${peer}`)
-  ); // peer disc.
-  node.connectionManager.on("peer:connect", (connection) =>
-    logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
-  );
+  node.on("peer:discovery", (peer) => {
+    // logger.log(`Discovered peer ${peer}`)
+  }); // peer disc.
+
+  node.connectionManager.on("peer:connect", (connection) => {
+    // logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
+  });
 
   logger.log("Peer discovery started");
 

package/src/net/pool/index.ts

@@ -1,5 +1,9 @@
 import { Event } from "@/types";
 import config from "@/config";
+import Logger from "@/logger";
+
+
+const logger = new Logger('PeerPool')
 
 export interface IPeerInfo {
     id: string;
@@ -75,10 +79,15 @@ export class PeerPool {
      * @emits {@link Event.POOL_PEER_ADDED}
      */
     add(peer?: IPeerInfo) {
-        if (peer && peer.id && !this.pool.get(peer.id)) {
+        if (peer && peer.id) {
+            const newPeer = !this.pool.get(peer.id);
             this.pool.set(peer.id, peer)
             peer.pooled = true
-            config.events.emit(Event.POOL_PEER_ADDED, peer)
+           
+            if(newPeer) {
+                config.events.emit(Event.POOL_PEER_ADDED, peer)
+                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} added to pool`)
+            }
         }
     }
 
@@ -92,6 +101,7 @@ export class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false
                 config.events.emit(Event.POOL_PEER_REMOVED, peer)
+                logger.info(`Peer ${peer.id} with address ${peer.publicAddress} removed from pool`)
             }
         }
     }
@@ -114,14 +124,14 @@ export class PeerPool {
 
 
     cleanup() {
-        let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
-
-        this.peers.forEach((peerInfo) => {
-            if (peerInfo.updated.getTime() < compDate) {
-                console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
-                this.remove(peerInfo)
-            }
-        })
+        // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
+
+        // this.peers.forEach((peerInfo) => {
+        //     if (peerInfo.updated.getTime() < compDate) {
+        //         console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
+        //         this.remove(peerInfo)
+        //     }
+        // })
     }
 }
 

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,25 @@ 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 });
+        console.log("signing:", {
+            to: addresses[transaction.targetChainId].multisend,
+            data: await buildDataForTransaction(transaction, data.type),
+            chainId: transaction.targetChainId as ChainId,
+            safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
+        });
+
+        const signedData = await signGnosisSafeTx({
+            to: addresses[transaction.targetChainId].multisend,
+            data: await buildDataForTransaction(transaction, data.type),
+            chainId: transaction.targetChainId as ChainId,
+            safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
+        }, { signer });
 
         return {
             signer: signer.address,
-            data: null, //signedData,
+            data: signedData
         }
     }
 }

package/src/tasks/BaseTask.ts

@@ -37,7 +37,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
                     await this.pollHandler()
                 }
             } catch (err) {
-                this.logger.error(`poll check error: ${err.message}\ntrace: ${err.stack}`)
+                this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`)
             }
 
             await this.postPollHandler()