@instadapp/interop-x 0.0.0-dev.a861339 → 0.0.0-dev.a9047d2

package/src/abi/interopXContract.json

@@ -1,391 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "bridger",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "sourceToken",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "targetToken",
-                "type": "address"
-              },
-              { "internalType": "uint256", "name": "amount", "type": "uint256" }
-            ],
-            "internalType": "struct InteropXContractBeta.TokenInfo[]",
-            "name": "supply",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "sourceToken",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "targetToken",
-                "type": "address"
-              },
-              { "internalType": "uint256", "name": "amount", "type": "uint256" }
-            ],
-            "internalType": "struct InteropXContractBeta.TokenInfo[]",
-            "name": "withdraw",
-            "type": "tuple[]"
-          }
-        ],
-        "indexed": false,
-        "internalType": "struct InteropXContractBeta.Position",
-        "name": "position",
-        "type": "tuple"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint32",
-        "name": "sourceChainId",
-        "type": "uint32"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint32",
-        "name": "targetChainId",
-        "type": "uint32"
-      },
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "requestTransactionHash",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "metadata",
-        "type": "bytes"
-      }
-    ],
-    "name": "LogBridgeCommitted",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "bridger",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "sourceToken",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "targetToken",
-                "type": "address"
-              },
-              { "internalType": "uint256", "name": "amount", "type": "uint256" }
-            ],
-            "internalType": "struct InteropXContractBeta.TokenInfo[]",
-            "name": "supply",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "sourceToken",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "targetToken",
-                "type": "address"
-              },
-              { "internalType": "uint256", "name": "amount", "type": "uint256" }
-            ],
-            "internalType": "struct InteropXContractBeta.TokenInfo[]",
-            "name": "withdraw",
-            "type": "tuple[]"
-          }
-        ],
-        "indexed": false,
-        "internalType": "struct InteropXContractBeta.Position",
-        "name": "position",
-        "type": "tuple"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "sourceChainId",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "targetChainId",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "requestTransactionHash",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes32",
-        "name": "targetCommittedTransactionHash",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "metadata",
-        "type": "bytes"
-      }
-    ],
-    "name": "LogBridgeCompleted",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "bridger",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "sourceToken",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "targetToken",
-                "type": "address"
-              },
-              { "internalType": "uint256", "name": "amount", "type": "uint256" }
-            ],
-            "internalType": "struct InteropXContractBeta.TokenInfo[]",
-            "name": "supply",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "sourceToken",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "targetToken",
-                "type": "address"
-              },
-              { "internalType": "uint256", "name": "amount", "type": "uint256" }
-            ],
-            "internalType": "struct InteropXContractBeta.TokenInfo[]",
-            "name": "withdraw",
-            "type": "tuple[]"
-          }
-        ],
-        "indexed": false,
-        "internalType": "struct InteropXContractBeta.Position",
-        "name": "position",
-        "type": "tuple"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "sourceChainId",
-        "type": "uint256"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint256",
-        "name": "targetChainId",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "metadata",
-        "type": "bytes"
-      }
-    ],
-    "name": "LogBridgeRequest",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "bridger",
-        "type": "address"
-      },
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "sourceToken",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "targetToken",
-                "type": "address"
-              },
-              { "internalType": "uint256", "name": "amount", "type": "uint256" }
-            ],
-            "internalType": "struct InteropXContractBeta.TokenInfo[]",
-            "name": "supply",
-            "type": "tuple[]"
-          },
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "sourceToken",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "targetToken",
-                "type": "address"
-              },
-              { "internalType": "uint256", "name": "amount", "type": "uint256" }
-            ],
-            "internalType": "struct InteropXContractBeta.TokenInfo[]",
-            "name": "withdraw",
-            "type": "tuple[]"
-          }
-        ],
-        "indexed": false,
-        "internalType": "struct InteropXContractBeta.Position",
-        "name": "position",
-        "type": "tuple"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint32",
-        "name": "sourceChainId",
-        "type": "uint32"
-      },
-      {
-        "indexed": true,
-        "internalType": "uint32",
-        "name": "targetChainId",
-        "type": "uint32"
-      },
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "requestTransactionHash",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "metadata",
-        "type": "bytes"
-      }
-    ],
-    "name": "LogBridgeRequestSent",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "_vnonce",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "to_", "type": "address" },
-      { "internalType": "address", "name": "sourceToken_", "type": "address" },
-      { "internalType": "address", "name": "targetToken_", "type": "address" },
-      { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-      { "internalType": "uint32", "name": "targetChainId_", "type": "uint32" },
-      {
-        "internalType": "bytes32",
-        "name": "transactionHash_",
-        "type": "bytes32"
-      },
-      { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
-    ],
-    "name": "completeBridge",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "sourceToken_", "type": "address" },
-      { "internalType": "address", "name": "targetToken_", "type": "address" },
-      { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-      { "internalType": "uint32", "name": "targetChainId_", "type": "uint32" },
-      { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
-    ],
-    "name": "requestWithdraw",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "name": "whitelistedMapping",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "user_", "type": "address" },
-      { "internalType": "address", "name": "sourceToken_", "type": "address" },
-      { "internalType": "address", "name": "targetToken_", "type": "address" },
-      { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-      { "internalType": "uint32", "name": "chainId_", "type": "uint32" },
-      {
-        "internalType": "bytes32",
-        "name": "transactionHash_",
-        "type": "bytes32"
-      },
-      { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
-    ],
-    "name": "withdrawRequested",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]

