@instadapp/interop-x 0.0.0-dev.0b0cc3f → 0.0.0-dev.285d847

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 (71) hide show
  1. package/.env.example +2 -1
  2. package/bin/interop-x +1 -1
  3. package/dist/package.json +72 -0
  4. package/dist/{abi → src/abi}/erc20.json +0 -0
  5. package/dist/{abi → src/abi}/gnosisSafe.json +0 -0
  6. package/dist/{abi → src/abi}/index.js +0 -0
  7. package/dist/{abi → src/abi}/interopBridgeToken.json +0 -0
  8. package/dist/{abi → src/abi}/interopXGateway.json +0 -0
  9. package/dist/src/api/index.js +33 -0
  10. package/dist/{config → src/config}/index.js +5 -0
  11. package/dist/{constants → src/constants}/addresses.js +0 -8
  12. package/dist/{constants → src/constants}/index.js +2 -0
  13. package/dist/src/constants/itokens.js +13 -0
  14. package/dist/src/constants/tokens.js +107 -0
  15. package/dist/{db → src/db}/index.js +0 -0
  16. package/dist/{db → src/db}/models/index.js +0 -0
  17. package/dist/{db → src/db}/models/transaction.js +3 -1
  18. package/dist/{db → src/db}/sequelize.js +2 -1
  19. package/dist/src/index.js +102 -0
  20. package/dist/{logger → src/logger}/index.js +0 -0
  21. package/dist/{net → src/net}/index.js +0 -0
  22. package/dist/{net → src/net}/peer/index.js +6 -2
  23. package/dist/{net → src/net}/pool/index.js +27 -9
  24. package/dist/{net → src/net}/protocol/dial/BaseDialProtocol.js +0 -0
  25. package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js +22 -12
  26. package/dist/{net → src/net}/protocol/index.js +30 -1
  27. package/dist/src/tasks/AutoUpdateTask.js +44 -0
  28. package/dist/{tasks → src/tasks}/BaseTask.js +1 -1
  29. package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +147 -0
  30. package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js +70 -0
  31. package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +150 -0
  32. package/dist/{tasks → src/tasks}/InteropXGateway/SyncDepositEvents.js +16 -20
  33. package/dist/{tasks → src/tasks}/index.js +15 -0
  34. package/dist/{typechain → src/typechain}/Erc20.js +0 -0
  35. package/dist/{typechain → src/typechain}/GnosisSafe.js +0 -0
  36. package/dist/{typechain → src/typechain}/InteropBridgeToken.js +0 -0
  37. package/dist/{typechain → src/typechain}/InteropXGateway.js +0 -0
  38. package/dist/{typechain → src/typechain}/common.js +0 -0
  39. package/dist/{typechain → src/typechain}/factories/Erc20__factory.js +0 -0
  40. package/dist/{typechain → src/typechain}/factories/GnosisSafe__factory.js +0 -0
  41. package/dist/{typechain → src/typechain}/factories/InteropBridgeToken__factory.js +0 -0
  42. package/dist/{typechain → src/typechain}/factories/InteropXGateway__factory.js +0 -0
  43. package/dist/{typechain → src/typechain}/factories/index.js +0 -0
  44. package/dist/{typechain → src/typechain}/index.js +0 -0
  45. package/dist/{types.js → src/types.js} +0 -0
  46. package/dist/src/utils/index.js +228 -0
  47. package/package.json +10 -17
  48. package/patches/@ethersproject+properties+5.6.0.patch +13 -0
  49. package/src/api/index.ts +33 -0
  50. package/src/config/index.ts +8 -0
  51. package/src/constants/addresses.ts +0 -8
  52. package/src/constants/index.ts +2 -0
  53. package/src/constants/itokens.ts +10 -0
  54. package/src/constants/tokens.ts +104 -0
  55. package/src/db/models/transaction.ts +8 -4
  56. package/src/db/sequelize.ts +2 -1
  57. package/src/index.ts +77 -6
  58. package/src/net/peer/index.ts +7 -6
  59. package/src/net/pool/index.ts +37 -11
  60. package/src/net/protocol/dial/SignatureDialProtocol.ts +25 -13
  61. package/src/net/protocol/index.ts +45 -1
  62. package/src/tasks/AutoUpdateTask.ts +54 -0
  63. package/src/tasks/BaseTask.ts +1 -1
  64. package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts +233 -0
  65. package/src/tasks/InteropBridge/SyncWithdrawEvents.ts +121 -0
  66. package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +245 -0
  67. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +23 -11
  68. package/src/tasks/index.ts +22 -2
  69. package/src/utils/index.ts +182 -4
  70. package/dist/index.js +0 -43
  71. package/dist/utils/index.js +0 -101
