@instadapp/interop-x 0.0.0-dev.f9253db → 0.0.0-dev.fabee70

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 (73) hide show
  1. package/bin/interop-x +1 -1
  2. package/dist/package.json +73 -0
  3. package/dist/{abi → src/abi}/erc20.json +0 -0
  4. package/dist/{abi → src/abi}/gnosisSafe.json +0 -0
  5. package/dist/{abi → src/abi}/index.js +0 -0
  6. package/dist/{abi → src/abi}/interopBridgeToken.json +0 -0
  7. package/dist/{abi → src/abi}/interopXGateway.json +0 -0
  8. package/dist/src/api/index.js +33 -0
  9. package/dist/{config → src/config}/index.js +1 -0
  10. package/dist/{constants → src/constants}/addresses.js +0 -8
  11. package/dist/{constants → src/constants}/index.js +1 -0
  12. package/dist/src/constants/itokens.js +13 -0
  13. package/dist/{constants → src/constants}/tokens.js +0 -0
  14. package/dist/{db → src/db}/index.js +0 -0
  15. package/dist/{db → src/db}/models/index.js +0 -0
  16. package/dist/{db → src/db}/models/transaction.js +3 -1
  17. package/dist/{db → src/db}/sequelize.js +0 -0
  18. package/dist/src/index.js +107 -0
  19. package/dist/{logger → src/logger}/index.js +0 -0
  20. package/dist/{net → src/net}/index.js +0 -0
  21. package/dist/{net → src/net}/peer/index.js +8 -3
  22. package/dist/{net → src/net}/pool/index.js +32 -9
  23. package/dist/{net → src/net}/protocol/dial/BaseDialProtocol.js +0 -0
  24. package/dist/src/net/protocol/dial/SignatureDialProtocol.1.js +28 -0
  25. package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js +22 -12
  26. package/dist/{net → src/net}/protocol/index.js +41 -1
  27. package/dist/src/tasks/AutoUpdateTask.js +57 -0
  28. package/dist/{tasks → src/tasks}/BaseTask.js +8 -4
  29. package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +146 -0
  30. package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js +69 -0
  31. package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +149 -0
  32. package/dist/{tasks → src/tasks}/InteropXGateway/SyncDepositEvents.js +16 -21
  33. package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +53 -0
  34. package/dist/src/tasks/index.js +44 -0
  35. package/dist/{typechain → src/typechain}/Erc20.js +0 -0
  36. package/dist/{typechain → src/typechain}/GnosisSafe.js +0 -0
  37. package/dist/{typechain → src/typechain}/InteropBridgeToken.js +0 -0
  38. package/dist/{typechain → src/typechain}/InteropXGateway.js +0 -0
  39. package/dist/{typechain → src/typechain}/common.js +0 -0
  40. package/dist/{typechain → src/typechain}/factories/Erc20__factory.js +0 -0
  41. package/dist/{typechain → src/typechain}/factories/GnosisSafe__factory.js +0 -0
  42. package/dist/{typechain → src/typechain}/factories/InteropBridgeToken__factory.js +0 -0
  43. package/dist/{typechain → src/typechain}/factories/InteropXGateway__factory.js +0 -0
  44. package/dist/{typechain → src/typechain}/factories/index.js +0 -0
  45. package/dist/{typechain → src/typechain}/index.js +0 -0
  46. package/dist/{types.js → src/types.js} +0 -0
  47. package/dist/src/utils/index.js +238 -0
  48. package/package.json +9 -3
  49. package/patches/@ethersproject+properties+5.6.0.patch +13 -0
  50. package/src/api/index.ts +33 -0
  51. package/src/config/index.ts +2 -0
  52. package/src/constants/addresses.ts +0 -8
  53. package/src/constants/index.ts +1 -0
  54. package/src/constants/itokens.ts +10 -0
  55. package/src/db/models/transaction.ts +8 -4
  56. package/src/index.ts +62 -6
  57. package/src/net/peer/index.ts +9 -7
  58. package/src/net/pool/index.ts +41 -11
  59. package/src/net/protocol/dial/SignatureDialProtocol.1.ts +31 -0
  60. package/src/net/protocol/dial/SignatureDialProtocol.ts +25 -13
  61. package/src/net/protocol/index.ts +57 -1
  62. package/src/tasks/AutoUpdateTask.ts +73 -0
  63. package/src/tasks/BaseTask.ts +9 -4
  64. package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts +231 -0
  65. package/src/tasks/InteropBridge/SyncWithdrawEvents.ts +119 -0
  66. package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +243 -0
  67. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +23 -13
  68. package/src/tasks/Transactions/SyncTransactionStatusTask.ts +65 -0
  69. package/src/tasks/index.ts +24 -2
  70. package/src/utils/index.ts +197 -7
  71. package/dist/index.js +0 -63
  72. package/dist/tasks/index.js +0 -27
  73. package/dist/utils/index.js +0 -101
