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

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.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
  */
@@ -101,9 +101,10 @@ 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),
     ]);
@@ -155,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.14afa72",
+  "version": "0.0.0-dev.1f933be",
   "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"
   },

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,
 }