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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (80) hide show
  1. package/dist/package.json +3 -3
  2. package/dist/src/abi/index.js +2 -4
  3. package/dist/src/abi/interopXContract.json +391 -0
  4. package/dist/src/alias.js +10 -0
  5. package/dist/src/api/index.js +4 -1
  6. package/dist/src/config/index.js +10 -1
  7. package/dist/src/constants/addresses.js +3 -3
  8. package/dist/src/constants/index.js +0 -1
  9. package/dist/src/db/models/transaction.js +27 -9
  10. package/dist/src/gnosis/actions/index.js +9 -0
  11. package/dist/src/gnosis/actions/withdraw/index.js +41 -0
  12. package/dist/src/gnosis/index.js +20 -0
  13. package/dist/src/index.js +39 -23
  14. package/dist/src/net/peer/index.js +2 -1
  15. package/dist/src/net/pool/index.js +7 -2
  16. package/dist/src/net/protocol/dial/SignatureDialProtocol.js +9 -10
  17. package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +30 -0
  18. package/dist/src/net/protocol/index.js +26 -5
  19. package/dist/src/tasks/AutoUpdateTask.js +33 -11
  20. package/dist/src/tasks/BaseTask.js +11 -3
  21. package/dist/src/tasks/{InteropXGateway/ProcessDepositEvents.js → InteropXContract/ProcessBridgeRequestEvents.js} +54 -52
  22. package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js +78 -0
  23. package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js +89 -0
  24. package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +55 -0
  25. package/dist/src/tasks/index.js +13 -17
  26. package/dist/src/typechain/{InteropBridgeToken.js → InteropXContract.js} +0 -0
  27. package/dist/src/typechain/factories/InteropXContract__factory.js +526 -0
  28. package/dist/src/typechain/factories/index.js +3 -5
  29. package/dist/src/typechain/index.js +3 -5
  30. package/dist/src/utils/index.js +27 -87
  31. package/package.json +3 -3
  32. package/src/abi/index.ts +2 -4
  33. package/src/abi/interopXContract.json +391 -0
  34. package/src/alias.ts +6 -0
  35. package/src/api/index.ts +4 -1
  36. package/src/config/index.ts +9 -1
  37. package/src/constants/addresses.ts +3 -3
  38. package/src/constants/index.ts +0 -1
  39. package/src/db/models/transaction.ts +66 -21
  40. package/src/gnosis/actions/index.ts +5 -0
  41. package/src/gnosis/actions/withdraw/index.ts +56 -0
  42. package/src/gnosis/index.ts +19 -0
  43. package/src/index.ts +52 -25
  44. package/src/net/peer/index.ts +2 -1
  45. package/src/net/pool/index.ts +7 -3
  46. package/src/net/protocol/dial/SignatureDialProtocol.ts +11 -13
  47. package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +33 -0
  48. package/src/net/protocol/index.ts +28 -6
  49. package/src/tasks/AutoUpdateTask.ts +36 -14
  50. package/src/tasks/BaseTask.ts +13 -3
  51. package/src/tasks/{InteropBridge/ProcessWithdrawEvents.ts → InteropXContract/ProcessBridgeRequestEvents.ts} +78 -95
  52. package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts +116 -0
  53. package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts +120 -0
  54. package/src/tasks/Transactions/SyncTransactionStatusTask.ts +67 -0
  55. package/src/tasks/index.ts +17 -18
  56. package/src/typechain/InteropXContract.ts +524 -0
  57. package/src/typechain/factories/InteropXContract__factory.ts +533 -0
  58. package/src/typechain/factories/index.ts +1 -2
  59. package/src/typechain/index.ts +2 -4
  60. package/src/utils/index.ts +61 -128
  61. package/tsconfig.json +7 -2
  62. package/dist/src/abi/interopBridgeToken.json +0 -286
  63. package/dist/src/abi/interopXGateway.json +0 -184
  64. package/dist/src/constants/itokens.js +0 -13
  65. package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +0 -147
  66. package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js +0 -70
  67. package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -75
  68. package/dist/src/typechain/InteropXGateway.js +0 -2
  69. package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -459
  70. package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
  71. package/src/abi/interopBridgeToken.json +0 -286
  72. package/src/abi/interopXGateway.json +0 -184
  73. package/src/constants/itokens.ts +0 -10
  74. package/src/tasks/InteropBridge/SyncWithdrawEvents.ts +0 -121
  75. package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +0 -245
  76. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -126
  77. package/src/typechain/InteropBridgeToken.ts +0 -686
  78. package/src/typechain/InteropXGateway.ts +0 -407
  79. package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -466
  80. package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.getContract = exports.buildWithdrawDataForTransaction = exports.buildDepositDataForTransaction = exports.buildDataForTransaction = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.http = void 0;