@@ -0,0 +1,238 @@
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.shortenHash = 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 shortenHash(hash, length = 4) {
20
+ if (!hash)
21
+ return;
22
+ if (hash.length < 12)
23
+ return hash;
24
+ const beginningChars = hash.startsWith("0x") ? length + 2 : length;
25
+ const shortened = hash.substr(0, beginningChars) + "…" + hash.substr(-length);
26
+ return shortened;
27
+ }
28
+ exports.shortenHash = shortenHash;
29
+ function short(buffer) {
30
+ return buffer.toString('hex').slice(0, 8) + '...';
31
+ }
32
+ exports.short = short;
33
+ 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 }) => {
34
+ const gnosisSafe = constants_1.addresses[chainId].gnosisSafe;
35
+ const domain = {
36
+ verifyingContract: gnosisSafe,
37
+ chainId,
38
+ };
39
+ const types = {
40
+ SafeTx: [
41
+ { type: 'address', name: 'to' },
42
+ { type: 'uint256', name: 'value' },
43
+ { type: 'bytes', name: 'data' },
44
+ { type: 'uint8', name: 'operation' },
45
+ { type: 'uint256', name: 'safeTxGas' },
46
+ { type: 'uint256', name: 'baseGas' },
47
+ { type: 'uint256', name: 'gasPrice' },
48
+ { type: 'address', name: 'gasToken' },
49
+ { type: 'address', name: 'refundReceiver' },
50
+ { type: 'uint256', name: 'nonce' },
51
+ ],
52
+ };
53
+ const message = {
54
+ baseGas,
55
+ data,
56
+ gasPrice,
57
+ gasToken,
58
+ nonce: Number(nonce),
59
+ operation,
60
+ refundReceiver,
61
+ safeAddress: gnosisSafe,
62
+ safeTxGas: String(safeTxGas),
63
+ to,
64
+ value,
65
+ };
66
+ return await signer._signTypedData(domain, types, message);
67
+ };
68
+ exports.signGnosisSafeTx = signGnosisSafeTx;
69
+ const getRpcProviderUrl = (chainId) => {
70
+ switch (chainId) {
71
+ case 1:
72
+ return 'https://rpc.ankr.com/eth';
73
+ case 137:
74
+ return 'https://rpc.ankr.com/polygon';
75
+ case 43114:
76
+ return 'https://rpc.ankr.com/avalanche';
77
+ default:
78
+ throw new Error(`Unknown chainId: ${chainId}`);
79
+ }
80
+ };
81
+ exports.getRpcProviderUrl = getRpcProviderUrl;
82
+ const buildSignatureBytes = (signatures) => {
83
+ signatures.sort((left, right) => left.signer.toLowerCase().localeCompare(right.signer.toLowerCase()));
84
+ let signatureBytes = "0x";
85
+ for (const sig of signatures) {
86
+ signatureBytes += sig.data.slice(2);
87
+ }
88
+ return signatureBytes;
89
+ };
90
+ exports.buildSignatureBytes = buildSignatureBytes;
91
+ /**
92
+ * Call an async function with a maximum time limit (in milliseconds) for the timeout
93
+ * Resolved promise for async function call, or an error if time limit reached
94
+ */
95
+ const asyncCallWithTimeout = async (asyncPromise, timeout) => {
96
+ let timeoutHandle;
97
+ const timeoutPromise = new Promise((_resolve, reject) => {
98
+ timeoutHandle = setTimeout(() => reject(new Error('Async call timeout limit reached')), timeout);
99
+ });
100
+ return Promise.race([asyncPromise, timeoutPromise]).then(result => {
101
+ clearTimeout(timeoutHandle);
102
+ return result;
103
+ });
104
+ };
105
+ exports.asyncCallWithTimeout = asyncCallWithTimeout;
106
+ const generateInteropTransactionHash = (data) => {
107
+ return ethers_1.ethers.utils.solidityKeccak256(['string', 'string', 'string', 'string'], [
108
+ String(data.action),
109
+ String(data.submitTransactionHash),
110
+ String(data.sourceChainId),
111
+ String(data.targetChainId),
112
+ ]);
113
+ };
114
+ exports.generateInteropTransactionHash = generateInteropTransactionHash;
115
+ const buildDataForTransaction = async (transaction, type) => {
116
+ type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
117
+ switch (transaction.action) {
118
+ case "deposit":
119
+ return await (0, exports.buildDepositDataForTransaction)(transaction, type);
120
+ case "withdraw":
121
+ return await (0, exports.buildWithdrawDataForTransaction)(transaction, type);
122
+ default:
123
+ throw new Error(`Unknown action: ${transaction.action}`);
124
+ }
125
+ };
126
+ exports.buildDataForTransaction = buildDataForTransaction;
127
+ const buildDepositDataForTransaction = async (transaction, type) => {
128
+ const transactions = [];
129
+ if (transaction.action !== 'deposit') {
130
+ throw new Error(`Invalid action: ${transaction.action}`);
131
+ }
132
+ if (transaction.action === 'deposit' && transaction.sourceStatus === 'pending') {
133
+ throw Error('Cannot build data for pending deposit transaction');
134
+ }
135
+ if (!transaction.submitEvent) {
136
+ throw Error('Cannot build data for transaction without submitEvent');
137
+ }
138
+ const token = constants_1.tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
139
+ if (!token) {
140
+ throw Error('Cannot build data for transaction without token');
141
+ }
142
+ const itoken = constants_1.itokens[transaction.targetChainId].find(itoken => itoken.symbol.toLowerCase() === token.symbol.toLowerCase());
143
+ if (!itoken) {
144
+ throw Error('Cannot build data for transaction without itoken');
145
+ }
146
+ const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
147
+ const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
148
+ const interopBridgeContract = getContract(itoken.address, abi_1.default.interopBridgeToken, targetWallet);
149
+ 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);
150
+ transactions.push({
151
+ to: itoken.address,
152
+ data: data,
153
+ value: '0',
154
+ operation: ethers_multisend_1.OperationType.Call,
155
+ });
156
+ return (0, ethers_multisend_1.encodeMulti)(transactions).data;
157
+ };
158
+ exports.buildDepositDataForTransaction = buildDepositDataForTransaction;
159
+ const buildWithdrawDataForTransaction = async (transaction, type) => {
160
+ const transactions = [];
161
+ if (transaction.action !== 'withdraw') {
162
+ throw new Error(`Invalid action: ${transaction.action}`);
163
+ }
164
+ if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
165
+ throw Error('Cannot build data for pending withdraw transaction');
166
+ }
167
+ if (!transaction.submitEvent) {
168
+ throw Error('Cannot build data for transaction without submitEvent');
169
+ }
170
+ const { to, amount, chainId, itoken: itokenAddress } = transaction.submitEvent;
171
+ const itoken = constants_1.itokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
172
+ if (!itoken) {
173
+ throw Error('Cannot build data for transaction without itoken');
174
+ }
175
+ const token = constants_1.tokens[chainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
176
+ if (!token) {
177
+ throw Error('Cannot build data for transaction without token');
178
+ }
179
+ const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, exports.getRpcProviderUrl)(transaction.targetChainId));
180
+ const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
181
+ const gatewayAddress = constants_1.addresses[chainId].interopXGateway;
182
+ const interopBridgeContract = getContract(gatewayAddress, abi_1.default.interopXGateway, targetWallet);
183
+ 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);
184
+ transactions.push({
185
+ to: gatewayAddress,
186
+ data: data,
187
+ value: '0',
188
+ operation: ethers_multisend_1.OperationType.Call,
189
+ });
190
+ return (0, ethers_multisend_1.encodeMulti)(transactions).data;
191
+ };
192
+ exports.buildWithdrawDataForTransaction = buildWithdrawDataForTransaction;
193
+ function getContract(address, contractInterface, signerOrProvider) {
194
+ if (!ethers_1.ethers.utils.getAddress(address) || address === ethers_1.ethers.constants.AddressZero) {
195
+ throw Error(`Invalid 'address' parameter '${address}'.`);
196
+ }
197
+ const contract = new ethers_1.ethers.Contract(address, contractInterface, signerOrProvider);
198
+ // Make sure the contract properties is writable
199
+ const desc = Object.getOwnPropertyDescriptor(contract, 'functions');
200
+ if (!desc || desc.writable !== true) {
201
+ return contract;
202
+ }
203
+ return new Proxy(contract, {
204
+ get(target, prop, receiver) {
205
+ const value = Reflect.get(target, prop, receiver);
206
+ if (typeof value === 'function' && (contract.functions.hasOwnProperty(prop) || ['queryFilter'].includes(String(prop)))) {
207
+ return async (...args) => {
208
+ try {
209
+ return await value.bind(contract)(...args);
210
+ }
211
+ catch (error) {
212
+ throw new Error(`Error calling "${String(prop)}" on "${address}": ${error.reason || error.message}`);
213
+ }
214
+ };
215
+ }
216
+ if (typeof value === 'object' && ['populateTransaction', 'estimateGas', 'functions', 'callStatic'].includes(String(prop))) {
217
+ const parentProp = String(prop);
218
+ return new Proxy(value, {
219
+ get(target, prop, receiver) {
220
+ const value = Reflect.get(target, prop, receiver);
221
+ if (typeof value === 'function') {
222
+ return async (...args) => {
223
+ try {
224
+ return await value.bind(contract)(...args);
225
+ }
226
+ catch (error) {
227
+ throw new Error(`Error calling "${String(prop)}" using "${parentProp}" on "${address}": ${error.reason || error.message}`);
228
+ }
229
+ };
230
+ }
231
+ }
232
+ });
233
+ }
234
+ return value;
235
+ },
236
+ });
237
+ }
238
+ 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.f9253db",
3
+ "version": "0.0.0-dev.fabee70",
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": [
@@ -23,6 +24,8 @@
23
24
  },