@@ -0,0 +1,228 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
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;
7
+ /**
8
+ * @module util
9
+ */
10
+ const axios_1 = __importDefault(require("axios"));
11
+ const axios_retry_1 = __importDefault(require("axios-retry"));
12
+ const constants_1 = require("@/constants");
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
+ exports.http = axios_1.default.create();
18
+ (0, axios_retry_1.default)(exports.http, { retries: 3, retryDelay: axios_retry_1.default.exponentialDelay });
19
+ function short(buffer) {
20
+ return buffer.toString('hex').slice(0, 8) + '...';
21
+ }
22
+ exports.short = short;
23
+ 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 }) => {
24
+ const gnosisSafe = constants_1.addresses[chainId].gnosisSafe;
25
+ const domain = {
26
+ verifyingContract: gnosisSafe,
27
+ chainId,
28
+ };
29
+ const types = {
30
+ SafeTx: [
31
+ { type: 'address', name: 'to' },
32
+ { type: 'uint256', name: 'value' },
33
+ { type: 'bytes', name: 'data' },
34
+ { type: 'uint8', name: 'operation' },
35
+ { type: 'uint256', name: 'safeTxGas' },
36
+ { type: 'uint256', name: 'baseGas' },
37
+ { type: 'uint256', name: 'gasPrice' },
38
+ { type: 'address', name: 'gasToken' },
39
+ { type: 'address', name: 'refundReceiver' },
40
+ { type: 'uint256', name: 'nonce' },
41
+ ],
42
+ };
43
+ const message = {
44
+ baseGas,
45
+ data,
46
+ gasPrice,
47
+ gasToken,
48
+ nonce: Number(nonce),
49
+ operation,
50
+ refundReceiver,
51
+ safeAddress: gnosisSafe,
52
+ safeTxGas: String(safeTxGas),
53
+ to,
54
+ value,
55
+ };
56
+ return await signer._signTypedData(domain, types, message);
57
+ };
58
+ exports.signGnosisSafeTx = signGnosisSafeTx;
59
+ const getRpcProviderUrl = (chainId) => {
60
+ switch (chainId) {
61
+ case 1:
62
+ return 'https://rpc.instadapp.io/mainnet';
63
+ case 137:
64
+ return 'https://rpc.instadapp.io/polygon';
65
+ case 43114:
66
+ return 'https://rpc.instadapp.io/avalanche';
67
+ default:
68
+ throw new Error(`Unknown chainId: ${chainId}`);
69
+ }
70
+ };
71
+ exports.getRpcProviderUrl = getRpcProviderUrl;
72
+ const buildSignatureBytes = (signatures) => {
73
+ signatures.sort((left, right) => left.signer.toLowerCase().localeCompare(right.signer.toLowerCase()));
74
+ let signatureBytes = "0x";
75
+ for (const sig of signatures) {
76
+ signatureBytes += sig.data.slice(2);
77
+ }
78
+ return signatureBytes;
79
+ };
80
+ exports.buildSignatureBytes = buildSignatureBytes;
81
+ /**
82
+ * Call an async function with a maximum time limit (in milliseconds) for the timeout
83
+ * Resolved promise for async function call, or an error if time limit reached
84
+ */
85
+ const asyncCallWithTimeout = async (asyncPromise, timeout) => {
86
+ let timeoutHandle;
87
+ const timeoutPromise = new Promise((_resolve, reject) => {
88
+ timeoutHandle = setTimeout(() => reject(new Error('Async call timeout limit reached')), timeout);
89
+ });
90
+ return Promise.race([asyncPromise, timeoutPromise]).then(result => {
91
+ clearTimeout(timeoutHandle);
92
+ return result;
93
+ });
94
+ };
95
+ exports.asyncCallWithTimeout = asyncCallWithTimeout;
96
+ const generateInteropTransactionHash = (data) => {
97
+ return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
98
+ String(data.action),
99
+ String(data.submitTransactionHash),
100
+ String(data.sourceChainId),
101
+ String(data.targetChainId),
102
+ ]);
103
+ };
104
+ 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
+ function getContract(address, contractInterface, signerOrProvider) {
184
+ if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
185
+ throw Error(`Invalid 'address' parameter '${address}'.`);
186
+ }
187
+ const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
188
+ // Make sure the contract properties is writable
189
+ const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
190
+ if (!desc || desc.writable !== true) {
191
+ return contract;
192
+ }
193
+ return new Proxy(contract, {
194
+ get(target, prop, receiver) {
195
+ const value = Reflect.get(target, prop, receiver);
196
+ if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
197
+ return async (...args) => {
198
+ try {
199
+ return await value.bind(contract)(...args);
200
+ }
201
+ catch (error) {
202
+ throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
203
+ }
204
+ };
205
+ }
206
+ if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
207
+ const parentProp = String(prop);
208
+ return new Proxy(value, {
209
+ get(target, prop, receiver) {
210
+ const value = Reflect.get(target, prop, receiver);
211
+ if (typeof value === 'function') {
212
+ return async (...args) => {
213
+ try {
214
+ return await value.bind(contract)(...args);
215
+ }
216
+ catch (error) {
217
+ throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
218
+ }
219
+ };
220
+ }
221
+ }
222
+ });
223
+ }
224
+ return value;
225
+ },
226
+ });
227
+ }
228
+ exports.getContract = getContract;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@instadapp/interop-x",
3
- "version": "0.0.0-dev.0b0cc3f",
3
+ "version": "0.0.0-dev.285d847",
4
4
  "license": "MIT",