6
+ exports.generateGnosisTransaction = exports.getContract = exports.generateInteropTransactionHash = exports.asyncCallWithTimeout = exports.buildSignatureBytes = exports.getRpcProviderUrl = exports.signGnosisSafeTx = exports.short = exports.shortenHash = exports.http = void 0;
7
7
  /**
8
8
  * @module util
9
9
  */
@@ -11,11 +11,18 @@ const axios_1 = __importDefault(require("axios"));
11
11
  const axios_retry_1 = __importDefault(require("axios-retry"));
12
12
  const constants_1 = require("@/constants");
13
13
  const ethers_1 = require("ethers");
14
- const ethers_multisend_1 = require("ethers-multisend");
15
- const config_1 = __importDefault(require("@/config"));
16
- const abi_1 = __importDefault(require("@/abi"));
17
14
  exports.http = axios_1.default.create();
18
15
  (0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
16
+ function shortenHash(hash, length = 4) {
17
+ if (!hash)
18
+ return;
19
+ if (hash.length < 12)
20
+ return hash;
21
+ const beginningChars = hash.startsWith("0x") ? length + 2 : length;
22
+ const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
23
+ return shortened;
24
+ }
25
+ exports.shortenHash = shortenHash;
19
26
  function short(buffer) {
20
27
  return buffer.toString('hex').slice(0, 8) + '...';
21
28
  }
@@ -59,11 +66,11 @@ exports.signGnosisSafeTx = signGnosisSafeTx;
59
66
  const getRpcProviderUrl = (chainId) => {
60
67
  switch (chainId) {
61
68
  case 1:
62
- return 'https://rpc.instadapp.io/mainnet';
69
+ return 'https://rpc.ankr.com/eth';
63
70
  case 137:
64
- return 'https://rpc.instadapp.io/polygon';
71
+ return 'https://rpc.ankr.com/polygon';
65
72
  case 43114:
66
- return 'https://rpc.instadapp.io/avalanche';
73
+ return 'https://rpc.ankr.com/avalanche';
67
74
  default:
68
75
  throw new Error(`Unknown chainId: ${chainId}`);
69
76
  }
@@ -94,92 +101,15 @@ const asyncCallWithTimeout = async (asyncPromise, timeout) => {
94
101
  };
95
102
  exports.asyncCallWithTimeout = asyncCallWithTimeout;
96
103
  const generateInteropTransactionHash = (data) => {
97
- return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
104
+ return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string', 'string'], [
98
105
  String(data.action),
99
- String(data.submitTransactionHash),
106
+ String(data.bridger),
107
+ String(data.requestTransactionHash),
100
108
  String(data.sourceChainId),
101
109
  String(data.targetChainId),
102
110
  ]);
103
111
  };
104
112
  exports.generateInteropTransactionHash = generateInteropTransactionHash;