24
25
  "dependencies": {
25
26
  "@achingbrain/libp2p-gossipsub": "^0.12.2",
27
+ "@fastify/cors": "^7.0.0",
28
+ "await-spawn": "^4.0.2",
26
29
  "axios": "^0.27.1",
27
30
  "axios-retry": "^3.2.4",
28
31
  "bignumber.js": "^9.0.2",
@@ -32,6 +35,7 @@
32
35
  "ethers": "^5.6.4",
33
36
  "ethers-multisend": "^2.1.1",
34
37
  "expand-home-dir": "^0.0.3",
38
+ "fastify": "^3.28.0",
35
39
  "libp2p": "^0.36.2",
36
40
  "libp2p-bootstrap": "^0.14.0",
37
41
  "libp2p-kad-dht": "^0.28.6",
@@ -43,7 +47,9 @@
43
47
  "libp2p-websockets": "^0.16.2",
44
48
  "luxon": "^2.3.2",
45
49
  "module-alias": "^2.2.2",
46
- "sequelize": "^6.19.0",
50
+ "patch-package": "^6.4.7",
51
+ "postinstall-postinstall": "^2.1.0",
52
+ "sequelize": "6.18.0",
47
53
  "sqlite3": "^5.0.5",
48
54
  "waait": "^1.0.5"
49
55
  },
