@instadapp/interop-x 0.0.0-dev.b8c571d → 0.0.0-dev.bfeca30

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 (84) hide show
  1. package/dist/package.json +18 -16
  2. package/dist/src/abi/index.js +2 -4
  3. package/dist/src/abi/interopXContract.json +454 -0
  4. package/dist/src/alias.js +10 -0
  5. package/dist/src/api/index.js +6 -3
  6. package/dist/src/config/index.js +11 -1
  7. package/dist/src/constants/addresses.js +3 -3
  8. package/dist/src/constants/index.js +0 -1
  9. package/dist/src/constants/tokens.js +31 -1
  10. package/dist/src/db/models/transaction.js +27 -11
  11. package/dist/src/gnosis/actions/index.js +9 -0
  12. package/dist/src/gnosis/actions/withdraw/index.js +55 -0
  13. package/dist/src/gnosis/index.js +20 -0
  14. package/dist/src/index.js +75 -24
  15. package/dist/src/net/peer/index.js +2 -1
  16. package/dist/src/net/pool/index.js +18 -2
  17. package/dist/src/net/protocol/dial/SignatureDialProtocol.js +9 -10
  18. package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +30 -0
  19. package/dist/src/net/protocol/index.js +51 -1
  20. package/dist/src/tasks/AutoUpdateTask.js +70 -0
  21. package/dist/src/tasks/BaseTask.js +11 -3
  22. package/dist/src/tasks/{InteropBridge/ProcessWithdrawEvents.js → InteropXContract/ProcessBridgeRequestEvents.js} +55 -48
  23. package/dist/src/tasks/InteropXContract/SyncBridgeCommittedEvents.js +92 -0
  24. package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js +78 -0
  25. package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js +90 -0
  26. package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +55 -0
  27. package/dist/src/tasks/index.js +18 -17
  28. package/dist/src/typechain/{InteropBridgeToken.js → InteropXContract.js} +0 -0
  29. package/dist/src/typechain/factories/InteropXContract__factory.js +635 -0
  30. package/dist/src/typechain/factories/index.js +3 -5
  31. package/dist/src/typechain/index.js +3 -5
  32. package/dist/src/utils/index.js +55 -92
  33. package/package.json +18 -16
  34. package/src/abi/index.ts +2 -4
  35. package/src/abi/interopXContract.json +454 -0
  36. package/src/alias.ts +6 -0
  37. package/src/api/index.ts +5 -2
  38. package/src/config/index.ts +11 -1
  39. package/src/constants/addresses.ts +3 -3
  40. package/src/constants/index.ts +0 -1
  41. package/src/constants/tokens.ts +32 -2
  42. package/src/db/models/transaction.ts +76 -27
  43. package/src/gnosis/actions/index.ts +5 -0
  44. package/src/gnosis/actions/withdraw/index.ts +77 -0
  45. package/src/gnosis/index.ts +19 -0
  46. package/src/index.ts +96 -26
  47. package/src/net/peer/index.ts +2 -1
  48. package/src/net/pool/index.ts +25 -5
  49. package/src/net/protocol/dial/SignatureDialProtocol.ts +11 -13
  50. package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +33 -0
  51. package/src/net/protocol/index.ts +67 -1
  52. package/src/tasks/AutoUpdateTask.ts +82 -0
  53. package/src/tasks/BaseTask.ts +13 -3
  54. package/src/tasks/{InteropBridge/ProcessWithdrawEvents.ts → InteropXContract/ProcessBridgeRequestEvents.ts} +78 -93
  55. package/src/tasks/InteropXContract/SyncBridgeCommittedEvents.ts +124 -0
  56. package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts +115 -0
  57. package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts +121 -0
  58. package/src/tasks/Transactions/SyncTransactionStatusTask.ts +67 -0
  59. package/src/tasks/index.ts +27 -21
  60. package/src/typechain/InteropXContract.ts +680 -0
  61. package/src/typechain/factories/InteropXContract__factory.ts +642 -0
  62. package/src/typechain/factories/index.ts +1 -2
  63. package/src/typechain/index.ts +2 -4
  64. package/src/utils/index.ts +96 -129
  65. package/tsconfig.json +7 -2
  66. package/dist/src/abi/interopBridgeToken.json +0 -286
  67. package/dist/src/abi/interopXGateway.json +0 -184
  68. package/dist/src/constants/itokens.js +0 -13
  69. package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js +0 -70
  70. package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +0 -147
  71. package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -75
  72. package/dist/src/typechain/InteropXGateway.js +0 -2
  73. package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -459
  74. package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
  75. package/src/abi/interopBridgeToken.json +0 -286
  76. package/src/abi/interopXGateway.json +0 -184
  77. package/src/constants/itokens.ts +0 -10
  78. package/src/tasks/InteropBridge/SyncWithdrawEvents.ts +0 -121
  79. package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +0 -241
  80. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -126
  81. package/src/typechain/InteropBridgeToken.ts +0 -686
  82. package/src/typechain/InteropXGateway.ts +0 -407
  83. package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -466
  84. package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