105
- const buildDataForTransaction = async (transaction, type) => {
106
- type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
107
- switch (transaction.action) {
108
- case "deposit":
109
- return await (0, exports.buildDepositDataForTransaction)(transaction, type);
110
- case "withdraw":
111
- return await (0, exports.buildWithdrawDataForTransaction)(transaction, type);
112
- default:
113
- throw new Error(`Unknown action: ${transaction.action}`);
114
- }
115
- };
116
- exports.buildDataForTransaction = buildDataForTransaction;
117
- const buildDepositDataForTransaction = async (transaction, type) => {
118
- const transactions = [];
119
- if (transaction.action !== 'deposit') {
120
- throw new Error(`Invalid action: ${transaction.action}`);
121
- }
122
- if (transaction.action === 'deposit' && transaction.sourceStatus === 'pending') {
123
- throw Error('Cannot build data for pending deposit transaction');
124
- }
125
- if (!transaction.submitEvent) {
126
- throw Error('Cannot build data for transaction without submitEvent');
127
- }
128
- const token = constants_1.tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
129
- if (!token) {
130
- throw Error('Cannot build data for transaction without token');
131
- }
132
- const itoken = constants_1.itokens[transaction.targetChainId].find(itoken => itoken.symbol.toLowerCase() === token.symbol.toLowerCase());
133
- if (!itoken) {
134
- throw Error('Cannot build data for transaction without itoken');
135
- }
136
- const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
137
- const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
138
- const interopBridgeContract = getContract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
139
- 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);
140
- transactions.push({
141
- to: itoken.address,
142
- data: data,
143
- value: '0',
144
- operation: ethers_multisend_1.OperationType.Call,
145
- });
146
- return (0, ethers_multisend_1.encodeMulti)(transactions).data;
147
- };
148
- exports.buildDepositDataForTransaction = buildDepositDataForTransaction;
149
- const buildWithdrawDataForTransaction = async (transaction, type) => {
150
- const transactions = [];
151
- if (transaction.action !== 'withdraw') {
152
- throw new Error(`Invalid action: ${transaction.action}`);
153
- }
154
- if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
155
- throw Error('Cannot build data for pending withdraw transaction');
156
- }
157
- if (!transaction.submitEvent) {
158
- throw Error('Cannot build data for transaction without submitEvent');
159
- }
160
- const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
161
- const itoken = constants_1.itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
162
- if (!itoken) {
163
- throw Error('Cannot build data for transaction without itoken');
164
- }
165
- const token = constants_1.tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
166
- if (!token) {
167
- throw Error('Cannot build data for transaction without token');
168
- }
169
- const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
170
- const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
171
- const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
172
- const interopBridgeContract = getContract(gatewayAddress, abi_1.default.interopXGateway, targetWallet);
173
- 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);
174
- transactions.push({
175
- to: gatewayAddress,
176
- data: data,
177
- value: '0',
178
- operation: ethers_multisend_1.OperationType.Call,
179
- });
180
- return (0, ethers_multisend_1.encodeMulti)(transactions).data;
181
- };
182
- exports.buildWithdrawDataForTransaction = buildWithdrawDataForTransaction;
183
113
  function getContract(address, contractInterface, signerOrProvider) {
184
114
  if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
185
115
  throw Error(`Invalid 'address' parameter '${address}'.`);
@@ -226,3 +156,13 @@ function getContract(address, contractInterface, signerOrProvider) {
226
156
  });
227
157
  }
228
158
  exports.getContract = getContract;
159
+ const generateGnosisTransaction = async (transactionData, safeContract) => {
160
+ console.log(transactionData);
161
+ 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));
162
+ while (isExecuted == 1) {
163
+ transactionData.safeTxGas = ethers_1.ethers.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
164
+ 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));
165
+ }
166
+ return transactionData;
167
+ };
168
+ exports.generateGnosisTransaction = generateGnosisTransaction;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instadapp/interop-x",
3
- "version": "0.0.0-dev.d05464a",
3
+ "version": "0.0.0-dev.d71f27e",
4
4
  "license": "MIT",
5
5
  "main": "dist/index.js",
6
6
  "engines": {
@@ -11,7 +11,7 @@
11
11
  "start": "yarn build && node bin/interop-x",
12
12
  "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",
13
13
  "dev": "yarn generate-abi-types && NODE_ENV=development nodemon",
14
- "generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
14
+ "generate-abi-types": "rimraf src/typechain && typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
15
15
  "prepublishOnly": "yarn build",
16
16
  "postinstall": "patch-package"
17
17
  },