@@ -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.message)
31
+ process.exit(1)
32
+ }
33
+ }
@@ -8,12 +8,14 @@ class Config {
8
8
  public readonly privateKey: string
9
9
  public readonly wallet: Wallet
10
10
  public readonly staging: boolean
11
+ public readonly autoUpdate: boolean
11
12
 
12
13
  constructor() {
13
14
  this.events = new EventBus() as EventBusType
14
15
  this.maxPeers = 10
15
16
  this.privateKey = process.env.PRIVATE_KEY as string;
16
17
  this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
18
+ this.autoUpdate = !! process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
17
19
  this.wallet = new Wallet(this.privateKey);
18
20
  this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
19
21
  }
@@ -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,2 +1,3 @@
1
1
  export * from './addresses';
2
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
+ };
@@ -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,
package/src/index.ts CHANGED
@@ -5,6 +5,7 @@ moduleAlias.addAliases({
5
5
  "@/logger": __dirname + "/logger",
6
6
  "@/tasks": __dirname + "/tasks",
7
7
  "@/utils": __dirname + "/utils",
8
+ "@/api": __dirname + "/api",
8
9
  "@/net": __dirname + "/net",
9
10
  "@/db": __dirname + "/db",
10
11
  "@/config": __dirname + "/config",
@@ -15,33 +16,55 @@ moduleAlias.addAliases({
15
16
  })
16
17
 
17
18
  moduleAlias();
18
- import assert from "assert";
19
19
  import dotenv from "dotenv";
20
+ import chalk from 'chalk';
20
21
  import { ethers } from "ethers";
22
+ import packageJson from '../package.json'
21
23
  dotenv.config();
22
24
 
23
25
  import Logger from "@/logger";
24
26
  const logger = new Logger('Process')
25
27
 
26
-
27
- if (process.argv.at(-1) === 'help') {
28
+ const printUsage = () => {
28
29
  console.log('Usage:')
29
30
  console.log(' PRIVATE_KEY=abcd1234 interop-x')
30
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
+ }
35
+
36
+ if (process.argv.at(-1) === 'help') {
37
+ printUsage()
31
38
  process.exit(0)
32
39
  }
33
40
 
34
- assert(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
41
+ const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
35
42
 
43
+ if (process.argv.at(-1) === 'version') {
44
+ console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
45
+ process.exit(0)
46
+ }
47
+
48
+ if(! process.env.PRIVATE_KEY) {
49
+ console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
50
+ printUsage()
51
+ process.exit(1)
52
+ }
36
53
  try {
37
54
  new ethers.Wallet(process.env.PRIVATE_KEY!)
38
55
  } catch (e) {
39
- logger.error('Invalid private key')
56
+ console.error(chalk.bgRed.white('Invalid private key\n'))
57
+ printUsage()
40
58
  process.exit(1)
41
59
  }
42
60
 
61
+ logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
62
+
43
63
  import { Tasks } from "@/tasks";
44
- import { startPeer } from "@/net";
64
+ import { startPeer, protocol, peerPool } from "@/net";
65
+ import { startApiServer } from '@/api';
66
+ import { Transaction } from './db';
67
+ import { shortenHash } from './utils';
45
68
 
46
69
  async function main() {
47
70
 
@@ -50,6 +73,39 @@ async function main() {
50
73
  const tasks = new Tasks()
51
74
 
52
75
  tasks.start();
76
+
77
+ startApiServer()
78
+
79
+ protocol.on('TransactionStatus', async (payload) => {
80
+ if (!peerPool.isLeadNode(payload.peerId)) {
81
+ const peer = peerPool.getPeer(payload.peerId)
82
+
83
+ if(! peer) {
84
+ return;
85
+ }
86
+
87
+ logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
88
+ return;
89
+ }
90
+
91
+ const transaction = await Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } })
92
+
93
+ if (!transaction) {
94
+ return;
95
+ }
96
+
97
+ transaction.sourceStatus = payload.data.sourceStatus
98
+ transaction.sourceTransactionHash = payload.data.sourceTransactionHash
99
+ transaction.sourceErrors = payload.data.sourceErrors
100
+
101
+ transaction.targetStatus = payload.data.targetStatus
102
+ transaction.targetTransactionHash = payload.data.targetTransactionHash
103
+ transaction.targetErrors = payload.data.targetErrors
104
+
105
+ transaction.status = payload.data.status
106
+
107
+ await transaction.save()
108
+ })
53
109
  }
54
110
 
55
111
  main()
@@ -17,6 +17,7 @@ import KadDHT from "libp2p-kad-dht";
17
17
  import PubsubPeerDiscovery from "libp2p-pubsub-peer-discovery";
18
18
  import { protocol } from "@/net";
19
19
  import config from "@/config";
20
+ import chalk from "chalk";
20
21
 
21
22
  const logger = new Logger("Peer");
22
23
 
@@ -80,7 +81,7 @@ export const startPeer = async ({ }: IPeerOptions) => {
80
81
  },
81
82
  });