5
5
  "main": "dist/index.js",
6
6
  "engines": {
@@ -12,7 +12,8 @@
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
14
  "generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
15
- "prepublishOnly": "yarn build"
15
+ "prepublishOnly": "yarn build",
16
+ "postinstall": "patch-package"
16
17
  },
17
18
  "nodemonConfig": {
18
19
  "watch": [
@@ -32,6 +33,8 @@
32
33
  "ethers": "^5.6.4",
33
34
  "ethers-multisend": "^2.1.1",
34
35
  "expand-home-dir": "^0.0.3",
36
+ "fastify": "^3.28.0",
37
+ "fastify-cors": "^6.0.3",
35
38
  "libp2p": "^0.36.2",
36
39
  "libp2p-bootstrap": "^0.14.0",
37
40
  "libp2p-kad-dht": "^0.28.6",
@@ -43,12 +46,15 @@
43
46
  "libp2p-websockets": "^0.16.2",
44
47
  "luxon": "^2.3.2",
45
48
  "module-alias": "^2.2.2",
46
- "sequelize": "^6.19.0",
49
+ "patch-package": "^6.4.7",
50
+ "postinstall-postinstall": "^2.1.0",
51
+ "sequelize": "6.18.0",
47
52
  "sqlite3": "^5.0.5",
48
53
  "waait": "^1.0.5"
49
54
  },
50
55
  "bin": {
51
- "interop-node": "bin/interop-x"
56
+ "interop-x": "bin/interop-x",
57
+ "interopx": "bin/interop-x"
52
58
  },
53
59
  "devDependencies": {
54
60
  "@typechain/ethers-v5": "^10.0.0",
@@ -62,18 +68,5 @@
62
68
  "tsconfig-paths": "^3.12.0",
63
69
  "typechain": "^8.0.0",
64
70
  "typescript": "^4.5.5"
65
- },
66
- "_moduleAliases": {
67
- "@/": "./dist",
68
- "@/logger": "./dist/logger",
69
- "@/tasks": "./dist/tasks",
70
- "@/utils": "./dist/utils",
71
- "@/net": "./dist/net",
72
- "@/db": "./dist/db",
73
- "@/config": "./dist/config",
74
- "@/types": "./dist/types",
75
- "@/abi": "./dist/abi",
76
- "@/constants": "./dist/constants",
77
- "@/typechain": "./dist/typechain"
78
71
  }
79
72
  }