@@ -28,7 +28,6 @@
28
28
  "await-spawn": "^4.0.2",
29
29
  "axios": "^0.27.1",
30
30
  "axios-retry": "^3.2.4",
31
- "bignumber.js": "^9.0.2",
32
31
  "chalk": "4.1.2",
33
32
  "dotenv": "^16.0.0",
34
33
  "ethereumjs-util": "^7.1.4",
@@ -36,6 +35,7 @@
36
35
  "ethers-multisend": "^2.1.1",
37
36
  "expand-home-dir": "^0.0.3",
38
37
  "fastify": "^3.28.0",
38
+ "fs-extra": "^10.1.0",
39
39
  "libp2p": "^0.36.2",
40
40
  "libp2p-bootstrap": "^0.14.0",
41
41
  "libp2p-kad-dht": "^0.28.6",
package/src/abi/index.ts CHANGED
@@ -1,11 +1,9 @@
1
1
  import gnosisSafe from "./gnosisSafe.json";
2
2
  import erc20 from "./erc20.json";
3
- import interopXGateway from "./interopXGateway.json";
4
- import interopBridgeToken from "./interopBridgeToken.json";
3
+ import interopXContract from "./interopXContract.json";
5
4
 
6
5
  export default {
7
6
  gnosisSafe,
8
7
  erc20,
9
- interopXGateway,
10
- interopBridgeToken,
8
+ interopXContract,
11
9
  }