82
83
 
83
- logger.info("Peer ID:", node.peerId.toB58String());
84
+ logger.info("Peer ID:", chalk.bold(node.peerId.toB58String()));
84
85
 
85
86
  await node.start();
86
87
 
@@ -88,12 +89,13 @@ export const startPeer = async ({ }: IPeerOptions) => {
88
89
  libp2p: node
89
90
  })
90
91
 
91
- node.on("peer:discovery", (peer) =>
92
- logger.log(`Discovered peer ${peer}`)
93
- ); // peer disc.
94
- node.connectionManager.on("peer:connect", (connection) =>
95
- logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
96
- );
92
+ node.on("peer:discovery", (peer) => {
93
+ // logger.log(`Discovered peer ${peer}`)
94
+ }); // peer disc.
95
+
96
+ node.connectionManager.on("peer:connect", (connection) => {
97
+ // logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
98
+ });
97
99
 
98
100
  logger.log("Peer discovery started");
99
101
 
@@ -1,5 +1,12 @@
1
1
  import { Event } from "@/types";
2
2
  import config from "@/config";
3
+ import Logger from "@/logger";
4
+ import { getAddress } from "ethers/lib/utils";
5
+ import { shortenHash } from "@/utils";
6
+ import chalk from "chalk";
7
+
8
+
9
+ const logger = new Logger('PeerPool')
3
10
 