@@ -0,0 +1,13 @@
1
+ diff --git a/node_modules/@ethersproject/properties/lib/index.js b/node_modules/@ethersproject/properties/lib/index.js
2
+ index 41e0b52..4c7a9e3 100644
3
+ --- a/node_modules/@ethersproject/properties/lib/index.js
4
+ +++ b/node_modules/@ethersproject/properties/lib/index.js
5
+ @@ -44,7 +44,7 @@ function defineReadOnly(object, name, value) {
6
+ Object.defineProperty(object, name, {
7
+ enumerable: true,
8
+ value: value,
9
+ - writable: false,
10
+ + writable: true,
11
+ });
12
+ }
13
+ exports.defineReadOnly = defineReadOnly;
@@ -0,0 +1,33 @@
1
+ import fastify from "fastify"
2
+ import cors from 'fastify-cors'
3
+ import Logger from "@/logger"
4
+ import { Transaction } from "@/db";
5
+
6
+ const logger = new Logger("RPC");
7
+
8
+
9
+ const server = fastify({ logger: false })
10
+
11
+ server.register(cors, {})
12
+
13
+ server.get('/', async () => 'Interop X API')
14
+
15
+ export const startApiServer = async () => {
16
+ const HOST = process.env.API_HOST || '0.0.0.0';
17
+ const PORT = process.env.API_PORT || '8080';
18
+ try {
19
+ server.get('/transactions', async (req) => {
20
+ return await Transaction.findAndCountAll({
21
+ limit: 20,
22
+ offset: 0,
23
+ })
24
+ })
25
+
26
+ await server.listen(PORT, HOST)
27
+
28
+ logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
29
+ } catch (err) {
30
+ logger.error(err)
31
+ process.exit(1)
32
+ }
33
+ }
@@ -7,15 +7,23 @@ class Config {
7
7
  public readonly leadNodeAddress: string
8
8
  public readonly privateKey: string
9
9
  public readonly wallet: Wallet
10
+ public readonly staging: boolean
11
+ public readonly autoUpdate: boolean
10
12
 
11
13
  constructor() {
12
14
  this.events = new EventBus() as EventBusType
13
15
  this.maxPeers = 10
14
16
  this.privateKey = process.env.PRIVATE_KEY as string;
17
+ this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
18
+ this.autoUpdate = !! process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
15
19
  this.wallet = new Wallet(this.privateKey);
16
20
  this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
17
21
  }
18
22
 
23
+ get publicAddress(){
24
+ return this.wallet.address
25
+ }
26
+
19
27
  isLeadNode() {
20
28
  return ethers.utils.getAddress(this.leadNodeAddress) === ethers.utils.getAddress(this.wallet.address)
21
29
  }
@@ -3,23 +3,15 @@ export const addresses = {
3
3
  gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
4
4
  multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
5
5
  interopXGateway: '',
6
- interopBridgeTokens: [],
7
6
  },
8
7
  137: {
9
8
  gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
10
9
  multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
11
10
  interopXGateway: '',
12
- interopBridgeTokens: [
13
- {
14
- address: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
15
- symbol : 'USDC',
16
- }
17
- ],
18
11
  },
19
12
  43114: {
20
13
  gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
21
14
  multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
22
15
  interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
23
- interopBridgeTokens: [],
24
16
  }
25
17
  }
@@ -1 +1,3 @@
1
1
  export * from './addresses';
