@instadapp/interop-x 0.0.0-dev.75809ae → 0.0.0-dev.79c1ae5

package/dist/src/typechain/factories/index.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InteropXGateway__factory = exports.InteropBridgeToken__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+var Erc20__factory_1 = require("./Erc20__factory");
+Object.defineProperty(exports, "Erc20__factory", { enumerable: true, get: function () { return Erc20__factory_1.Erc20__factory; } });
+var GnosisSafe__factory_1 = require("./GnosisSafe__factory");
+Object.defineProperty(exports, "GnosisSafe__factory", { enumerable: true, get: function () { return GnosisSafe__factory_1.GnosisSafe__factory; } });
+var InteropBridgeToken__factory_1 = require("./InteropBridgeToken__factory");
+Object.defineProperty(exports, "InteropBridgeToken__factory", { enumerable: true, get: function () { return InteropBridgeToken__factory_1.InteropBridgeToken__factory; } });
+var InteropXGateway__factory_1 = require("./InteropXGateway__factory");
+Object.defineProperty(exports, "InteropXGateway__factory", { enumerable: true, get: function () { return InteropXGateway__factory_1.InteropXGateway__factory; } });

package/dist/src/typechain/index.js

@@ -0,0 +1,35 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InteropXGateway__factory = exports.InteropBridgeToken__factory = exports.GnosisSafe__factory = exports.Erc20__factory = exports.factories = void 0;
+exports.factories = __importStar(require("./factories"));
+var Erc20__factory_1 = require("./factories/Erc20__factory");
+Object.defineProperty(exports, "Erc20__factory", { enumerable: true, get: function () { return Erc20__factory_1.Erc20__factory; } });
+var GnosisSafe__factory_1 = require("./factories/GnosisSafe__factory");
+Object.defineProperty(exports, "GnosisSafe__factory", { enumerable: true, get: function () { return GnosisSafe__factory_1.GnosisSafe__factory; } });
+var InteropBridgeToken__factory_1 = require("./factories/InteropBridgeToken__factory");
+Object.defineProperty(exports, "InteropBridgeToken__factory", { enumerable: true, get: function () { return InteropBridgeToken__factory_1.InteropBridgeToken__factory; } });
+var InteropXGateway__factory_1 = require("./factories/InteropXGateway__factory");
+Object.defineProperty(exports, "InteropXGateway__factory", { enumerable: true, get: function () { return InteropXGateway__factory_1.InteropXGateway__factory; } });

package/dist/src/utils/index.js