4
11
  export interface IPeerInfo {
5
12
  id: string;
@@ -75,10 +82,15 @@ export class PeerPool {
75
82
  * @emits {@link Event.POOL_PEER_ADDED}
76
83
  */
77
84
  add(peer?: IPeerInfo) {
78
- if (peer && peer.id && !this.pool.get(peer.id)) {
85
+ if (peer && peer.id) {
86
+ const newPeer = !this.pool.get(peer.id);
79
87
  this.pool.set(peer.id, peer)
80
88
  peer.pooled = true
81
- config.events.emit(Event.POOL_PEER_ADDED, peer)
89
+
90
+ if (newPeer) {
91
+ config.events.emit(Event.POOL_PEER_ADDED, peer)
92
+ logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
93
+ }
82
94
  }
83
95
  }
84
96
 
@@ -92,6 +104,7 @@ export class PeerPool {
92
104
  if (this.pool.delete(peer.id)) {
93
105
  peer.pooled = false
94
106
  config.events.emit(Event.POOL_PEER_REMOVED, peer)
107
+ logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
95
108
  }
96
109
  }
97
110
  }
@@ -100,7 +113,7 @@ export class PeerPool {
100
113
  this.cleanup()
101
114
 
102
115
  return this.peers.filter((p) => {
103
- if(!p.pooled) return false;
116
+ if (!p.pooled) return false;
104
117
 
105
118
  const now = new Date()
106
119
 
@@ -112,16 +125,33 @@ export class PeerPool {
112
125
  return this.activePeers.map((p) => p.id)
113
126
  }
114
127
 
128
+ getPeer(id: string){
129
+ return this.pool.get(id);
130
+ }
115
131
 
116
- cleanup() {
117
- let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
132
+ isLeadNode(id: string) {
133
+ const peer = this.pool.get(id);
118
134
 
119
- this.peers.forEach((peerInfo) => {
120
- if (peerInfo.updated.getTime() < compDate) {
121
- console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
122
- this.remove(peerInfo)
123
- }
124
- })
135
+ if (!peer) {
136
+ return false;
137
+ }
138
+
139
+ return getAddress(peer.publicAddress) === getAddress(config.leadNodeAddress)
140
+ }
141
+
142
+ getLeadPeer() {
143
+ return this.peers.find((p) => this.isLeadNode(p.id))
144
+ }
145
+
146
+ cleanup() {
147
+ // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
148
+
149
+ // this.peers.forEach((peerInfo) => {
150
+ // if (peerInfo.updated.getTime() < compDate) {
151
+ // console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
152
+ // this.remove(peerInfo)
153
+ // }
154
+ // })
125
155
  }
126
156
  }
127
157