@@ -0,0 +1,391 @@
1
+ [
2
+ {
3
+ "anonymous": false,
4
+ "inputs": [
5
+ {
6
+ "indexed": true,
7
+ "internalType": "address",
8
+ "name": "bridger",
9
+ "type": "address"
10
+ },
11
+ {
12
+ "components": [
13
+ {
14
+ "components": [
15
+ {
16
+ "internalType": "address",
17
+ "name": "sourceToken",
18
+ "type": "address"
19
+ },
20
+ {
21
+ "internalType": "address",
22
+ "name": "targetToken",
23
+ "type": "address"
24
+ },
25
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
26
+ ],
27
+ "internalType": "struct InteropXContractBeta.TokenInfo[]",
28
+ "name": "supply",
29
+ "type": "tuple[]"
30
+ },
31
+ {
32
+ "components": [
33
+ {
34
+ "internalType": "address",
35
+ "name": "sourceToken",
36
+ "type": "address"
37
+ },
38
+ {
39
+ "internalType": "address",
40
+ "name": "targetToken",
41
+ "type": "address"
42
+ },
43
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
44
+ ],
45
+ "internalType": "struct InteropXContractBeta.TokenInfo[]",
46
+ "name": "withdraw",
47
+ "type": "tuple[]"
48
+ }
49
+ ],
50
+ "indexed": false,
51
+ "internalType": "struct InteropXContractBeta.Position",
52
+ "name": "position",
53
+ "type": "tuple"
54
+ },
55
+ {
56
+ "indexed": true,
57
+ "internalType": "uint32",
58
+ "name": "sourceChainId",
59
+ "type": "uint32"
60
+ },
61
+ {
62
+ "indexed": false,
63
+ "internalType": "uint32",
64
+ "name": "targetChainId",
65
+ "type": "uint32"
66
+ },
67
+ {
68
+ "indexed": true,
69
+ "internalType": "bytes32",
70
+ "name": "requestTransactionHash",
71
+ "type": "bytes32"
72
+ },
73
+ {
74
+ "indexed": false,
75
+ "internalType": "bytes",
76
+ "name": "metadata",
77
+ "type": "bytes"
78
+ }
79
+ ],
80
+ "name": "LogBridgeCommitted",
81
+ "type": "event"
82
+ },
83
+ {
84
+ "anonymous": false,
85
+ "inputs": [
86
+ {
87
+ "indexed": true,
88
+ "internalType": "address",
89
+ "name": "bridger",
90
+ "type": "address"
91
+ },
92
+ {
93
+ "components": [
94
+ {
95
+ "components": [
96
+ {
97
+ "internalType": "address",
98
+ "name": "sourceToken",
99
+ "type": "address"
100
+ },
101
+ {
102
+ "internalType": "address",
103
+ "name": "targetToken",
104
+ "type": "address"
105
+ },
106
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
107
+ ],
108
+ "internalType": "struct InteropXContractBeta.TokenInfo[]",
109
+ "name": "supply",
110
+ "type": "tuple[]"
111
+ },
112
+ {
113
+ "components": [
114
+ {
115
+ "internalType": "address",
116
+ "name": "sourceToken",
117
+ "type": "address"
118
+ },
119
+ {
120
+ "internalType": "address",
121
+ "name": "targetToken",
122
+ "type": "address"
123
+ },
124
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
125
+ ],
126
+ "internalType": "struct InteropXContractBeta.TokenInfo[]",
127
+ "name": "withdraw",
128
+ "type": "tuple[]"
129
+ }
130
+ ],
131
+ "indexed": false,
132
+ "internalType": "struct InteropXContractBeta.Position",
133
+ "name": "position",
134
+ "type": "tuple"
135
+ },
136
+ {
137
+ "indexed": false,
138
+ "internalType": "uint256",
139
+ "name": "sourceChainId",
140
+ "type": "uint256"
141
+ },
142
+ {
143
+ "indexed": true,
144
+ "internalType": "uint256",
145
+ "name": "targetChainId",
146
+ "type": "uint256"
147
+ },
148
+ {
149
+ "indexed": true,
150
+ "internalType": "bytes32",
151
+ "name": "requestTransactionHash",
152
+ "type": "bytes32"
153
+ },
154
+ {
155
+ "indexed": false,
156
+ "internalType": "bytes32",
157
+ "name": "targetCommittedTransactionHash",
158
+ "type": "bytes32"
159
+ },
160
+ {
161
+ "indexed": false,
162
+ "internalType": "bytes",
163
+ "name": "metadata",
164
+ "type": "bytes"
165
+ }
166
+ ],
167
+ "name": "LogBridgeCompleted",
168
+ "type": "event"
169
+ },
170
+ {
171
+ "anonymous": false,
172
+ "inputs": [
173
+ {
174
+ "indexed": true,
175
+ "internalType": "address",
176
+ "name": "bridger",
177
+ "type": "address"
178
+ },
179
+ {
180
+ "components": [
181
+ {
182
+ "components": [
183
+ {
184
+ "internalType": "address",
185
+ "name": "sourceToken",
186
+ "type": "address"
187
+ },
188
+ {
189
+ "internalType": "address",
190
+ "name": "targetToken",
191
+ "type": "address"
192
+ },
193
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
194
+ ],
195
+ "internalType": "struct InteropXContractBeta.TokenInfo[]",
196
+ "name": "supply",
197
+ "type": "tuple[]"
198
+ },
199
+ {
200
+ "components": [
201
+ {
202
+ "internalType": "address",
203
+ "name": "sourceToken",
204
+ "type": "address"
205
+ },
206
+ {
207
+ "internalType": "address",
208
+ "name": "targetToken",
209
+ "type": "address"
210
+ },
211
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
212
+ ],
213
+ "internalType": "struct InteropXContractBeta.TokenInfo[]",
214
+ "name": "withdraw",
215
+ "type": "tuple[]"
216
+ }
217
+ ],
218
+ "indexed": false,
219
+ "internalType": "struct InteropXContractBeta.Position",
220
+ "name": "position",
221
+ "type": "tuple"
222
+ },
223
+ {
224
+ "indexed": false,
225
+ "internalType": "uint256",
226
+ "name": "sourceChainId",
227
+ "type": "uint256"
228
+ },
229
+ {
230
+ "indexed": true,
231
+ "internalType": "uint256",
232
+ "name": "targetChainId",
233
+ "type": "uint256"
234
+ },
235
+ {
236
+ "indexed": false,
237
+ "internalType": "bytes",
238
+ "name": "metadata",
239
+ "type": "bytes"
240
+ }
241
+ ],
242
+ "name": "LogBridgeRequest",
243
+ "type": "event"
244
+ },
245
+ {
246
+ "anonymous": false,
247
+ "inputs": [
248
+ {
249
+ "indexed": true,
250
+ "internalType": "address",
251
+ "name": "bridger",
252
+ "type": "address"
253
+ },
254
+ {
255
+ "components": [
256
+ {
257
+ "components": [
258
+ {
259
+ "internalType": "address",
260
+ "name": "sourceToken",
261
+ "type": "address"
262
+ },
263
+ {
264
+ "internalType": "address",
265
+ "name": "targetToken",
266
+ "type": "address"
267
+ },
268
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
269
+ ],
270
+ "internalType": "struct InteropXContractBeta.TokenInfo[]",
271
+ "name": "supply",
272
+ "type": "tuple[]"
273
+ },
274
+ {
275
+ "components": [
276
+ {
277
+ "internalType": "address",
278
+ "name": "sourceToken",
279
+ "type": "address"
280
+ },
281
+ {
282
+ "internalType": "address",
283
+ "name": "targetToken",
284
+ "type": "address"
285
+ },
286
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
287
+ ],
288
+ "internalType": "struct InteropXContractBeta.TokenInfo[]",
289
+ "name": "withdraw",
290
+ "type": "tuple[]"
291
+ }
292
+ ],
293
+ "indexed": false,
294
+ "internalType": "struct InteropXContractBeta.Position",
295
+ "name": "position",
296
+ "type": "tuple"
297
+ },
298
+ {
299
+ "indexed": false,
300
+ "internalType": "uint32",
301
+ "name": "sourceChainId",
302
+ "type": "uint32"
303
+ },
304
+ {
305
+ "indexed": true,
306
+ "internalType": "uint32",
307
+ "name": "targetChainId",
308
+ "type": "uint32"
309
+ },
310
+ {
311
+ "indexed": true,
312
+ "internalType": "bytes32",
313
+ "name": "requestTransactionHash",
314
+ "type": "bytes32"
315
+ },
316
+ {
317
+ "indexed": false,
318
+ "internalType": "bytes",
319
+ "name": "metadata",
320
+ "type": "bytes"
321
+ }
322
+ ],
323
+ "name": "LogBridgeRequestSent",
324
+ "type": "event"
325
+ },
326
+ {
327
+ "inputs": [],
328
+ "name": "_vnonce",
329
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
330
+ "stateMutability": "view",
331
+ "type": "function"
332
+ },
333
+ {
334
+ "inputs": [
335
+ { "internalType": "address", "name": "to_", "type": "address" },
336
+ { "internalType": "address", "name": "sourceToken_", "type": "address" },
337
+ { "internalType": "address", "name": "targetToken_", "type": "address" },
338
+ { "internalType": "uint256", "name": "amount_", "type": "uint256" },
339
+ { "internalType": "uint32", "name": "targetChainId_", "type": "uint32" },
340
+ {
341
+ "internalType": "bytes32",
342
+ "name": "transactionHash_",
343
+ "type": "bytes32"
344
+ },
345
+ { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
346
+ ],
347
+ "name": "completeBridge",
348
+ "outputs": [],
349
+ "stateMutability": "nonpayable",
350
+ "type": "function"
351
+ },
352
+ {
353
+ "inputs": [
354
+ { "internalType": "address", "name": "sourceToken_", "type": "address" },
355
+ { "internalType": "address", "name": "targetToken_", "type": "address" },
356
+ { "internalType": "uint256", "name": "amount_", "type": "uint256" },
357
+ { "internalType": "uint32", "name": "targetChainId_", "type": "uint32" },
358
+ { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
359
+ ],
360
+ "name": "requestWithdraw",
361
+ "outputs": [],
362
+ "stateMutability": "nonpayable",
363
+ "type": "function"
364
+ },
365
+ {
366
+ "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
367
+ "name": "whitelistedMapping",
368
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
369
+ "stateMutability": "view",
370
+ "type": "function"
371
+ },
372
+ {
373
+ "inputs": [
374
+ { "internalType": "address", "name": "user_", "type": "address" },
375
+ { "internalType": "address", "name": "sourceToken_", "type": "address" },
376
+ { "internalType": "address", "name": "targetToken_", "type": "address" },
377
+ { "internalType": "uint256", "name": "amount_", "type": "uint256" },
378
+ { "internalType": "uint32", "name": "chainId_", "type": "uint32" },
379
+ {
380
+ "internalType": "bytes32",
381
+ "name": "transactionHash_",
382
+ "type": "bytes32"
383
+ },
384
+ { "internalType": "bytes", "name": "metadata_", "type": "bytes" }
385
+ ],
386
+ "name": "withdrawRequested",
387
+ "outputs": [],
388
+ "stateMutability": "nonpayable",
389
+ "type": "function"
390
+ }
391
+ ]
package/src/alias.ts ADDED
@@ -0,0 +1,6 @@
1
+ import moduleAlias from 'module-alias';
2
+ moduleAlias.addAliases({
3
+ "@": __dirname,
4
+ })
5
+
6
+ moduleAlias();
package/src/api/index.ts CHANGED
@@ -20,6 +20,9 @@ export const startApiServer = async () => {
20
20
  return await Transaction.findAndCountAll({
21
21
  limit: 20,
22
22
  offset: 0,
23
+ order: [
24
+ ['createdAt', 'DESC']
25
+ ]
23
26
  })
24
27
  })
25
28
 
@@ -27,7 +30,7 @@ export const startApiServer = async () => {
27
30
 
28
31
  logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
29
32
  } catch (err) {
30
- logger.error(err)
33
+ logger.error(err.message)
31
34
  process.exit(1)
32
35
  }
33
36
  }