@@ -0,0 +1,228 @@
+"use strict";
+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;
+/**
+ * @module util
+ */
+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 short(buffer) {
+    return buffer.toString('hex').slice(0, 8) + '...';
+}
+exports.short = short;
+const signGnosisSafeTx = async ({ to, data = null, value = '0', operation = '1', baseGas = '0', gasPrice = "0", gasToken = "0x0000000000000000000000000000000000000000", refundReceiver = "0x0000000000000000000000000000000000000000", safeTxGas = "79668", nonce = "0", chainId = 137, }, { signer }) => {
+    const gnosisSafe = constants_1.addresses[chainId].gnosisSafe;
+    const domain = {
+        verifyingContract: gnosisSafe,
+        chainId,
+    };
+    const types = {
+        SafeTx: [
+            { type: 'address', name: 'to' },
+            { type: 'uint256', name: 'value' },
+            { type: 'bytes', name: 'data' },
+            { type: 'uint8', name: 'operation' },
+            { type: 'uint256', name: 'safeTxGas' },
+            { type: 'uint256', name: 'baseGas' },
+            { type: 'uint256', name: 'gasPrice' },
+            { type: 'address', name: 'gasToken' },
+            { type: 'address', name: 'refundReceiver' },
+            { type: 'uint256', name: 'nonce' },
+        ],
+    };
+    const message = {
+        baseGas,
+        data,
+        gasPrice,
+        gasToken,
+        nonce: Number(nonce),
+        operation,
+        refundReceiver,
+        safeAddress: gnosisSafe,
+        safeTxGas: String(safeTxGas),
+        to,
+        value,
+    };
+    return await signer._signTypedData(domain, types, message);
+};
+exports.signGnosisSafeTx = signGnosisSafeTx;
+const getRpcProviderUrl = (chainId) => {
+    switch (chainId) {
+        case 1:
+            return 'https://rpc.instadapp.io/mainnet';
+        case 137:
+            return 'https://rpc.instadapp.io/polygon';
+        case 43114:
+            return 'https://rpc.instadapp.io/avalanche';
+        default:
+            throw new Error(`Unknown chainId: ${chainId}`);
+    }
+};
+exports.getRpcProviderUrl = getRpcProviderUrl;
+const buildSignatureBytes = (signatures) => {
+    signatures.sort((left, right) => left.signer.toLowerCase().localeCompare(right.signer.toLowerCase()));
+    let signatureBytes = "0x";
+    for (const sig of signatures) {
+        signatureBytes += sig.data.slice(2);
+    }
+    return signatureBytes;
+};
+exports.buildSignatureBytes = buildSignatureBytes;
+/**
+ * Call an async function with a maximum time limit (in milliseconds) for the timeout
+ *  Resolved promise for async function call, or an error if time limit reached
+ */
+const asyncCallWithTimeout = async (asyncPromise, timeout) => {
+    let timeoutHandle;
+    const timeoutPromise = new Promise((_resolve, reject) => {
+        timeoutHandle = setTimeout(() => reject(new Error('Async call timeout limit reached')), timeout);
+    });
+    return Promise.race([asyncPromise, timeoutPromise]).then(result => {
+        clearTimeout(timeoutHandle);
+        return result;
+    });
+};
+exports.asyncCallWithTimeout = asyncCallWithTimeout;
+const generateInteropTransactionHash = (data) => {
+    return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
+        String(data.action),
+        String(data.submitTransactionHash),
+        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, itoken: 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.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);
+            if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
+                return async (...args) => {
+                    try {
+                        return await value.bind(contract)(...args);
+                    }
+                    catch (error) {
+                        throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
+                    }
+                };
+            }
+            if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
+                const parentProp = String(prop);
+                return new Proxy(value, {
+                    get(target, prop, receiver) {
+                        const value = Reflect.get(target, prop, receiver);
+                        if (typeof value === 'function') {
+                            return async (...args) => {
+                                try {
+                                    return await value.bind(contract)(...args);
+                                }
+                                catch (error) {
+                                    throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
+                                }
+                            };
+                        }
+                    }
+                });
+            }
+            return value;
+        },
+    });
+}
+exports.getContract = getContract;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.75809ae",
+  "version": "0.0.0-dev.79c1ae5",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -9,9 +9,11 @@
   },
   "scripts": {
     "start": "yarn build && node bin/interop-x",
-    "build": "export GIT_REF=$(git rev-parse --short HEAD) && rimraf ./dist && tsc -p tsconfig.json && replace-in-file '@GIT_SHORT_HASH@' $GIT_REF ./dist/src/**/*.js",
-    "dev": "NODE_ENV=development nodemon",
-    "prepublishOnly": "yarn build"
+    "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'",
+    "prepublishOnly": "yarn build",
+    "postinstall": "patch-package"
   },
   "nodemonConfig": {
     "watch": [
@@ -22,6 +24,7 @@
   },
   "dependencies": {
     "@achingbrain/libp2p-gossipsub": "^0.12.2",
+    "await-spawn": "^4.0.2",
     "axios": "^0.27.1",
     "axios-retry": "^3.2.4",
     "bignumber.js": "^9.0.2",
@@ -30,6 +33,9 @@
     "ethereumjs-util": "^7.1.4",
     "ethers": "^5.6.4",
     "ethers-multisend": "^2.1.1",
+    "expand-home-dir": "^0.0.3",
+    "fastify": "^3.28.0",
+    "fastify-cors": "^6.0.3",
     "libp2p": "^0.36.2",
     "libp2p-bootstrap": "^0.14.0",
     "libp2p-kad-dht": "^0.28.6",
@@ -40,13 +46,20 @@
     "libp2p-tcp": "^0.17.2",
     "libp2p-websockets": "^0.16.2",
     "luxon": "^2.3.2",
-    "sequelize": "^6.19.0",
+    "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"
   },
   "bin": {
-    "interop-node": "bin/interop-x"
+    "interop-x": "bin/interop-x",
+    "interopx": "bin/interop-x"
   },
   "devDependencies": {
+    "@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",
@@ -54,6 +67,7 @@
     "rimraf": "^3.0.2",
     "ts-node": "^10.5.0",
     "tsconfig-paths": "^3.12.0",
+    "typechain": "^8.0.0",
     "typescript": "^4.5.5"
   }
 }

package/patches/@ethersproject+properties+5.6.0.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@ethersproject/properties/lib/index.js b/node_modules/@ethersproject/properties/lib/index.js
+index 41e0b52..4c7a9e3 100644
+--- a/node_modules/@ethersproject/properties/lib/index.js
++++ b/node_modules/@ethersproject/properties/lib/index.js
+@@ -44,7 +44,7 @@ function defineReadOnly(object, name, value) {
+     Object.defineProperty(object, name, {
+         enumerable: true,
+         value: value,
+-        writable: false,
++        writable: true,
+     });
+ }
+ exports.defineReadOnly = defineReadOnly;