@instadapp/interop-x 0.0.0-dev.14afa72 → 0.0.0-dev.1dc43c9

package/src/alias.ts

@@ -0,0 +1,6 @@
+import moduleAlias from 'module-alias';
+moduleAlias.addAliases({
+    "@": __dirname,
+})
+
+moduleAlias();

package/src/api/index.ts

@@ -21,7 +21,7 @@ export const startApiServer = async () => {
                 limit: 20,
                 offset: 0,
                 order: [
-                    ['createdAt', 'DESC']
+                    ['updatedAt', 'DESC']
                 ]
             })
         })

package/src/constants/addresses.ts

@@ -1,17 +1,12 @@
 export const addresses = {
-  1: {
-    gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
-    multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-    interopXGateway: '',
-  },
   137: {
     gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
     multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-    interopXGateway: '',
+    interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
   },
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-    interopXGateway: '0xF0317C5Bc206F2291dd2f3eE9C4cDB5Bbb25418d',
+    interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
   }
-}
+} as Record<number, { gnosisSafe: string, multisend: string, interopX: string }>

package/src/constants/index.ts

@@ -1,3 +1,2 @@
 export * from './addresses';
 export * from './tokens';
-export * from './itokens';

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

@@ -1,42 +1,64 @@
 import { sequelize } from '@/db/sequelize'
 import { CreationOptional, InferAttributes, InferCreationAttributes, Model, DataTypes } from 'sequelize';
 
+export interface IPositionTokenInfo {
+    amount: string;
+    sourceToken: string;
+    targetToken: string;
+}
+
+export interface IPosition {
+    supply: IPositionTokenInfo[];
+    withdraw: IPositionTokenInfo[];
+}
+
 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 vnonce: string;
+    declare actionId: string;
+    declare sourceSender: string;
 
+    declare submitChainId: number;
     declare submitTransactionHash: string;
     declare submitBlockNumber: number;
+    declare submitCreatedAt: Date;
 
     declare sourceChainId: number;
+    declare sourceDsaId: string;
     declare sourceTransactionHash: CreationOptional<string>;
     declare sourceBlockNumber: CreationOptional<number>;
-    declare sourceStatus: string;
+    declare sourceStatus: CreationOptional<string>;
     declare sourceErrors: CreationOptional<string[]>;
     declare sourceLogs: CreationOptional<any[]>;
     declare sourceCreatedAt: CreationOptional<Date>;
     declare sourceDelayUntil: CreationOptional<Date>;
 
     declare targetChainId: number;
+    declare targetDsaId: string;
     declare targetTransactionHash: CreationOptional<string>;
     declare targetBlockNumber: CreationOptional<number>;
-    declare targetStatus: string;
+    declare targetStatus: CreationOptional<string>;
     declare targetErrors: CreationOptional<string[]>;
     declare targetLogs: CreationOptional<any[]>;
     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 submitEvent: {
+        position: IPosition;
+        actionId: string;
+        actionIdHashHash: string;
+        sourceSender: string;
+        sourceDsaId: string;
+        targetDsaId: string;
+        sourceChainId: number;
+        targetChainId: number;
+        vnonce: string;
+        metadata: string;
+    };
+
+    declare status: CreationOptional<string>;
 
     declare createdAt: CreationOptional<Date>;
     declare updatedAt: CreationOptional<Date>;