@@ -1,5 +1,7 @@
1
1
  import { ethers, Wallet } from "ethers"
2
2
  import { EventBus, EventBusType } from "@/types"
3
+ import fs from 'fs-extra'
4
+ import expandHomeDir from "expand-home-dir";
3
5
 
4
6
  class Config {
5
7
  public readonly events: EventBusType
@@ -9,15 +11,17 @@ class Config {
9
11
  public readonly wallet: Wallet
10
12
  public readonly staging: boolean
11
13
  public readonly autoUpdate: boolean
14
+ public readonly baseConfigPath: string
12
15
 
13
16
  constructor() {
14
17
  this.events = new EventBus() as EventBusType
15
- this.maxPeers = 10
18
+ this.maxPeers = 20
16
19
  this.privateKey = process.env.PRIVATE_KEY as string;
17
20
  this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
18
21
  this.autoUpdate = !! process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
19
22
  this.wallet = new Wallet(this.privateKey);
20
23
  this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
24
+ this.baseConfigPath = expandHomeDir(`~/.interop-x`);
21
25
  }
22
26
 
23
27
  get publicAddress(){
@@ -27,6 +31,10 @@ class Config {
27
31
  isLeadNode() {
28
32
  return ethers.utils.getAddress(this.leadNodeAddress) === ethers.utils.getAddress(this.wallet.address)
29
33
  }
34
+
35
+ isMaintenanceMode(){
36
+ return fs.existsSync(this.baseConfigPath + '/maintenance')
37
+ }
30
38
  }
31
39
 
32
40
  export default new Config()
@@ -2,16 +2,16 @@ export const addresses = {
2
2
  1: {
3
3
  gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
4
4
  multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
5
- interopXGateway: '',
5
+ interopXContract: '',
6
6
  },
7
7
  137: {
8
8
  gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
9
9
  multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
10
- interopXGateway: '',
10
+ interopXContract: '0x2189741c8cAc1cf51570932817A7d6390646C80e',
11
11
  },
12
12
  43114: {
13
13
  gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
14
14
  multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
15
- interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
15
+ interopXContract: '0x1867DF97Ec24bb0bbD4AD464F0Be9C6713422EAE',
16
16
  }
17
17
  }