package/src/gnosis/actions/withdraw/index.ts

@@ -1,56 +0,0 @@
-import abi from "@/abi";
-import config from "@/config";
-import { addresses, tokens } from "@/constants";
-import { Transaction } from "@/db";
-import { InteropXContract } from "@/typechain";
-import { ChainId } from "@/types";
-import { getContract, getRpcProviderUrl } from "@/utils";
-import { ethers } from "ethers";
-import { MetaTransaction, OperationType } from "ethers-multisend";
-
-export default async function (transaction: Transaction, type: 'source' | 'target') {
-    const transactions: MetaTransaction[] = [];
-    const logs: any[] = [];
-
-    if (transaction.action !== 'withdraw') {
-        throw new Error(`Invalid action: ${transaction.action}`)
-    }
-
-    if (type !== 'source') {
-        throw new Error(`Type not supported: ${type}`)
-    }
-
-    if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
-        throw Error('Cannot build data for pending withdraw transaction');
-    }
-
-    if (!transaction.requestEvent) {
-        throw Error('Cannot build data for transaction without requestEvent');
-    }
-
-    const { bridger, position, sourceChainId, targetChainId, metadata, } = transaction.requestEvent;
-
-    const sourceChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(targetChainId as ChainId));
-    const sourceWallet = new ethers.Wallet(config.privateKey, sourceChainProvider);
-    const contractAddress = addresses[sourceChainId].interopXContract;
-    const contract = getContract<InteropXContract>(contractAddress, abi.interopXContract, sourceWallet);
-
-    const { data } = await contract.populateTransaction.withdrawRequested(
-        bridger,
-        position.withdraw[0].sourceToken,
-        position.withdraw[0].targetToken,
-        position.withdraw[0].amount,
-        targetChainId,
-        transaction.requestTransactionHash,
-        metadata,
-    );
-
-    transactions.push({
-        to: contractAddress,
-        data: data!,
-        value: '0',
-        operation: OperationType.Call,
-    });
-
-    return { transactions, logs }
-}

package/src/tasks/InteropXContract/ProcessBridgeRequestEvents.ts

