@instadapp/interop-x 0.0.0-dev.d71f27e → 0.0.0-dev.de59649

package/src/constants/tokens.ts

@@ -1,104 +1,127 @@
 export const tokens = {
-  1: [
-    {
-      symbol: "ETH",
-      name: "Ethereum",
-      address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
-      decimals: 18,
-    },
-    {
-      symbol: "DAI",
-      name: "DAI Stable",
-      address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-      decimals: 18,
-    },
-    {
-      symbol: "USDC",
-      name: "USD Coin",
-      address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-      decimals: 6,
-    },
-    {
-      symbol: "USDT",
-      name: "Tether USD Coin",
-      address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
-      decimals: 6,
-    },
-    {
-      symbol: "WBTC",
-      name: "Wrapped BTC",
-      address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
-      decimals: 8,
-    },
-  ],
+  // 1: [
+  //   {
+  //     aliases: ['eth'],
+  //     symbol: "ETH",
+  //     name: "Ethereum",
+  //     address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
+  //     decimals: 18,
+  //   },
+  //   {
+  //     aliases: ['weth'],
+  //     symbol: "WETH",
+  //     name: "Wrapped Ethereum",
+  //     address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+  //     decimals: 18,
+  //   },
+  //   {
+  //     aliases: ['dai'],
+  //     symbol: "DAI",
+  //     name: "DAI Stable",
+  //     address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+  //     decimals: 18,
+  //   },
+  //   {
+  //     aliases: ['usdc'],
+  //     symbol: "USDC",
+  //     name: "USD Coin",
+  //     address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+  //     decimals: 6,
+  //   },
+  //   {
+  //     aliases: ['usdt'],
+  //     symbol: "USDT",
+  //     name: "Tether USD Coin",
+  //     address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+  //     decimals: 6,
+  //   },
+  //   {
+  //     aliases: ['wbtc'],
+  //     symbol: "WBTC",
+  //     name: "Wrapped BTC",
+  //     address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+  //     decimals: 8,
+  //   },
+  // ],
   137: [
     {
+      aliases: ['eth', 'weth'],
       symbol: "ETH",
       name: "Ethereum",
       address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
       decimals: 18,
     },
     {
+      aliases: ['dai'],
       symbol: "DAI",
       name: "DAI Stable",
       address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
       decimals: 18,
     },
     {
+      aliases: ['usdc'],
       symbol: "USDC",
       name: "USD Coin",
       address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
       decimals: 6,
     },
     {
+      aliases: ['usdt'],
       symbol: "USDT",
       name: "Tether USD Coin",
       address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
       decimals: 6,
     },
     {
+      aliases: ['wbtc'],
       symbol: "WBTC",
       name: "Wrapped BTC",
       address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
       decimals: 8,
     },
-    {
-      symbol: "AVAX",
-      name: "Avalanche Token",
-      address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
-      decimals: 18,
-    },
   ],
   43114: [
     {
+      aliases: ['eth', 'weth'],
       symbol: "ETH",
       name: "Ethereum",
       address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
       decimals: 18,
     },
     {
+      aliases: ['dai'],
       symbol: "DAI",
       name: "DAI Stable",
       address: "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
       decimals: 18,
     },
     {
+      aliases: ['usdc'],
       symbol: "USDC",
       name: "USD Coin",
       address: "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664",
       decimals: 6,
     },
     {
-      symbol: "USDT",
+      aliases: ['usdt'],
+      symbol: "USDt",
       name: "Tether USD Coin",
+      address: "0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7",
+      decimals: 6,
+    },
+    {
+      aliases: ['usdt'],
+      symbol: "USDT.e",
+      name: "Tether USD",
       address: "0xc7198437980c041c805A1EDcbA50c1Ce5db95118",
       decimals: 6,
     },
     {
+      aliases: ["wbtc"],
       symbol: "WBTC",
       name: "Wrapped BTC",
       address: "0x50b7545627a5162F82A992c33b87aDc75187B218",
       decimals: 8,
     },
   ],
-};
+} as Record<number, { aliases: string[], symbol: string, name: string, address: string, decimals: number }[]>;

package/src/db/models/transaction.ts

@@ -17,7 +17,7 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
 
     declare transactionHash: string;
     
-    declare action: string;
+    declare actionId: string;
     declare bridger: string;
     declare requestTransactionHash: string;
 
