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

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

@@ -0,0 +1,526 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InteropXContract__factory = void 0;
+const ethers_1 = require("ethers");
+const _abi = [
+    {
+        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",
+    },
+];
+class InteropXContract__factory {
+    static createInterface() {
+        return new ethers_1.utils.Interface(_abi);
+    }
+    static connect(address, signerOrProvider) {
+        return new ethers_1.Contract(address, _abi, signerOrProvider);
+    }
+}
+exports.InteropXContract__factory = InteropXContract__factory;
+InteropXContract__factory.abi = _abi;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InteropXGateway__factory = exports.InteropBridgeToken__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
+exports.InteropXContract__factory = exports.GnosisSafe__factory = exports.Erc20__factory = void 0;
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
@@ -8,7 +8,5 @@ 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; } });
+var InteropXContract__factory_1 = require("./InteropXContract__factory");
+Object.defineProperty(exports, "InteropXContract__factory", { enumerable: true, get: function () { return InteropXContract__factory_1.InteropXContract__factory; } });

package/dist/src/typechain/index.js

@@ -23,13 +23,11 @@ var __importStar = (this && this.__importStar) || function (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.InteropXContract__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; } });
+var InteropXContract__factory_1 = require("./factories/InteropXContract__factory");
+Object.defineProperty(exports, "InteropXContract__factory", { enumerable: true, get: function () { return InteropXContract__factory_1.InteropXContract__factory; } });

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.shortenHash = 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,9 +11,6 @@ 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) {
@@ -104,92 +101,15 @@ 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, 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}'.`);
@@ -236,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;