2
+ export * from './tokens';
3
+ export * from './itokens';
@@ -0,0 +1,10 @@
1
+ export const itokens = {
2
+ 1: [],
3
+ 137: [
4
+ {
5
+ address: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
6
+ symbol: 'USDC',
7
+ }
8
+ ],
9
+ 43114: []
10
+ };
@@ -0,0 +1,104 @@
1
+ export const tokens = {
2
+ 1: [
3
+ {
4
+ symbol: "ETH",
5
+ name: "Ethereum",
6
+ address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
7
+ decimals: 18,
8
+ },
9
+ {
10
+ symbol: "DAI",
11
+ name: "DAI Stable",
12
+ address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
13
+ decimals: 18,
14
+ },
15
+ {
16
+ symbol: "USDC",
17
+ name: "USD Coin",
18
+ address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
19
+ decimals: 6,
20
+ },
21
+ {
22
+ symbol: "USDT",
23
+ name: "Tether USD Coin",
24
+ address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
25
+ decimals: 6,
26
+ },
27
+ {
28
+ symbol: "WBTC",
29
+ name: "Wrapped BTC",
30
+ address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
31
+ decimals: 8,
32
+ },
33
+ ],
34
+ 137: [
35
+ {
36
+ symbol: "ETH",
37
+ name: "Ethereum",
38
+ address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
39
+ decimals: 18,
40
+ },
41
+ {
42
+ symbol: "DAI",
43
+ name: "DAI Stable",
44
+ address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
45
+ decimals: 18,
46
+ },
47
+ {
48
+ symbol: "USDC",
49
+ name: "USD Coin",
50
+ address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
51
+ decimals: 6,
52
+ },
53
+ {
54
+ symbol: "USDT",
55
+ name: "Tether USD Coin",
56
+ address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
57
+ decimals: 6,
58
+ },
59
+ {
60
+ symbol: "WBTC",
61
+ name: "Wrapped BTC",
62
+ address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
63
+ decimals: 8,
64
+ },
65
+ {
66
+ symbol: "AVAX",
67
+ name: "Avalanche Token",
68
+ address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
69
+ decimals: 18,
70
+ },
71
+ ],
72
+ 43114: [
73
+ {
74
+ symbol: "ETH",
75
+ name: "Ethereum",
76
+ address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
77
+ decimals: 18,
78
+ },
79
+ {
80
+ symbol: "DAI",
81
+ name: "DAI Stable",
82
+ address: "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
83
+ decimals: 18,
84
+ },
85
+ {
86
+ symbol: "USDC",
87
+ name: "USD Coin",
88
+ address: "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664",
89
+ decimals: 6,
90
+ },
91
+ {
92
+ symbol: "USDT",
93
+ name: "Tether USD Coin",
94
+ address: "0xc7198437980c041c805A1EDcbA50c1Ce5db95118",
95
+ decimals: 6,
96
+ },
97
+ {
98
+ symbol: "WBTC",
99
+ name: "Wrapped BTC",
100
+ address: "0x50b7545627a5162F82A992c33b87aDc75187B218",
101
+ decimals: 8,
102
+ },
103
+ ],
104
+ };
@@ -5,14 +5,16 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
5
5
  declare id: CreationOptional<number>;
6
6
 
7
7
  declare transactionHash: string;
8
- declare type: string;
8
+ declare action: string;
9
9
  declare from: string;
10
10
  declare to: string;
11
11
 
12
+ declare submitTransactionHash: string;
13
+ declare submitBlockNumber: number;
12
14
 
13
15
  declare sourceChainId: number;
14
- declare sourceTransactionHash: string;
15
- declare sourceBlockNumber: number;
16
+ declare sourceTransactionHash: CreationOptional<string>;
17
+ declare sourceBlockNumber: CreationOptional<number>;
16
18
  declare sourceStatus: string;
17
19
  declare sourceErrors: CreationOptional<string[]>;
18
20
  declare sourceCreatedAt: CreationOptional<Date>;