@@ -1,211 +0,0 @@
-import { BaseTask } from "../BaseTask";
-import Logger from '@/logger';
-import { ethers, Wallet } from "ethers";
-import abi from "@/abi";
-import { Transaction } from "@/db";
-import { buildSignatureBytes, generateGnosisTransaction, generateInteropTransactionHash, getContract, getRpcProviderUrl, Signature } from "@/utils";
-import { addresses } from "@/constants";
-import { Op } from "sequelize";
-import { ChainId } from "@/types";
-import config from "@/config";
-import { GnosisSafe, InteropXContract } from "@/typechain";
-import wait from "waait";
-import { buildGnosisAction } from "@/gnosis";
-import { peerPool, protocol } from "@/net";
-import { LogDescription } from "ethers/lib/utils";
-
-class ProccessBridgeRequestEvents extends BaseTask {
-    contractAddress: string;
-    safeContractAddress: string;
-    provider: ethers.providers.JsonRpcProvider;
-    contract: InteropXContract;
-    safeContract: GnosisSafe;
-    chainId: ChainId;
-    sourceWallet: Wallet;
-
-    leadNodeOnly: boolean = true;
-
-    constructor({ chainId }: { chainId: ChainId }) {
-        super({
-            logger: new Logger("InteropXContract::ProccessBridgeRequestEvents"),
-        })
-        this.chainId = chainId;
-    }
-
-    async pollHandler() {
-        const blockNumber = await this.provider.getBlockNumber()
-
-        const transaction = await Transaction.findOne({
-            where: {
-                status: 'pending',
-                sourceStatus: 'uninitialised',
-                createdAt: {
-                    [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
-                },
-                sourceDelayUntil: {
-                    [Op.or]: {
-                        [Op.is]: null,
-                        [Op.lt]: new Date(),
-                    }
-                },
-                requestBlockNumber: {
-                    [Op.lt]: blockNumber - 12,
-                },
-                sourceChainId: this.chainId,
-            }
-        })
-
-        if (!transaction) {
-            return;
-        }
-
-        console.log(`Processing transaction ${transaction.transactionHash}`);
-
-        transaction.targetStatus = 'pending';
-        await transaction.save();
-
-        const ownersThreshold = await this.safeContract.getThreshold();
-        await wait(10000);
-
-
-        let data, logs = [];
-
-        try {
-            ({ data, logs } = await buildGnosisAction(transaction, 'source'));
-
-        } catch (error) {
-            console.log(error);
-            transaction.sourceStatus = 'failed';
-            transaction.sourceErrors = [error.message];
-            transaction.targetStatus = 'failed';
-
-            transaction.status = 'failed'
-            await transaction.save();
-            protocol.sendTransaction(transaction)
-            return;
-        }
-
-        let gnosisTx = await generateGnosisTransaction({
-            baseGas: "0",
-            data,
-            gasPrice: "0",
-            gasToken: "0x0000000000000000000000000000000000000000",
-            nonce: '0',
-            operation: "1",
-            refundReceiver: "0x0000000000000000000000000000000000000000",
-            safeAddress: this.safeContractAddress,
-            safeTxGas: "79668",
-            to: addresses[transaction.sourceChainId].multisend,
-            value: "0",
-        }, this.safeContract);
-
-        const owners = await this.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}`)
-
-        console.log(ownerPeerIds);
-
-        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 = 'uninitialised'
-
-            await transaction.save();
-            const errorMessage = signatures.find(s => !!s.error)?.error;
-            throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
-        }
-
-        console.log(`Executing transaction for execution ${transaction.transactionHash}`)
-
-        const { data: txData } = await this.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 this.sourceWallet.sendTransaction({
-            from: this.sourceWallet.address,
-            gasPrice: ethers.BigNumber.from(120 * 10 ** 9),
-            to: this.safeContractAddress,
-            data: txData,
-        })
-
-        console.log(txSent);
-        
-
-        const receipt = await txSent.wait();
-
-        const parsedLogs: LogDescription[] = [];
-
-        receipt.logs.forEach((log) => {
-            try {
-                parsedLogs.push(this.safeContract.interface.parseLog(log));
-            } catch (e) { }
-        });
-
-        if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
-            console.log('ExecutionSuccess')
-            transaction.sourceStatus = 'success'
-            transaction.sourceTransactionHash = txSent.hash
-            transaction.sourceLogs = logs;
-            transaction.status = 'success'
-            await transaction.save();
-        } else {
-            console.log('ExecutionFailure')
-            transaction.sourceStatus = 'failed'
-            transaction.sourceTransactionHash = txSent.hash
-            transaction.status = 'failed'
-            await transaction.save();
-        }
-
-        protocol.sendTransaction(transaction)
-    }
-
-    async start(): Promise<void> {
-        this.contractAddress = addresses[this.chainId].interopXContract;
-
-        this.provider = new ethers.providers.JsonRpcProvider(
-            getRpcProviderUrl(this.chainId)
-        );
-
-        this.sourceWallet = new ethers.Wallet(config.privateKey!, this.provider);
-
-        this.contract = getContract<InteropXContract>(
-            this.contractAddress,
-            abi.interopXContract,
-            this.sourceWallet
-        );
-
-        this.safeContractAddress = addresses[this.chainId].gnosisSafe;
-        this.safeContract = getContract<GnosisSafe>(
-            this.safeContractAddress,
-            abi.gnosisSafe,
-            this.sourceWallet
-        );
-
-        await super.start()
-    }
-}
-
-export default ProccessBridgeRequestEvents;