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

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.getContract = exports.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
+exports.generateGnosisTransaction = exports.getContract = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
 /**
  * @module util
  */
@@ -11,11 +11,18 @@ 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 shortenHash(hash, length = 4) {
+    if (!hash)
+        return;
+    if (hash.length < 12)
+        return hash;
+    const beginningChars = hash.startsWith("0x") ? length + 2 : length;
+    const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
+    return shortened;
+}
+exports.shortenHash = shortenHash;
 function short(buffer) {
     return buffer.toString('hex').slice(0, 8) + '...';
 }
@@ -59,11 +66,11 @@ exports.signGnosisSafeTx = signGnosisSafeTx;
 const getRpcProviderUrl = (chainId) => {
     switch (chainId) {
         case 1:
-            return 'https://rpc.instadapp.io/mainnet';
+            return 'https://rpc.ankr.com/eth';
         case 137:
-            return 'https://rpc.instadapp.io/polygon';
+            return 'https://rpc.ankr.com/polygon';
         case 43114:
-            return 'https://rpc.instadapp.io/avalanche';
+            return 'https://rpc.ankr.com/avalanche';
         default:
             throw new Error(`Unknown chainId: ${chainId}`);
     }
@@ -94,97 +101,25 @@ const asyncCallWithTimeout = async (asyncPromise, timeout) => {
 };
 exports.asyncCallWithTimeout = asyncCallWithTimeout;
 const generateInteropTransactionHash = (data) => {
-    return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
+    return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string', 'string'], [
         String(data.action),
-        String(data.submitTransactionHash),
+        String(data.bridger),
+        String(data.requestTransactionHash),
         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, 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);
+    // Make sure the contract properties is writable
+    const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
+    if (!desc || desc.writable !== true) {
+        return contract;
+    }
     return new Proxy(contract, {
         get(target, prop, receiver) {
             const value = Reflect.get(target, prop, receiver);
@@ -221,3 +156,13 @@ function getContract(address, contractInterface, signerOrProvider) {
     });
 }
 exports.getContract = getContract;
+const generateGnosisTransaction = async (transactionData, safeContract) => {
+    console.log(transactionData);
+    let isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
+    while (isExecuted == 1) {
+        transactionData.safeTxGas = ethers_1.ethers.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
+        isExecuted = await safeContract.dataHashes(await safeContract.getTransactionHash(transactionData.to, transactionData.value, transactionData.data, transactionData.operation, transactionData.safeTxGas, transactionData.baseGas, transactionData.gasPrice, transactionData.gasToken, transactionData.refundReceiver, transactionData.nonce));
+    }
+    return transactionData;
+};
+exports.generateGnosisTransaction = generateGnosisTransaction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.a8594f9",
+  "version": "0.0.0-dev.a861339",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -11,7 +11,7 @@
     "start": "yarn build && node bin/interop-x",
     "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'",
+    "generate-abi-types": "rimraf src/typechain && typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
     "prepublishOnly": "yarn build",
     "postinstall": "patch-package"
   },
@@ -24,9 +24,10 @@
   },
   "dependencies": {
     "@achingbrain/libp2p-gossipsub": "^0.12.2",
+    "@fastify/cors": "^7.0.0",
+    "await-spawn": "^4.0.2",
     "axios": "^0.27.1",
     "axios-retry": "^3.2.4",
-    "bignumber.js": "^9.0.2",
     "chalk": "4.1.2",
     "dotenv": "^16.0.0",
     "ethereumjs-util": "^7.1.4",
@@ -34,7 +35,7 @@
     "ethers-multisend": "^2.1.1",
     "expand-home-dir": "^0.0.3",
     "fastify": "^3.28.0",
-    "fastify-cors": "^6.0.3",
+    "fs-extra": "^10.1.0",
     "libp2p": "^0.36.2",
     "libp2p-bootstrap": "^0.14.0",
     "libp2p-kad-dht": "^0.28.6",
@@ -46,6 +47,8 @@
     "libp2p-websockets": "^0.16.2",
     "luxon": "^2.3.2",
     "module-alias": "^2.2.2",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0",
     "sequelize": "6.18.0",
     "sqlite3": "^5.0.5",
     "waait": "^1.0.5"
@@ -60,8 +63,6 @@
     "@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/src/abi/index.ts

@@ -1,11 +1,9 @@
 import gnosisSafe from "./gnosisSafe.json";
 import erc20 from "./erc20.json";
-import interopXGateway from "./interopXGateway.json";
-import interopBridgeToken from "./interopBridgeToken.json";
+import interopXContract from "./interopXContract.json";
 
 export default {
     gnosisSafe,
     erc20,
-    interopXGateway,
-    interopBridgeToken,
+    interopXContract,
 }

package/src/abi/interopXContract.json

@@ -0,0 +1,391 @@
+[
+  {
+    "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/alias.ts

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

package/src/api/index.ts

@@ -1,5 +1,5 @@
 import fastify from "fastify"
-import cors from 'fastify-cors'
+import cors from '@fastify/cors'
 import Logger from "@/logger"
 import { Transaction } from "@/db";
 
@@ -20,6 +20,9 @@ export const startApiServer = async () => {
             return await Transaction.findAndCountAll({
                 limit: 20,
                 offset: 0,
+                order: [
+                    ['createdAt', 'DESC']
+                ]
             })
         })
 
@@ -27,7 +30,7 @@ export const startApiServer = async () => {
 
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
     } catch (err) {
-        logger.error(err)
+        logger.error(err.message)
         process.exit(1)
     }
 }