@@ -49,19 +71,24 @@ Transaction.init({
         primaryKey: true
     },
 
-    submitTransactionHash: DataTypes.NUMBER,
-    submitBlockNumber: DataTypes.NUMBER,
-
     transactionHash: DataTypes.STRING,
-    action: DataTypes.STRING,
+    actionId: DataTypes.STRING,
+    vnonce: DataTypes.STRING,
+    sourceSender: DataTypes.STRING,
 
-    from: DataTypes.STRING,
-    to: DataTypes.STRING,
+    submitChainId: DataTypes.NUMBER,
+    submitTransactionHash: DataTypes.STRING,
+    submitBlockNumber: DataTypes.NUMBER,
+    submitCreatedAt: DataTypes.DATE,
 
     sourceChainId: DataTypes.NUMBER,
+    sourceDsaId: DataTypes.STRING,
     sourceTransactionHash: DataTypes.STRING,
     sourceBlockNumber: DataTypes.NUMBER,
-    sourceStatus: DataTypes.STRING,
+    sourceStatus: {
+        type: DataTypes.STRING,
+        defaultValue: 'pending'
+    },
     sourceErrors: {
         type: DataTypes.JSON,
         // defaultValue: [],
@@ -77,9 +104,13 @@ Transaction.init({
     sourceDelayUntil: DataTypes.STRING,
 
     targetChainId: DataTypes.NUMBER,
+    targetDsaId: DataTypes.STRING,
     targetTransactionHash: DataTypes.STRING,
     targetBlockNumber: DataTypes.NUMBER,
-    targetStatus: DataTypes.STRING,
+    targetStatus: {
+        type: DataTypes.STRING,
+        defaultValue: 'pending'
+    },
     targetErrors: {
         type: DataTypes.JSON,
         // defaultValue: [],
@@ -91,11 +122,10 @@ Transaction.init({
     targetCreatedAt: DataTypes.DATE,
     targetDelayUntil: DataTypes.DATE,
 
-    submitEvent: DataTypes.JSON,
-    sourceEvent: DataTypes.JSON,
-    targetEvent: DataTypes.JSON,
-
-    metadata: DataTypes.JSON,
+    submitEvent: {
+        type: DataTypes.JSON,
+        allowNull: false
+    },
 
     status: {
         type: DataTypes.STRING,

package/src/gnosis/actions/index.ts

@@ -1,7 +1,5 @@
-import deposit from "./deposit"
 import withdraw from "./withdraw"
 
 export default {
-    deposit,
     withdraw,
 }

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

@@ -0,0 +1,155 @@
+import abi from "@/abi";
+import config from "@/config";
+import { addresses, tokens } from "@/constants";
+import { Transaction } from "@/db";
+import { Erc20, InteropX } from "@/typechain";
+import { ChainId } from "@/types";
+import { getContract, getRpcProviderUrl, LiquidityError } from "@/utils";
+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].interopX;
+//     const contract = getContract<InteropX>(contractAddress, abi.interopX, 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.actionId !== 'withdraw') {
+    //     throw new Error(`Invalid action: ${transaction.actionId}`)
+    // }
+
+    // if (type !== 'source') {
+    //     throw new Error(`[WIP] Type not supported: ${type}`)
+    // }
+
+    // if (transaction.sourceStatus === 'pending') {
+    //     throw Error('Source transaction already processesing')
+    // }
+
+    // if (transaction.sourceStatus === 'pending') {
+    //     throw Error('Source transaction already processed')
+    // }
+
+    // if (!transaction.requestEvent) {
+    //     throw Error('Something went wrong, source transaction has no request event')
+    // }
+
+    // const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = transaction.requestEvent;
+
+    // const sourceChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(sourceChainId as ChainId));
+    // const sourceWallet = new ethers.Wallet(config.privateKey, sourceChainProvider);
+    // const contractAddress = addresses[sourceChainId].interopX;
+    // const contract = getContract<InteropX>(contractAddress, abi.interopX, 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')
+    //     }
+    // }
+
+    // let balance = BigNumber.from(0);
+
+    // if (position.withdraw[0].sourceToken.toLowerCase() === '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'.toLowerCase()) {
+    //     balance = await sourceChainProvider.getBalance(bridger);
+
+    // } else {
+    //     const erc20 = getContract<Erc20>(position.withdraw[0].sourceToken, abi.erc20, sourceChainProvider);
+    //     balance = await erc20.balanceOf(addresses[sourceChainId].gnosisSafe);
+    // }
+
+    // if (balance.lt(position.withdraw[0].amount)) {
+    //     throw new LiquidityError()
+    // }
+
+
+    // const { data } = await contract.populateTransaction.withdrawRequested(
+    //     actionId,
+    //     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/gnosis/index.ts

@@ -2,12 +2,12 @@ import { Transaction } from "@/db";
 import { encodeMulti } from "ethers-multisend";
 import actions from "./actions";
 
-export const buildGnosisAction = async (transaction: Transaction, type?: 'source' | 'target') => {
-    type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
+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/index.ts

@@ -1,23 +1,7 @@
-import moduleAlias from 'module-alias';
+import './alias'
 import expandHomeDir from "expand-home-dir";
 import fs from 'fs-extra'
-moduleAlias.addAliases({
-    "@/": __dirname + "/",
-    "@/logger": __dirname + "/logger",
-    "@/tasks": __dirname + "/tasks",
-    "@/gnosis": __dirname + "/gnosis",
-    "@/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 dotenv from "dotenv";
 import chalk from 'chalk';
 import { ethers } from "ethers";
@@ -105,7 +89,9 @@ async function main() {
 
     const tasks = new Tasks()
 
-    tasks.start();
+    setTimeout(() => {
+        tasks.start();
+    }, 10000)
 
     startApiServer()
 
@@ -130,10 +116,12 @@ async function main() {
         transaction.sourceStatus = payload.data.sourceStatus
         transaction.sourceTransactionHash = payload.data.sourceTransactionHash
         transaction.sourceErrors = payload.data.sourceErrors
+        transaction.sourceLogs = payload.data.sourceLogs
 
         transaction.targetStatus = payload.data.targetStatus
         transaction.targetTransactionHash = payload.data.targetTransactionHash
         transaction.targetErrors = payload.data.targetErrors
+        transaction.targetLogs = payload.data.targetLogs
 
         transaction.status = payload.data.status
 

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

@@ -26,6 +26,10 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
     }
 
     async response(data: ISignatureRequest): Promise<ISignatureResponse> {
+        console.log({
+            tag: 'SignatureDialProtocol',
+            data
+        })
         const signer = config.wallet;
 
         let transaction: Transaction | null;
@@ -50,9 +54,9 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
         const { data: gnosisData } = await buildGnosisAction(transaction, data.type);
 
         const signedData = await signGnosisSafeTx({
-            to: addresses[transaction.targetChainId].multisend,
+            to: addresses[transaction.sourceChainId].multisend,
             data: gnosisData,
-            chainId: transaction.targetChainId as ChainId,
+            chainId: transaction.sourceChainId as ChainId,
             safeTxGas: data.safeTxGas,
             nonce: data.safeNonce,
         }, { signer });

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

@@ -1,7 +1,7 @@
 import { BaseDialProtocol } from "./BaseDialProtocol";
 import { Transaction } from "@/db";
 
-export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'> | null> {
+export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs'  | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'> | null> {
     protected timeout = 30000;
 
     constructor(libp2p) {
@@ -20,10 +20,12 @@ export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick
             sourceStatus: transaction.sourceStatus,
             sourceTransactionHash: transaction.sourceTransactionHash,
             sourceErrors: transaction.sourceErrors,
+            sourceLogs: transaction.sourceLogs,
 
             targetStatus: transaction.targetStatus,
             targetTransactionHash: transaction.targetTransactionHash,
             targetErrors: transaction.targetErrors,
+            targetLogs: transaction.targetLogs,
 
             status: transaction.status,
         }