@@ -45,9 +47,11 @@ Transaction.init({
45
47
  primaryKey: true
46
48
  },
47
49
 
50
+ submitTransactionHash: DataTypes.NUMBER,
51
+ submitBlockNumber: DataTypes.NUMBER,
48
52
 
49
53
  transactionHash: DataTypes.STRING,
50
- type: DataTypes.STRING,
54
+ action: DataTypes.STRING,
51
55
 
52
56
  from: DataTypes.STRING,
53
57
  to: DataTypes.STRING,
@@ -1,9 +1,10 @@
1
1
  //@ts-ignore
2
+ import config from "@/config";
2
3
  import expandHomeDir from "expand-home-dir";
3
4
 
4
5
  import { Sequelize } from 'sequelize';
5
6
 
6
- const basePath = expandHomeDir('~/.interop-x/data');
7
+ const basePath = expandHomeDir(`~/.interop-x/data/${config.publicAddress}/${config.staging ? 'staging' : ''}`);
7
8
 
8
9
  export const sequelize = new Sequelize({
9
10
  dialect: 'sqlite',
package/src/index.ts CHANGED
@@ -1,24 +1,67 @@
1
- import 'module-alias/register';
2
- import assert from "assert";
1
+ import moduleAlias from 'module-alias';
2
+
3
+ moduleAlias.addAliases({
4
+ "@/": __dirname + "/",
5
+ "@/logger": __dirname + "/logger",
6
+ "@/tasks": __dirname + "/tasks",
7
+ "@/utils": __dirname + "/utils",
8
+ "@/api": __dirname + "/api",
9
+ "@/net": __dirname + "/net",
10
+ "@/db": __dirname + "/db",
11
+ "@/config": __dirname + "/config",
12
+ "@/types": __dirname + "/types",
13
+ "@/abi": __dirname + "/abi",
14
+ "@/constants": __dirname + "/constants",
15
+ "@/typechain": __dirname + "/typechain"
16
+ })
17
+
18
+ moduleAlias();
3
19
  import dotenv from "dotenv";
20
+ import chalk from 'chalk';
4
21
  import { ethers } from "ethers";
22
+ import packageJson from '../package.json'
5
23
  dotenv.config();
6
24
 
7
25
  import Logger from "@/logger";
8
26
  const logger = new Logger('Process')
9
27
 
10
- assert(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
28
+ const printUsage = () => {
29
+ console.log('Usage:')
30
+ console.log(' PRIVATE_KEY=abcd1234 interop-x')
31
+ console.log(' PRIVATE_KEY=abcd1234 STAGING=true interop-x')
32
+ console.log(' PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x')
33
+ console.log(' PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x')
34
+ }
11
35
 
36
+ if (process.argv.at(-1) === 'help') {
37
+ printUsage()
38
+ process.exit(0)
39
+ }
40
+
41
+ if (process.argv.at(-1) === 'version') {
42
+ console.log(`Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
43
+ process.exit(0)
44
+ }
45
+
46
+ if(! process.env.PRIVATE_KEY) {
47
+ console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
48
+ printUsage()
49
+ process.exit(1)
50
+ }
12
51
  try {
13
52
  new ethers.Wallet(process.env.PRIVATE_KEY!)
14
53
  } catch (e) {
15
- logger.error('Invalid private key')
54
+ console.error(chalk.bgRed.white('Invalid private key\n'))
55
+ printUsage()
16
56
  process.exit(1)
17
57
  }
18
58
 
19
- import { Tasks } from "@/tasks";
20
- import { startPeer } from "@/net";
59
+ logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
21
60
 
61
+ import { Tasks } from "@/tasks";
62
+ import { startPeer, protocol, peerPool } from "@/net";
63
+ import { startApiServer } from '@/api';
64
+ import { Transaction } from './db';
22
65
 
23
66
  async function main() {
24
67
 
@@ -27,6 +70,34 @@ async function main() {
27
70
  const tasks = new Tasks()
28
71
 
29
72
  tasks.start();
73
+
74
+ startApiServer()
75
+
76
+ protocol.on('TransactionStatus', async (payload) => {
77
+ if (!peerPool.isLeadNode(payload.peerId)) {
78
+ const peer = peerPool.getPeer(payload.peerId)
79
+ logger.info(`ignored transaction status from ${payload.peerId} ${peer?.publicAddress} `)
80
+ return;
81
+ }
82
+
83
+ const transaction = await Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } })
84
+
85
+ if (!transaction) {
86
+ return;
87
+ }
88
+
89
+ transaction.sourceStatus = payload.data.sourceStatus
90
+ transaction.sourceTransactionHash = payload.data.sourceTransactionHash
91
+ transaction.sourceErrors = payload.data.sourceErrors
92
+
93
+ transaction.targetStatus = payload.data.targetStatus
94
+ transaction.targetTransactionHash = payload.data.targetTransactionHash
95
+ transaction.targetErrors = payload.data.targetErrors
96
+
97
+ transaction.status = payload.data.status
98
+
99
+ await transaction.save()
100
+ })
30
101
  }
31
102
 
32
103
  main()