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

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@instadapp/interop-x",
-    "version": "0.0.0-dev.d71f27e",
+    "version": "0.0.0-dev.e33810b",
     "license": "MIT",
     "main": "dist/index.js",
     "engines": {
@@ -25,16 +25,17 @@
     "dependencies": {
         "@achingbrain/libp2p-gossipsub": "^0.12.2",
         "@fastify/cors": "^7.0.0",
+        "async-retry": "^1.3.3",
         "await-spawn": "^4.0.2",
-        "axios": "^0.27.1",
-        "axios-retry": "^3.2.4",
+        "axios": "^0.27.2",
+        "axios-retry": "^3.2.5",
         "chalk": "4.1.2",
-        "dotenv": "^16.0.0",
+        "dotenv": "^16.0.1",
         "ethereumjs-util": "^7.1.4",
-        "ethers": "^5.6.4",
+        "ethers": "^5.6.5",
         "ethers-multisend": "^2.1.1",
         "expand-home-dir": "^0.0.3",
-        "fastify": "^3.28.0",
+        "fastify": "^3.29.0",
         "fs-extra": "^10.1.0",
         "libp2p": "^0.36.2",
         "libp2p-bootstrap": "^0.14.0",
@@ -45,12 +46,12 @@
         "libp2p-pubsub-peer-discovery": "^4.0.0",
         "libp2p-tcp": "^0.17.2",
         "libp2p-websockets": "^0.16.2",
-        "luxon": "^2.3.2",
+        "luxon": "^2.4.0",
         "module-alias": "^2.2.2",
         "patch-package": "^6.4.7",
         "postinstall-postinstall": "^2.1.0",
         "sequelize": "6.18.0",
-        "sqlite3": "^5.0.5",
+        "sqlite3": "^5.0.8",
         "waait": "^1.0.5"
     },
     "bin": {
@@ -61,13 +62,13 @@
         "@typechain/ethers-v5": "^10.0.0",
         "@types/bn.js": "^5.1.0",
         "@types/fs-extra": "^9.0.13",
-        "@types/node": "^17.0.17",
-        "nodemon": "^2.0.15",
+        "@types/node": "^17.0.33",
+        "nodemon": "^2.0.16",
         "replace-in-file": "^6.3.2",
         "rimraf": "^3.0.2",
         "ts-node": "^10.5.0",
         "tsconfig-paths": "^3.12.0",
         "typechain": "^8.0.0",
-        "typescript": "^4.5.5"
+        "typescript": "^4.6.4"
     }
 }

package/dist/src/abi/interopXContract.json