@@ -0,0 +1,70 @@
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
+ const BaseTask_1 = require("./BaseTask");
7
+ const logger_1 = __importDefault(require("@/logger"));
8
+ const await_spawn_1 = __importDefault(require("await-spawn"));
9
+ const child_process_1 = require("child_process");
10
+ const config_1 = __importDefault(require("@/config"));
11
+ const waait_1 = __importDefault(require("waait"));
12
+ const package_json_1 = __importDefault(require("../../package.json"));
13
+ const currentVersion = package_json_1.default.version;
14
+ const tag = config_1.default.staging ? 'dev' : 'latest';
15
+ class AutoUpdateTask extends BaseTask_1.BaseTask {
16
+ constructor() {
17
+ super({
18
+ logger: new logger_1.default("AutoUpdateTask"),
19
+ });
20
+ this.pollIntervalMs = 60 * 10 * 1000;
21
+ }
22
+ prePollHandler() {
23
+ return config_1.default.autoUpdate && !config_1.default.isLeadNode();
24
+ }
25
+ async getInstalledVersion() {
26
+ try {
27
+ const stdout = await (0, await_spawn_1.default)('npm', ['-g', 'ls', '--depth=0', '--json']);
28
+ return JSON.parse(stdout.toString()).dependencies[package_json_1.default.name].version;
29
+ }
30
+ catch (error) {
31
+ this.logger.error(error);
32
+ return currentVersion;
33
+ }
34
+ }
35
+ async getLatestVersion() {
36
+ try {
37
+ const stdout = await (0, await_spawn_1.default)('npm', ['view', `${package_json_1.default.name}@${tag}`, 'version']);
38
+ return stdout.toString().trim();
39
+ }
40
+ catch (error) {
41
+ this.logger.error(error);
42
+ return currentVersion;
43
+ }
44
+ }
45
+ async pollHandler() {
46
+ const version = await this.getLatestVersion();
47
+ if (version === currentVersion) {
48
+ return;
49
+ }
50
+ this.logger.warn(`New version ${version} available.`);
51
+ this.logger.info('Updating...');
52
+ await (0, await_spawn_1.default)('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
53
+ await (0, waait_1.default)(5000);
54
+ if (version !== await this.getInstalledVersion()) {
55
+ this.logger.warn(`failed to install ${version}, retrying in 5 minutes`);
56
+ return;
57
+ }
58
+ this.logger.warn(`Installed version ${version}`);
59
+ this.logger.warn(`Restarting...`);
60
+ // TODO: its restarting in the bg, but it should be in the fg
61
+ const subprocess = (0, child_process_1.spawn)(process.argv[0], process.argv.slice(1), {
62
+ cwd: process.cwd(),
63
+ stdio: "inherit",
64
+ // shell: process.env.SHELL,
65
+ });
66
+ subprocess.unref();
67
+ process.exit();
68
+ }
69
+ }
70
+ exports.default = AutoUpdateTask;
@@ -14,6 +14,7 @@ class BaseTask extends events_1.default {
14
14
  this.started = false;
15
15
  this.pollIntervalMs = 10 * 1000;
16
16
  this.leadNodeOnly = false;
17
+ this.exceptLeadNode = false;
17
18
  this.logger = logger !== null && logger !== void 0 ? logger : new logger_1.default('BaseTask');
18
19
  }
19
20
  async pollCheck() {
@@ -34,10 +35,17 @@ class BaseTask extends events_1.default {
34
35
  }
35
36
  }
36
37
  prePollHandler() {
37
- if (!this.leadNodeOnly) {
38
- return true;
38
+ if (config_1.default.isMaintenanceMode()) {
39
+ this.logger.warn('Maintenance mode is enabled. Skipping task.');
40
+ return false;
39
41
  }
40
- return config_1.default.isLeadNode();
42
+ if (this.exceptLeadNode) {
43
+ return !config_1.default.isLeadNode();
44
+ }
45
+ if (this.leadNodeOnly) {
46
+ return config_1.default.isLeadNode();
47
+ }
48
+ return true;
41
49
  }
42
50
  async pollHandler() {
43
51
  this.logger.warn('pollHandler not implemented');
@@ -10,23 +10,15 @@ const abi_1 = __importDefault(require("@/abi"));
10
10
  const db_1 = require("@/db");
11
11
  const utils_1 = require("@/utils");
12
12
  const constants_1 = require("@/constants");
13
- const config_1 = __importDefault(require("@/config"));
14
13
  const sequelize_1 = require("sequelize");
14
+ const config_1 = __importDefault(require("@/config"));
15
15
  const waait_1 = __importDefault(require("waait"));
16
+ const gnosis_1 = require("@/gnosis");
16
17
  const net_1 = require("@/net");
17
- const generateGnosisTransaction = async (transactionData, safeContract) => {
18
- console.log(transactionData);
19
- 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));
20
- while (isExecuted == 1) {
21
- transactionData.safeTxGas = ethers_1.BigNumber.from(String(transactionData.safeTxGas)).add(1).toString();
22
- 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));
23
- }
24
- return transactionData;
25
- };
26
- class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
18
+ class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
27
19
  constructor({ chainId }) {
28
20
  super({
29
- logger: new logger_1.default("InteropXGateway::ProcessWithdrawEvents"),
21
+ logger: new logger_1.default("InteropXContract::ProccessBridgeRequestEvents"),
30
22
  });
31
23
  this.leadNodeOnly = true;
32
24
  this.chainId = chainId;
@@ -37,19 +29,17 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
37
29
  const transaction = await db_1.Transaction.findOne({
38
30
  where: {
39
31
  status: 'pending',
40
- sourceStatus: 'success',
41
- targetStatus: 'uninitialised',
42
- action: 'withdraw',
43
- sourceCreatedAt: {
32
+ sourceStatus: 'uninitialised',
33
+ createdAt: {
44
34
  [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
45
35
  },
46
- targetDelayUntil: {
36
+ sourceDelayUntil: {
47
37
  [sequelize_1.Op.or]: {
48
38
  [sequelize_1.Op.is]: null,
49
39
  [sequelize_1.Op.lt]: new Date(),
50
40
  }
51
41
  },
52
- sourceBlockNumber: {
42
+ requestBlockNumber: {
53
43
  [sequelize_1.Op.lt]: blockNumber - 12,
54
44
  },
55
45
  sourceChainId: this.chainId,
@@ -61,27 +51,36 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
61
51
  console.log(`Processing transaction ${transaction.transactionHash}`);
62
52
  transaction.targetStatus = 'pending';
63
53
  await transaction.save();
64
- // refresh event data?
65
- const targetChainProvider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(transaction.targetChainId));
66
- const targetWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, targetChainProvider);
67
- const safeAddress = constants_1.addresses[transaction.targetChainId].gnosisSafe;
68
- const safeContract = (0, utils_1.getContract)(safeAddress, abi_1.default.gnosisSafe, targetWallet);
69
- const ownersThreshold = await safeContract.getThreshold();
54
+ const ownersThreshold = await this.safeContract.getThreshold();
70
55
  await (0, waait_1.default)(10000);
71
- let gnosisTx = await generateGnosisTransaction({
56
+ let data, logs = [];
57
+ try {
58
+ ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, 'source'));
59
+ }
60
+ catch (error) {
61
+ console.log(error);
62
+ transaction.sourceStatus = 'failed';
63
+ transaction.sourceErrors = [error.message];
64
+ transaction.targetStatus = 'failed';
65
+ transaction.status = 'failed';
66
+ await transaction.save();
67
+ net_1.protocol.sendTransaction(transaction);
68
+ return;
69
+ }
70
+ let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
72
71
  baseGas: "0",
73
- data: await (0, utils_1.buildDataForTransaction)(transaction),
72
+ data,
74
73
  gasPrice: "0",
75
74
  gasToken: "0x0000000000000000000000000000000000000000",
76
75
  nonce: '0',
77
76
  operation: "1",
78
77
  refundReceiver: "0x0000000000000000000000000000000000000000",
79
- safeAddress: safeAddress,
78
+ safeAddress: this.safeContractAddress,
80
79
  safeTxGas: "79668",
81
- to: constants_1.addresses[transaction.targetChainId].multisend,
80
+ to: constants_1.addresses[transaction.sourceChainId].multisend,
82
81
  value: "0",
83
- }, safeContract);
84
- const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
82
+ }, this.safeContract);
83
+ const owners = await this.safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
85
84
  const ownerPeerIds = net_1.peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id);
86
85
  console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
87
86
  console.log(ownerPeerIds);
@@ -95,51 +94,59 @@ class ProcessWithdrawEvents extends BaseTask_1.BaseTask {
95
94
  console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
96
95
  if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
97
96
  await transaction.save();
98
- transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
99
- transaction.targetStatus = 'uninitialised';
97
+ transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
98
+ transaction.sourceStatus = 'uninitialised';
100
99
  await transaction.save();
101
100
  const errorMessage = (_a = signatures.find(s => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
102
101
  throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
103
102
  }
104
103
  console.log(`Executing transaction for execution ${transaction.transactionHash}`);
105
- const { data: txData } = await safeContract.populateTransaction.execTransaction(gnosisTx.to, gnosisTx.value, gnosisTx.data, gnosisTx.operation, gnosisTx.safeTxGas, gnosisTx.baseGas, gnosisTx.gasPrice, gnosisTx.gasToken, gnosisTx.refundReceiver, (0, utils_1.buildSignatureBytes)(validSignatures));
106
- console.log({
107
- from: targetWallet.address,
108
- gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9).toString(),
109
- to: safeAddress,
110
- data: txData,
111
- });
112
- const txSent = await targetWallet.sendTransaction({
113
- from: targetWallet.address,
114
- gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9),
115
- to: safeAddress,
104
+ const { data: txData } = await this.safeContract.populateTransaction.execTransaction(gnosisTx.to, gnosisTx.value, gnosisTx.data, gnosisTx.operation, gnosisTx.safeTxGas, gnosisTx.baseGas, gnosisTx.gasPrice, gnosisTx.gasToken, gnosisTx.refundReceiver, (0, utils_1.buildSignatureBytes)(validSignatures));
105
+ const txSent = await this.sourceWallet.sendTransaction({
106
+ from: this.sourceWallet.address,
107
+ gasPrice: ethers_1.ethers.BigNumber.from(120 * 10 ** 9),
108
+ to: this.safeContractAddress,
116
109
  data: txData,
117
110
  });
111
+ console.log(txSent);
118
112
  const receipt = await txSent.wait();
119
113
  const parsedLogs = [];
120
114
  receipt.logs.forEach((log) => {
121
115
  try {
122
- parsedLogs.push(safeContract.interface.parseLog(log));
116
+ parsedLogs.push(this.safeContract.interface.parseLog(log));
123
117
  }
124
118
  catch (e) { }
125
119
  });
126
120
  if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
127
121
  console.log('ExecutionSuccess');
128
- transaction.targetStatus = 'success';
122
+ transaction.sourceStatus = 'success';
123
+ if (txSent.blockNumber)
124
+ transaction.sourceBlockNumber = txSent.blockNumber;
125
+ transaction.sourceTransactionHash = txSent.hash;
126
+ transaction.sourceLogs = logs;
129
127
  transaction.status = 'success';
130
128
  await transaction.save();
131
129
  }
132
130
  else {
133
131
  console.log('ExecutionFailure');
134
- transaction.targetStatus = 'failed';
132
+ transaction.sourceStatus = 'failed';
133
+ if (txSent.blockNumber)
134
+ transaction.sourceBlockNumber = txSent.blockNumber;
135
+ transaction.sourceTransactionHash = txSent.hash;
136
+ transaction.sourceTransactionHash = txSent.hash;
135
137
  transaction.status = 'failed';
136
138
  await transaction.save();
137
139
  }
140
+ net_1.protocol.sendTransaction(transaction);
138
141
  }
139
142
  async start() {
140
- this.logger.info(`Starting execution watcher on interop chain`);
143
+ this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
141
144
  this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
145
+ this.sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider);
146
+ this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, this.sourceWallet);
147
+ this.safeContractAddress = constants_1.addresses[this.chainId].gnosisSafe;
148
+ this.safeContract = (0, utils_1.getContract)(this.safeContractAddress, abi_1.default.gnosisSafe, this.sourceWallet);
142
149
  await super.start();