@@ -42,6 +42,7 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
     declare targetDelayUntil: CreationOptional<Date>;
 
     declare requestEvent: {
+        actionId: string;
         bridger: string;
         metadata: string;
         position: IPosition;
@@ -49,6 +50,16 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
         targetChainId: number;
     };
     declare requestSentEvent: CreationOptional<{
+        actionId: string;
+        bridger: string;
+        metadata: string;
+        position: IPosition;
+        sourceChainId: number;
+        targetChainId: number;
+        requestTransactionHash: string;
+    }>;
+    declare committedEvent: CreationOptional<{
+        actionId: string;
         bridger: string;
         metadata: string;
         position: IPosition;
@@ -56,12 +67,8 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
         targetChainId: number;
         requestTransactionHash: string;
     }>;
-    declare committedEvent: CreationOptional<any>;
     declare completedEvent: CreationOptional<any>;
 
-    declare position: any;
-    declare metadata: CreationOptional<any>;
-
     declare status: CreationOptional<string>;
 
     declare createdAt: CreationOptional<Date>;
@@ -79,7 +86,7 @@ Transaction.init({
     requestBlockNumber: DataTypes.NUMBER,
 
     transactionHash: DataTypes.STRING,
-    action: DataTypes.STRING,
+    actionId: DataTypes.STRING,
     bridger: DataTypes.STRING,
 
     sourceChainId: DataTypes.NUMBER,
@@ -129,9 +136,6 @@ Transaction.init({
     committedEvent: DataTypes.JSON,
     completedEvent: DataTypes.JSON,
 
-    position: DataTypes.JSON,
-    metadata: DataTypes.JSON,
-
     status: {
         type: DataTypes.STRING,
         defaultValue: 'pending'

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

@@ -5,37 +5,121 @@ import { Transaction } from "@/db";
 import { InteropXContract } from "@/typechain";
 import { ChainId } from "@/types";
 import { getContract, getRpcProviderUrl } from "@/utils";
-import { ethers } from "ethers";
+import { BigNumber, ethers } from "ethers";
 import { MetaTransaction, OperationType } from "ethers-multisend";
 
+
+const getBridgeAmounts = async (user: string, tokens: string[], chainId: ChainId) => {
+    const sourceChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(chainId));
+    const sourceWallet = new ethers.Wallet(config.privateKey, sourceChainProvider);
+    const contractAddress = addresses[chainId].interopXContract;
+    const contract = getContract<InteropXContract>(contractAddress, abi.interopXContract, sourceWallet);
+    const data = await contract.getBridgeAmounts(user, tokens);
+
+
+    return data.map((item, index) => ({
+        token: tokens[index],
+        deposit: item.deposit,
+        withdraw: item.withdraw,
+    }))
+}
+
 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 (transaction.actionId !== 'withdraw') {
+        throw new Error(`Invalid action: ${transaction.actionId}`)
     }
 
     if (type !== 'source') {
-        throw new Error(`Type not supported: ${type}`)
+        throw new Error(`[WIP] Type not supported: ${type}`)
+    }
+
+    if (transaction.sourceStatus === 'pending') {
+        throw Error('Source transaction already processesing')
     }
 
-    if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
-        throw Error('Cannot build data for pending withdraw transaction');
+    if (transaction.sourceStatus === 'pending') {
+        throw Error('Source transaction already processed')
     }
 
     if (!transaction.requestEvent) {
-        throw Error('Cannot build data for transaction without requestEvent');
+        throw Error('Something went wrong, source transaction has no request event')
     }
 
-    const { bridger, position, sourceChainId, targetChainId, metadata, } = transaction.requestEvent;
+    const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = transaction.requestEvent;
 
-    const sourceChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(targetChainId as ChainId));
+    const sourceChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(sourceChainId as ChainId));
     const sourceWallet = new ethers.Wallet(config.privateKey, sourceChainProvider);
     const contractAddress = addresses[sourceChainId].interopXContract;
     const contract = getContract<InteropXContract>(contractAddress, abi.interopXContract, sourceWallet);
 
+    const sourceToken = tokens[sourceChainId].find(t => t.address.toLowerCase() === position.withdraw[0].sourceToken.toLowerCase());
+
+    if (!sourceToken) {
+        throw Error('Source token not found')
+    }
+
+    const targetToken = tokens[targetChainId].find(t => t.address.toLowerCase() === position.withdraw[0].targetToken.toLowerCase());
+
+    if (!targetToken) {
+        throw Error('Target token not found')
+    }
+
+    if (!sourceToken.aliases.some(alias => targetToken.aliases.includes(alias))) {
+        throw Error('Source and target token must be the same')
+    }
+
+    const networks: ChainId[] = [137, 43114];
+    const networkUserData = {}
+    for (const network of networks) {
+        networkUserData[network] = await getBridgeAmounts(bridger, tokens[network].map(t => t.address), network)
+    }
+
+    for (const tokenSymbol of ["dai", "usdc", "usdt", "eth", "wbtc"]) {
+        let totalDeposit = BigNumber.from(0)
+        let totalWithdraw = BigNumber.from(0)
+
+        for (const network of networks) {
+            // on avax might we have 2 usdc/usdt tokens
+            const matchedTokens = tokens[network].filter(t => t.aliases.includes(tokenSymbol));
+
+            for (const matchedToken of matchedTokens) {
+                const data = networkUserData[network].find(t => t.token.toLowerCase() === matchedToken.address.toLowerCase());
+
+                if (data) {
+                    totalDeposit = totalDeposit.add(data.deposit)
+                    totalWithdraw = totalWithdraw.add(data.withdraw)
+                }
+            }
+
+            //  on Mainent add weth too
+            if (tokenSymbol === "eth" && network === 1) {
+                const weth = tokens[1].find(t => t.symbol === 'WETH');
+
+                if (weth) {
+                    const data = networkUserData[1].find(t => t.token.toLowerCase() === weth.address.toLowerCase());
+
+                    if (data) {
+                        totalDeposit = totalDeposit.add(data.deposit)
+                        totalWithdraw = totalWithdraw.add(data.withdraw)
+                    }
+                }
+            }
+
+            if (totalWithdraw.gt(totalDeposit)) {
+                throw Error(`if withdraw > deposit, user has debt and we can't process the withdraw and reject it`)
+            }
+
+            if (totalWithdraw.lt(totalDeposit)) {
+                throw Error('Something went wrong')
+            }
+        }
+    }
+
     const { data } = await contract.populateTransaction.withdrawRequested(
+        actionId,
         bridger,
         position.withdraw[0].sourceToken,
         position.withdraw[0].targetToken,

package/src/gnosis/index.ts

@@ -5,9 +5,9 @@ import actions from "./actions";
 export const buildGnosisAction = async (transaction: Transaction, type: 'source' | 'target') => {
     // type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
 
-    if (actions.hasOwnProperty(transaction.action)) {
+    if (actions.hasOwnProperty(transaction.actionId)) {
 
-        const { transactions, logs } = await actions[transaction.action](transaction, type);
+        const { transactions, logs } = await actions[transaction.actionId](transaction, type);
 
         return {
             data: encodeMulti(transactions).data,
@@ -15,5 +15,5 @@ export const buildGnosisAction = async (transaction: Transaction, type: 'source'
         };
     }
 
-    throw new Error(`Unknown action: ${transaction.action}`);
+    throw new Error(`Unknown action: ${transaction.actionId}`);
 }

package/src/tasks/InteropXContract/SyncBridgeCommittedEvents.ts

@@ -0,0 +1,125 @@
+import { BaseTask } from "../BaseTask";
+import Logger from '@/logger';
+import { ethers } from "ethers";
+import abi from "@/abi";
+import { Transaction } from "@/db";
+import { generateInteropTransactionHash, getContract, getRpcProviderUrl } from "@/utils";
+import { addresses } from "@/constants";
+import { ChainId } from "@/types";
+import config from "@/config";
+import { InteropXContract } from "@/typechain";
+import { Op } from "sequelize";
+
+class SyncBridgeCommittedEvents extends BaseTask {
+    contractAddress: string;
+    provider: ethers.providers.JsonRpcProvider;
+    contract: InteropXContract;
+    chainId: ChainId;
+
+    constructor({ chainId }: { chainId: ChainId }) {
+        super({
+            logger: new Logger("InteropXContract::SyncBridgeCommittedEvents"),
+        })
+        this.chainId = chainId;
+    }
+
+    async pollHandler() {
+        const currentBlock = await this.provider.getBlockNumber();
+
+        const events = await this.contract.queryFilter(
+            this.contract.filters.LogBridgeCommitted(),
+            currentBlock - 2000,
+            currentBlock,
+        );
+
+        let processedEvents = 0;
+
+        for (const event of events) {
+
+            try {
+                if (!event.args) {
+                    continue;
+                }
+
+                const { actionId, bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
+
+                const uniqueIdentifier = {
+                    actionId,
+                    bridger,
+                    requestTransactionHash,
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
+                }
+
+                let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
+
+                const transaction = await Transaction.findOne({
+                    where: {
+                        transactionHash,
+                        sourceStatus: 'success',
+                        committedEvent: {
+                            [Op.eq]: null,
+                        }
+                    }
+                });
+
+                if (!transaction) {
+                    continue;
+                }
+                transaction.targetStatus = 'success'
+                transaction.targetBlockNumber = event.blockNumber;
+                transaction.targetTransactionHash = event.transactionHash
+                transaction.committedEvent = {
+                    actionId,
+                    bridger,
+                    position: {
+                        withdraw: position.withdraw.map((v) => ({
+                            sourceToken: v.sourceToken,
+                            targetToken: v.targetToken,
+                            amount: v.amount.toString()
+                        })),
+                        supply: position.supply.map((v) => ({
+                            sourceToken: v.sourceToken,
+                            targetToken: v.targetToken,
+                            amount: v.amount.toString()
+                        })),
+                    },
+                    sourceChainId: sourceChainId,
+                    targetChainId: targetChainId,
+                    metadata,
+                    requestTransactionHash,
+                }
+
+                transaction.status = 'success';
+                await transaction.save()
+
+                this.logger.info(
+                    `New bridge committed received: ${transactionHash} `
+                );
+            } catch (error) {
+                this.logger.error(error);
+            }
+        }
+
+        if (processedEvents > 0)
+            this.logger.info(`${processedEvents} events processed`);
+    }
+
+    async start(): Promise<void> {
+        this.contractAddress = addresses[this.chainId].interopXContract;
+
+        this.provider = new ethers.providers.JsonRpcProvider(
+            getRpcProviderUrl(this.chainId)
+        );
+
+        this.contract = getContract<InteropXContract>(
+            this.contractAddress,
+            abi.interopXContract,
+            new ethers.Wallet(config.privateKey!, this.provider)
+        );
+
+        await super.start()
+    }
+}
+
+export default SyncBridgeCommittedEvents;

package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts

@@ -40,10 +40,10 @@ class SyncBridgeRequestEvents extends BaseTask {
                     continue;
                 }
 
-                const { bridger, position, sourceChainId, targetChainId, metadata } = event.args;
+                const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = event.args;
 
                 const uniqueIdentifier = {
-                    action: 'withdraw', //todo
+                    actionId,
                     bridger,
                     requestTransactionHash: event.transactionHash,
                     sourceChainId: sourceChainId.toNumber(),
@@ -61,10 +61,9 @@ class SyncBridgeRequestEvents extends BaseTask {
                 await Transaction.create({
                     transactionHash,
                     ...uniqueIdentifier,
-                    position,
-                    metadata,
                     requestBlockNumber: event.blockNumber,
                     requestEvent: {
+                        actionId,
                         bridger,
                         position: {
                             withdraw: position.withdraw.map((v) => ({

package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts

@@ -41,10 +41,10 @@ class SyncBridgeRequestSentEvents extends BaseTask {
                     continue;
                 }
 
-                const { bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
+                const { actionId, bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
 
                 const uniqueIdentifier = {
-                    action: 'withdraw',
+                    actionId,
                     bridger,
                     requestTransactionHash,
                     sourceChainId: sourceChainId,
@@ -55,8 +55,8 @@ class SyncBridgeRequestSentEvents extends BaseTask {
 
                 const transaction = await Transaction.findOne({
                     where: {
-                        transactionHash, sourceStatus: {
-                            [Op.ne]: 'success',
+                        transactionHash, requestSentEvent: {
+                            [Op.eq]: null,
                         }
                     }
                 });
@@ -68,6 +68,7 @@ class SyncBridgeRequestSentEvents extends BaseTask {
                 transaction.sourceBlockNumber = event.blockNumber;
                 transaction.sourceTransactionHash = event.transactionHash
                 transaction.requestSentEvent = {
+                    actionId,
                     bridger,
                     position: {
                         withdraw: position.withdraw.map((v) => ({

package/src/tasks/index.ts

@@ -8,6 +8,7 @@ import AutoUpdateTask from "./AutoUpdateTask";
 import SyncBridgeRequestEvents from "./InteropXContract/SyncBridgeRequestEvents";
 import ProccessBridgeRequestEvents from "./InteropXContract/ProcessBridgeRequestEvents";
 import SyncBridgeRequestSentEvents from "./InteropXContract/SyncBridgeRequestSentEvents";
+import SyncBridgeCommittedEvents from "./InteropXContract/SyncBridgeCommittedEvents";
 
 export class Tasks {
 
@@ -23,6 +24,9 @@ export class Tasks {
         new SyncBridgeRequestSentEvents({ chainId: 137 }),
         new SyncBridgeRequestSentEvents({ chainId: 43114 }),
 
+        new SyncBridgeCommittedEvents({ chainId: 137 }),
+        new SyncBridgeCommittedEvents({ chainId: 43114 }),
+
         new ProccessBridgeRequestEvents({ chainId: 137 }),
         new ProccessBridgeRequestEvents({ chainId: 43114 }),
     ];