@@ -2,6 +2,12 @@
     {
         "anonymous": false,
         "inputs": [
+            {
+                "indexed": false,
+                "internalType": "string",
+                "name": "actionId",
+                "type": "string"
+            },
             {
                 "indexed": true,
                 "internalType": "address",
@@ -83,6 +89,12 @@
     {
         "anonymous": false,
         "inputs": [
+            {
+                "indexed": false,
+                "internalType": "string",
+                "name": "actionId",
+                "type": "string"
+            },
             {
                 "indexed": true,
                 "internalType": "address",
@@ -170,6 +182,12 @@
     {
         "anonymous": false,
         "inputs": [
+            {
+                "indexed": false,
+                "internalType": "string",
+                "name": "actionId",
+                "type": "string"
+            },
             {
                 "indexed": true,
                 "internalType": "address",
@@ -245,6 +263,12 @@
     {
         "anonymous": false,
         "inputs": [
+            {
+                "indexed": false,
+                "internalType": "string",
+                "name": "actionId",
+                "type": "string"
+            },
             {
                 "indexed": true,
                 "internalType": "address",
@@ -323,20 +347,14 @@
         "name": "LogBridgeRequestSent",
         "type": "event"
     },
-    {
-        "inputs": [],
-        "name": "_vnonce",
-        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-        "stateMutability": "view",
-        "type": "function"
-    },
     {
         "inputs": [
+            { "internalType": "string", "name": "actionId", "type": "string" },
             { "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": "uint32", "name": "sourceChainId_", "type": "uint32" },
             {
                 "internalType": "bytes32",
                 "name": "transactionHash_",
@@ -351,6 +369,27 @@
     },
     {
         "inputs": [
+            { "internalType": "address", "name": "user", "type": "address" },
+            { "internalType": "address[]", "name": "tokens", "type": "address[]" }
+        ],
+        "name": "getBridgeAmounts",
+        "outputs": [
+            {
+                "components": [
+                    { "internalType": "uint256", "name": "deposit", "type": "uint256" },
+                    { "internalType": "uint256", "name": "withdraw", "type": "uint256" }
+                ],
+                "internalType": "struct InteropXContractBeta.UserData[]",
+                "name": "userData",
+                "type": "tuple[]"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "string", "name": "actionId", "type": "string" },
             { "internalType": "address", "name": "sourceToken_", "type": "address" },
             { "internalType": "address", "name": "targetToken_", "type": "address" },
             { "internalType": "uint256", "name": "amount_", "type": "uint256" },
@@ -362,15 +401,39 @@
         "stateMutability": "nonpayable",
         "type": "function"
     },
+    {
+        "inputs": [
+            { "internalType": "address", "name": "token", "type": "address" },
+            { "internalType": "bool", "name": "toggle", "type": "bool" }
+        ],
+        "name": "toggleWhitelist",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            { "internalType": "address", "name": "", "type": "address" },
+            { "internalType": "address", "name": "", "type": "address" }
+        ],
+        "name": "userMapping",
+        "outputs": [
+            { "internalType": "uint256", "name": "deposit", "type": "uint256" },
+            { "internalType": "uint256", "name": "withdraw", "type": "uint256" }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
     {
         "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
-        "name": "whitelistedMapping",
-        "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+        "name": "whitelistedTokens",
+        "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
         "stateMutability": "view",
         "type": "function"
     },
     {
         "inputs": [
+            { "internalType": "string", "name": "actionId", "type": "string" },
             { "internalType": "address", "name": "user_", "type": "address" },
             { "internalType": "address", "name": "sourceToken_", "type": "address" },
             { "internalType": "address", "name": "targetToken_", "type": "address" },

package/dist/src/constants/addresses.js

@@ -10,11 +10,11 @@ exports.addresses = {
     137: {
         gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
         multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-        interopXContract: '0x2189741c8cAc1cf51570932817A7d6390646C80e',
+        interopXContract: '0x41bd77583674B3a5c073FBb4922C0C8dA91C43cF',
     },
     43114: {
         gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
         multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-        interopXContract: '0x1867DF97Ec24bb0bbD4AD464F0Be9C6713422EAE',
+        interopXContract: '0xCF391A3057eDba541c80307aC5E3Bc1E4a9471b7',
     }
 };

package/dist/src/constants/tokens.js

@@ -4,30 +4,42 @@ exports.tokens = void 0;
 exports.tokens = {
     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",
@@ -36,36 +48,42 @@ exports.tokens = {
     ],
     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,
         },
         {
+            aliases: ['avax'],
             symbol: "AVAX",
             name: "Avalanche Token",
             address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
@@ -74,30 +92,42 @@ exports.tokens = {
     ],
     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",

package/dist/src/db/models/transaction.js

@@ -15,7 +15,7 @@ Transaction.init({
     requestTransactionHash: sequelize_2.DataTypes.NUMBER,
     requestBlockNumber: sequelize_2.DataTypes.NUMBER,
     transactionHash: sequelize_2.DataTypes.STRING,
-    action: sequelize_2.DataTypes.STRING,
+    actionId: sequelize_2.DataTypes.STRING,
     bridger: sequelize_2.DataTypes.STRING,
     sourceChainId: sequelize_2.DataTypes.NUMBER,
     sourceTransactionHash: sequelize_2.DataTypes.STRING,
@@ -61,8 +61,6 @@ Transaction.init({
     requestSentEvent: sequelize_2.DataTypes.JSON,
     committedEvent: sequelize_2.DataTypes.JSON,
     completedEvent: sequelize_2.DataTypes.JSON,
-    position: sequelize_2.DataTypes.JSON,
-    metadata: sequelize_2.DataTypes.JSON,
     status: {
         type: sequelize_2.DataTypes.STRING,
         defaultValue: 'pending'

package/dist/src/gnosis/actions/withdraw/index.js

@@ -12,24 +12,38 @@ const ethers_multisend_1 = require("ethers-multisend");
 async function default_1(transaction, type) {
     const transactions = [];
     const logs = [];
-    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.action === 'withdraw' && transaction.sourceStatus === 'pending') {
-        throw Error('Cannot build data for pending withdraw transaction');
+    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('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_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(targetChainId));
     const sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, sourceChainProvider);
     const contractAddress = constants_1.addresses[sourceChainId].interopXContract;
     const contract = (0, utils_1.getContract)(contractAddress, abi_1.default.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);
+    const sourceToken = constants_1.tokens[sourceChainId].find(t => t.address.toLowerCase() === position.withdraw[0].sourceToken.toLowerCase());
+    if (!sourceToken) {
+        throw Error('Source token not found');
+    }
+    const targetToken = constants_1.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 { 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,

package/dist/src/gnosis/index.js

@@ -8,13 +8,13 @@ const ethers_multisend_1 = require("ethers-multisend");
 const actions_1 = __importDefault(require("./actions"));
 const buildGnosisAction = async (transaction, type) => {
     // type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
-    if (actions_1.default.hasOwnProperty(transaction.action)) {
-        const { transactions, logs } = await actions_1.default[transaction.action](transaction, type);
+    if (actions_1.default.hasOwnProperty(transaction.actionId)) {
+        const { transactions, logs } = await actions_1.default[transaction.actionId](transaction, type);
         return {
             data: (0, ethers_multisend_1.encodeMulti)(transactions).data,
             logs
         };
     }
-    throw new Error(`Unknown action: ${transaction.action}`);
+    throw new Error(`Unknown action: ${transaction.actionId}`);
 };
 exports.buildGnosisAction = buildGnosisAction;

package/dist/src/index.js

@@ -13,7 +13,7 @@ const package_json_1 = __importDefault(require("../package.json"));
 dotenv_1.default.config();
 const logger_1 = __importDefault(require("@/logger"));
 const logger = new logger_1.default('Process');
-const GIT_SHORT_HASH = 'd71f27e';
+const GIT_SHORT_HASH = 'e33810b';
 const printUsage = () => {
     console.log();
     console.log(`Interop X Node (v${package_json_1.default.version} - rev.${GIT_SHORT_HASH})`);

package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js

@@ -27,9 +27,9 @@ class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
                 if (!event.args) {
                     continue;
                 }
-                const { bridger, position, sourceChainId, targetChainId, metadata } = event.args;
+                const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = event.args;
                 const uniqueIdentifier = {
-                    action: 'withdraw',
+                    actionId,
                     bridger,
                     requestTransactionHash: event.transactionHash,
                     sourceChainId: sourceChainId.toNumber(),
@@ -40,8 +40,8 @@ class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
                 if (transaction) {
                     continue;
                 }
-                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { position,
-                    metadata, requestBlockNumber: event.blockNumber, requestEvent: {
+                await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { requestBlockNumber: event.blockNumber, requestEvent: {
+                        actionId,
                         bridger,
                         position: {
                             withdraw: position.withdraw.map((v) => ({

package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js

@@ -28,9 +28,9 @@ class SyncBridgeRequestSentEvents extends BaseTask_1.BaseTask {
                 if (!event.args) {
                     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,
@@ -51,6 +51,7 @@ class SyncBridgeRequestSentEvents extends BaseTask_1.BaseTask {
                 transaction.sourceBlockNumber = event.blockNumber;
                 transaction.sourceTransactionHash = event.transactionHash;
                 transaction.requestSentEvent = {
+                    actionId,
                     bridger,
                     position: {
                         withdraw: position.withdraw.map((v) => ({