143
150
  }
144
151
  }
145
- exports.default = ProcessWithdrawEvents;
152
+ exports.default = ProccessBridgeRequestEvents;
@@ -0,0 +1,92 @@
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
+ const BaseTask_1 = require("../BaseTask");
7
+ const logger_1 = __importDefault(require("@/logger"));
8
+ const ethers_1 = require("ethers");
9
+ const abi_1 = __importDefault(require("@/abi"));
10
+ const db_1 = require("@/db");
11
+ const utils_1 = require("@/utils");
12
+ const constants_1 = require("@/constants");
13
+ const config_1 = __importDefault(require("@/config"));
14
+ const sequelize_1 = require("sequelize");
15
+ class SyncBridgeCommittedEvents extends BaseTask_1.BaseTask {
16
+ constructor({ chainId }) {
17
+ super({
18
+ logger: new logger_1.default("InteropXContract::SyncBridgeCommittedEvents"),
19
+ });
20
+ this.chainId = chainId;
21
+ }
22
+ async pollHandler() {
23
+ const currentBlock = await this.provider.getBlockNumber();
24
+ const events = await this.contract.queryFilter(this.contract.filters.LogBridgeCommitted(), currentBlock - 2000, currentBlock);
25
+ let processedEvents = 0;
26
+ for (const event of events) {
27
+ try {
28
+ if (!event.args) {
29
+ continue;
30
+ }
31
+ const { actionId, bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
32
+ const uniqueIdentifier = {
33
+ actionId,
34
+ bridger,
35
+ requestTransactionHash,
36
+ sourceChainId: sourceChainId,
37
+ targetChainId: targetChainId,
38
+ };
39
+ let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
40
+ const transaction = await db_1.Transaction.findOne({
41
+ where: {
42
+ transactionHash,
43
+ committedEvent: {
44
+ [sequelize_1.Op.eq]: null,
45
+ }
46
+ }
47
+ });
48
+ if (!transaction) {
49
+ continue;
50
+ }
51
+ transaction.targetStatus = 'success';
52
+ transaction.targetBlockNumber = event.blockNumber;
53
+ transaction.targetTransactionHash = event.transactionHash;
54
+ transaction.committedEvent = {
55
+ actionId,
56
+ bridger,
57
+ position: {
58
+ withdraw: position.withdraw.map((v) => ({
59
+ sourceToken: v.sourceToken,
60
+ targetToken: v.targetToken,
61
+ amount: v.amount.toString()
62
+ })),
63
+ supply: position.supply.map((v) => ({
64
+ sourceToken: v.sourceToken,
65
+ targetToken: v.targetToken,
66
+ amount: v.amount.toString()
67
+ })),
68
+ },
69
+ sourceChainId: sourceChainId,
70
+ targetChainId: targetChainId,
71
+ metadata,
72
+ requestTransactionHash,
73
+ };
74
+ transaction.status = 'success';
75
+ await transaction.save();
76
+ this.logger.info(`New bridge committed received: ${transactionHash} `);
77
+ }
78
+ catch (error) {
79
+ this.logger.error(error);
80
+ }
81
+ }
82
+ if (processedEvents > 0)
83
+ this.logger.info(`${processedEvents} events processed`);
84
+ }
85
+ async start() {
86
+ this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
87
+ this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
88
+ this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
89
+ await super.start();
90
+ }
91
+ }
92
+ exports.default = SyncBridgeCommittedEvents;
@@ -0,0 +1,78 @@
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
+ const BaseTask_1 = require("../BaseTask");
7
+ const logger_1 = __importDefault(require("@/logger"));
8
+ const ethers_1 = require("ethers");
9
+ const abi_1 = __importDefault(require("@/abi"));
10
+ const db_1 = require("@/db");
11
+ const utils_1 = require("@/utils");
12
+ const constants_1 = require("@/constants");
13
+ const config_1 = __importDefault(require("@/config"));
14
+ class SyncBridgeRequestEvents extends BaseTask_1.BaseTask {
15
+ constructor({ chainId }) {
16
+ super({
17
+ logger: new logger_1.default("InteropXContract::SyncBridgeRequestEvents"),
18
+ });
19
+ this.chainId = chainId;
20
+ }
21
+ async pollHandler() {
22
+ const currentBlock = await this.provider.getBlockNumber();
23
+ const events = await this.contract.queryFilter(this.contract.filters.LogBridgeRequest(), currentBlock - 2000, currentBlock);
24
+ let processedEvents = 0;
25
+ for (const event of events) {
26
+ try {
27
+ if (!event.args) {
28
+ continue;
29
+ }
30
+ const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = event.args;
31
+ const uniqueIdentifier = {
32
+ actionId,
33
+ bridger,
34
+ requestTransactionHash: event.transactionHash,
35
+ sourceChainId: sourceChainId.toNumber(),
36
+ targetChainId: targetChainId.toNumber(),
37
+ };
38
+ let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
39
+ const transaction = await db_1.Transaction.findOne({ where: { transactionHash } });
40
+ if (transaction) {
41
+ continue;
42
+ }
43
+ await db_1.Transaction.create(Object.assign(Object.assign({ transactionHash }, uniqueIdentifier), { requestBlockNumber: event.blockNumber, requestEvent: {
44
+ actionId,
45
+ bridger,
46
+ position: {
47
+ withdraw: position.withdraw.map((v) => ({
48
+ sourceToken: v.sourceToken,
49
+ targetToken: v.targetToken,
50
+ amount: v.amount.toString()
51
+ })),
52
+ supply: position.supply.map((v) => ({
53
+ sourceToken: v.sourceToken,
54
+ targetToken: v.targetToken,
55
+ amount: v.amount.toString()
56
+ })),
57
+ },
58
+ sourceChainId: sourceChainId.toNumber(),
59
+ targetChainId: targetChainId.toNumber(),
60
+ metadata,
61
+ } }));
62
+ this.logger.info(`New bridge request received: ${transactionHash} `);
63
+ }
64
+ catch (error) {
65
+ this.logger.error(error);
66
+ }
67
+ }
68
+ if (processedEvents > 0)
69
+ this.logger.info(`${processedEvents} events processed`);
70
+ }
71
+ async start() {
72
+ this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
73
+ this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
74
+ this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
75
+ await super.start();
76
+ }
77
+ }
78
+ exports.default = SyncBridgeRequestEvents;
@@ -0,0 +1,90 @@
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
+ const BaseTask_1 = require("../BaseTask");
7
+ const logger_1 = __importDefault(require("@/logger"));
8
+ const ethers_1 = require("ethers");
9
+ const abi_1 = __importDefault(require("@/abi"));
10
+ const db_1 = require("@/db");
11
+ const utils_1 = require("@/utils");
12
+ const constants_1 = require("@/constants");
13
+ const config_1 = __importDefault(require("@/config"));
14
+ const sequelize_1 = require("sequelize");
15
+ class SyncBridgeRequestSentEvents extends BaseTask_1.BaseTask {
16
+ constructor({ chainId }) {
17
+ super({
18
+ logger: new logger_1.default("InteropXContract::SyncBridgeRequestSentEvents"),
19
+ });
20
+ this.chainId = chainId;
21
+ }
22
+ async pollHandler() {
23
+ const currentBlock = await this.provider.getBlockNumber();
24
+ const events = await this.contract.queryFilter(this.contract.filters.LogBridgeRequestSent(), currentBlock - 2000, currentBlock);
25
+ let processedEvents = 0;
26
+ for (const event of events) {
27
+ try {
28
+ if (!event.args) {
29
+ continue;
30
+ }
31
+ const { actionId, bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
32
+ const uniqueIdentifier = {
33
+ actionId,
34
+ bridger,
35
+ requestTransactionHash,
36
+ sourceChainId: sourceChainId,
37
+ targetChainId: targetChainId,
38
+ };
39
+ let transactionHash = (0, utils_1.generateInteropTransactionHash)(uniqueIdentifier);
40
+ const transaction = await db_1.Transaction.findOne({
41
+ where: {
42
+ transactionHash, requestSentEvent: {
43
+ [sequelize_1.Op.eq]: null,
44
+ }
45
+ }
46
+ });
47
+ if (!transaction) {
48
+ continue;
49
+ }
50
+ transaction.sourceStatus = 'success';
51
+ transaction.sourceBlockNumber = event.blockNumber;
52
+ transaction.sourceTransactionHash = event.transactionHash;
53
+ transaction.requestSentEvent = {
54
+ actionId,
55
+ bridger,
56
+ position: {
57
+ withdraw: position.withdraw.map((v) => ({
58
+ sourceToken: v.sourceToken,
59
+ targetToken: v.targetToken,
60
+ amount: v.amount.toString()
61
+ })),
62
+ supply: position.supply.map((v) => ({
63
+ sourceToken: v.sourceToken,
64
+ targetToken: v.targetToken,
65
+ amount: v.amount.toString()
66
+ })),
67
+ },
68
+ sourceChainId: sourceChainId,
69
+ targetChainId: targetChainId,
70
+ metadata,
71
+ requestTransactionHash,
72
+ };
73
+ await transaction.save();
74
+ this.logger.info(`New bridge request sent received: ${transactionHash} `);
75
+ }
76
+ catch (error) {
77
+ this.logger.error(error);
78
+ }
79
+ }
80
+ if (processedEvents > 0)
81
+ this.logger.info(`${processedEvents} events processed`);
82
+ }
83
+ async start() {
84
+ this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
85
+ this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
86
+ this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
87
+ await super.start();
88
+ }
89
+ }
90
+ exports.default = SyncBridgeRequestSentEvents;
@@ -0,0 +1,55 @@
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
+ const BaseTask_1 = require("../BaseTask");
7
+ const logger_1 = __importDefault(require("@/logger"));
8
+ const net_1 = require("@/net");
9
+ const db_1 = require("@/db");
10
+ const sequelize_1 = require("sequelize");
11
+ class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
12
+ constructor() {
13
+ super({
14
+ logger: new logger_1.default("SyncTransactionStatusTask"),
15
+ });
16
+ this.pollIntervalMs = 60 * 1000;
17
+ this.exceptLeadNode = true;
18
+ }
19
+ async pollHandler() {
20
+ // if transaction is pending for more than 1 hour, check lead node for status
21
+ const leadNode = net_1.peerPool.getLeadPeer();
22
+ if (!leadNode) {
23
+ return;
24
+ }
25
+ const transaction = await db_1.Transaction.findOne({
26
+ where: {
27
+ status: 'pending',
28
+ sourceCreatedAt: {
29
+ [sequelize_1.Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
30
+ },
31
+ }
32
+ });
33
+ if (!transaction) {
34
+ return;
35
+ }
36
+ this.logger.info(`Requesting transaction status for ${transaction.transactionHash}`);
37
+ const transactionStatus = await net_1.protocol.requestTransactionStatus(transaction.transactionHash, leadNode.id);
38
+ if (!transactionStatus) {
39
+ return;
40
+ }
41
+ this.logger.info(`Received transaction status for ${transaction.transactionHash}`);
42
+ transaction.sourceStatus = transactionStatus.sourceStatus;
43
+ transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash;
44
+ transaction.sourceErrors = transactionStatus.sourceErrors;
45
+ transaction.sourceLogs = transactionStatus.sourceLogs;
46
+ transaction.targetStatus = transactionStatus.targetStatus;
47
+ transaction.targetTransactionHash = transactionStatus.targetTransactionHash;
48
+ transaction.targetErrors = transactionStatus.targetErrors;
49
+ transaction.targetLogs = transactionStatus.targetLogs;
50
+ transaction.status = transactionStatus.status;
51
+ await transaction.save();
52
+ this.logger.info(`Updated transaction status for ${transaction.transactionHash}`);
53
+ }
54
+ }
55
+ exports.default = SyncTransactionStatusTask;
@@ -4,32 +4,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.Tasks = void 0;
7
- const ProcessDepositEvents_1 = __importDefault(require("./InteropXGateway/ProcessDepositEvents"));
8
- const SyncDepositEvents_1 = __importDefault(require("./InteropXGateway/SyncDepositEvents"));
9
- const SyncWithdrawEvents_1 = __importDefault(require("./InteropBridge/SyncWithdrawEvents"));
10
- const ProcessWithdrawEvents_1 = __importDefault(require("./InteropBridge/ProcessWithdrawEvents"));
7
+ const waait_1 = __importDefault(require("waait"));
8
+ const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
9
+ const SyncBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/SyncBridgeRequestEvents"));
10
+ const ProcessBridgeRequestEvents_1 = __importDefault(require("./InteropXContract/ProcessBridgeRequestEvents"));
11
+ const SyncBridgeRequestSentEvents_1 = __importDefault(require("./InteropXContract/SyncBridgeRequestSentEvents"));
12
+ const SyncBridgeCommittedEvents_1 = __importDefault(require("./InteropXContract/SyncBridgeCommittedEvents"));
11
13
  class Tasks {
12
14
  constructor() {
13
15
  this.tasks = [
14
- new SyncDepositEvents_1.default({
15
- chainId: 43114
16
- }),
17
- new ProcessDepositEvents_1.default({
18
- chainId: 43114
19
- }),
20
- new SyncWithdrawEvents_1.default({
21
- chainId: 137,
22
- itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
23
- }),
24
- new ProcessWithdrawEvents_1.default({
25
- chainId: 137,
26
- })
16
+ // new SyncTransactionStatusTask(),
17
+ new AutoUpdateTask_1.default(),
18
+ // InteropXContract
19
+ new SyncBridgeRequestEvents_1.default({ chainId: 137 }),
20
+ new SyncBridgeRequestEvents_1.default({ chainId: 43114 }),
21
+ new SyncBridgeRequestSentEvents_1.default({ chainId: 137 }),
22
+ new SyncBridgeRequestSentEvents_1.default({ chainId: 43114 }),
23
+ new SyncBridgeCommittedEvents_1.default({ chainId: 137 }),
24
+ new SyncBridgeCommittedEvents_1.default({ chainId: 43114 }),
25
+ new ProcessBridgeRequestEvents_1.default({ chainId: 137 }),
26
+ new ProcessBridgeRequestEvents_1.default({ chainId: 43114 }),
27
27
  ];
28
28
  }
29
29
  async start() {
30
30
  for (const task of this.tasks) {
31
31
  try {
32
32
  task.start();
33
+ await (0, waait_1.default)(1000);
33
34
  }
34
35
  catch (error) {
35
36
  console.error(`Error starting task: ${task.constructor.name}`);