@instadapp/interop-x 0.0.0-dev.4349539 → 0.0.0-dev.48c6eec

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 (74) hide show
  1. package/dist/package.json +13 -12
  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 +3 -0
  6. package/dist/src/constants/addresses.js +7 -7
  7. package/dist/src/constants/index.js +0 -1
  8. package/dist/src/constants/tokens.js +62 -39
  9. package/dist/src/db/models/transaction.js +27 -11
  10. package/dist/src/gnosis/actions/index.js +9 -0
  11. package/dist/src/gnosis/actions/withdraw/index.js +115 -0
  12. package/dist/src/gnosis/index.js +20 -0
  13. package/dist/src/index.js +8 -19
  14. package/dist/src/net/protocol/dial/SignatureDialProtocol.js +9 -10
  15. package/dist/src/net/protocol/dial/{SignatureDialProtocol.1.js → TransactionStatusDialProtocol.js} +2 -0
  16. package/dist/src/net/protocol/index.js +17 -7
  17. package/dist/src/tasks/{InteropXGateway/ProcessDepositEvents.js → InteropXContract/ProcessBridgeRequestEvents.js} +61 -52
  18. package/dist/src/tasks/InteropXContract/SyncBridgeCommittedEvents.js +93 -0
  19. package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js +78 -0
  20. package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js +90 -0
  21. package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +6 -2
  22. package/dist/src/tasks/index.js +16 -19
  23. package/dist/src/typechain/{InteropBridgeToken.js → InteropXContract.js} +0 -0
  24. package/dist/src/typechain/factories/InteropXContract__factory.js +635 -0
  25. package/dist/src/typechain/factories/index.js +3 -5
  26. package/dist/src/typechain/index.js +3 -5
  27. package/dist/src/utils/index.js +44 -89
  28. package/package.json +13 -12
  29. package/src/abi/index.ts +2 -4
  30. package/src/abi/interopXContract.json +454 -0
  31. package/src/alias.ts +6 -0
  32. package/src/api/index.ts +3 -0
  33. package/src/constants/addresses.ts +8 -8
  34. package/src/constants/index.ts +0 -1
  35. package/src/constants/tokens.ts +63 -40
  36. package/src/db/models/transaction.ts +76 -27
  37. package/src/gnosis/actions/index.ts +5 -0
  38. package/src/gnosis/actions/withdraw/index.ts +155 -0
  39. package/src/gnosis/index.ts +19 -0
  40. package/src/index.ts +7 -18
  41. package/src/net/protocol/dial/SignatureDialProtocol.ts +11 -13
  42. package/src/net/protocol/dial/{SignatureDialProtocol.1.ts → TransactionStatusDialProtocol.ts} +3 -1
  43. package/src/net/protocol/index.ts +17 -7
  44. package/src/tasks/{InteropBridge/ProcessWithdrawEvents.ts → InteropXContract/ProcessBridgeRequestEvents.ts} +89 -94
  45. package/src/tasks/InteropXContract/SyncBridgeCommittedEvents.ts +125 -0
  46. package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts +115 -0
  47. package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts +121 -0
  48. package/src/tasks/Transactions/SyncTransactionStatusTask.ts +6 -2
  49. package/src/tasks/index.ts +21 -20
  50. package/src/typechain/InteropXContract.ts +680 -0
  51. package/src/typechain/factories/InteropXContract__factory.ts +642 -0
  52. package/src/typechain/factories/index.ts +1 -2
  53. package/src/typechain/index.ts +2 -4
  54. package/src/utils/index.ts +82 -126
  55. package/tsconfig.json +7 -2
  56. package/dist/src/abi/interopBridgeToken.json +0 -286
  57. package/dist/src/abi/interopXGateway.json +0 -184
  58. package/dist/src/constants/itokens.js +0 -13
  59. package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +0 -146
  60. package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js +0 -69
  61. package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -74
  62. package/dist/src/typechain/InteropXGateway.js +0 -2
  63. package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -459
  64. package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
  65. package/src/abi/interopBridgeToken.json +0 -286
  66. package/src/abi/interopXGateway.json +0 -184
  67. package/src/constants/itokens.ts +0 -10
  68. package/src/tasks/InteropBridge/SyncWithdrawEvents.ts +0 -119
  69. package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +0 -243
  70. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -124
  71. package/src/typechain/InteropBridgeToken.ts +0 -686
  72. package/src/typechain/InteropXGateway.ts +0 -407
  73. package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -466
  74. package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
@@ -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 ProcessDepositEvents 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::ProcessDepositEvents"),
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 ProcessDepositEvents 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: 'deposit',
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,43 @@ class ProcessDepositEvents 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
+ if (error instanceof utils_1.LiquidityError) {
62
+ await transaction.save();
63
+ transaction.sourceDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
64
+ transaction.sourceStatus = 'uninitialised';
65
+ await transaction.save();
66
+ throw error;
67
+ return;
68
+ }
69
+ transaction.sourceStatus = 'failed';
70
+ transaction.sourceErrors = [error.message];
71
+ transaction.targetStatus = 'failed';
72
+ transaction.status = 'failed';
73
+ await transaction.save();
74
+ net_1.protocol.sendTransaction(transaction);
75
+ return;
76
+ }
77
+ let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
72
78
  baseGas: "0",
73
- data: await (0, utils_1.buildDataForTransaction)(transaction),
79
+ data,
74
80
  gasPrice: "0",
75
81
  gasToken: "0x0000000000000000000000000000000000000000",
76
82
  nonce: '0',
77
83
  operation: "1",
78
84
  refundReceiver: "0x0000000000000000000000000000000000000000",
79
- safeAddress: safeAddress,
85
+ safeAddress: this.safeContractAddress,
80
86
  safeTxGas: "79668",
81
- to: constants_1.addresses[transaction.targetChainId].multisend,
87
+ to: constants_1.addresses[transaction.sourceChainId].multisend,
82
88
  value: "0",
83
- }, safeContract);
84
- const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
89
+ }, this.safeContract);
90
+ const owners = await this.safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
85
91
  const ownerPeerIds = net_1.peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id);
86
92
  console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
87
93
  console.log(ownerPeerIds);
@@ -95,55 +101,58 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
95
101
  console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
96
102
  if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
97
103
  await transaction.save();
98
- transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
99
- transaction.targetStatus = 'uninitialised';
104
+ transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
105
+ transaction.sourceStatus = 'uninitialised';
100
106
  await transaction.save();
101
107
  const errorMessage = (_a = signatures.find(s => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
102
108
  throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
103
109
  }
104
110
  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,
111
+ 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));
112
+ const txSent = await this.sourceWallet.sendTransaction({
113
+ from: this.sourceWallet.address,
114
+ gasPrice: ethers_1.ethers.BigNumber.from(120 * 10 ** 9),
115
+ to: this.safeContractAddress,
116
116
  data: txData,
117
117
  });
118
+ console.log(txSent);
118
119
  const receipt = await txSent.wait();
119
120
  const parsedLogs = [];
120
121
  receipt.logs.forEach((log) => {
121
122
  try {
122
- parsedLogs.push(safeContract.interface.parseLog(log));
123
+ parsedLogs.push(this.safeContract.interface.parseLog(log));
123
124
  }
124
125
  catch (e) { }
125
126
  });
126
127
  if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
127
128
  console.log('ExecutionSuccess');
128
- transaction.targetStatus = 'success';
129
- transaction.targetTransactionHash = txSent.hash;
130
- transaction.status = 'success';
129
+ transaction.sourceStatus = 'success';
130
+ if (txSent.blockNumber)
131
+ transaction.sourceBlockNumber = txSent.blockNumber;
132
+ transaction.sourceTransactionHash = txSent.hash;
133
+ transaction.sourceLogs = logs;
131
134
  await transaction.save();
132
135
  }
133
136
  else {
134
137
  console.log('ExecutionFailure');
135
- transaction.targetStatus = 'failed';
136
- transaction.targetTransactionHash = txSent.hash;
138
+ transaction.sourceStatus = 'failed';
139
+ if (txSent.blockNumber)
140
+ transaction.sourceBlockNumber = txSent.blockNumber;
141
+ transaction.sourceTransactionHash = txSent.hash;
142
+ transaction.sourceTransactionHash = txSent.hash;
137
143
  transaction.status = 'failed';
138
144
  await transaction.save();
139
145
  }
140
146
  net_1.protocol.sendTransaction(transaction);
141
147
  }
142
148
  async start() {
143
- this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
149
+ this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
144
150
  this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
145
- this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
151
+ this.sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider);
152
+ this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, this.sourceWallet);
153
+ this.safeContractAddress = constants_1.addresses[this.chainId].gnosisSafe;
154
+ this.safeContract = (0, utils_1.getContract)(this.safeContractAddress, abi_1.default.gnosisSafe, this.sourceWallet);
146
155
  await super.start();
147
156
  }
148
157
  }
149
- exports.default = ProcessDepositEvents;
158
+ exports.default = ProccessBridgeRequestEvents;
@@ -0,0 +1,93 @@
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
+ sourceStatus: 'success',
44
+ committedEvent: {
45
+ [sequelize_1.Op.eq]: null,
46
+ }
47
+ }
48
+ });
49
+ if (!transaction) {
50
+ continue;
51
+ }
52
+ transaction.targetStatus = 'success';
53
+ transaction.targetBlockNumber = event.blockNumber;
54
+ transaction.targetTransactionHash = event.transactionHash;
55
+ transaction.committedEvent = {
56
+ actionId,
57
+ bridger,
58
+ position: {
59
+ withdraw: position.withdraw.map((v) => ({
60
+ sourceToken: v.sourceToken,
61
+ targetToken: v.targetToken,
62
+ amount: v.amount.toString()
63
+ })),
64
+ supply: position.supply.map((v) => ({
65
+ sourceToken: v.sourceToken,
66
+ targetToken: v.targetToken,
67
+ amount: v.amount.toString()
68
+ })),
69
+ },
70
+ sourceChainId: sourceChainId,
71
+ targetChainId: targetChainId,
72
+ metadata,
73
+ requestTransactionHash,
74
+ };
75
+ transaction.status = 'success';
76
+ await transaction.save();
77
+ this.logger.info(`New bridge committed received: ${transactionHash} `);
78
+ }
79
+ catch (error) {
80
+ this.logger.error(error);
81
+ }
82
+ }
83
+ if (processedEvents > 0)
84
+ this.logger.info(`${processedEvents} events processed`);
85
+ }
86
+ async start() {
87
+ this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
88
+ this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
89
+ this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
90
+ await super.start();
91
+ }
92
+ }
93
+ 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;
@@ -24,9 +24,11 @@ class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
24
24
  }
25
25
  const transaction = await db_1.Transaction.findOne({
26
26
  where: {
27
- status: 'pending',
27
+ sourceStatus: {
28
+ [sequelize_1.Op.notIn]: ['success', 'failed'],
29
+ },
28
30
  sourceCreatedAt: {
29
- [sequelize_1.Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
31
+ [sequelize_1.Op.gte]: new Date(Date.now() - 15 * 60 * 1000),
30
32
  },
31
33
  }
32
34
  });
@@ -42,9 +44,11 @@ class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
42
44
  transaction.sourceStatus = transactionStatus.sourceStatus;
43
45
  transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash;
44
46
  transaction.sourceErrors = transactionStatus.sourceErrors;
47
+ transaction.sourceLogs = transactionStatus.sourceLogs;
45
48
  transaction.targetStatus = transactionStatus.targetStatus;
46
49
  transaction.targetTransactionHash = transactionStatus.targetTransactionHash;
47
50
  transaction.targetErrors = transactionStatus.targetErrors;
51
+ transaction.targetLogs = transactionStatus.targetLogs;
48
52
  transaction.status = transactionStatus.status;
49
53
  await transaction.save();
50
54
  this.logger.info(`Updated transaction status for ${transaction.transactionHash}`);
@@ -4,36 +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"));
11
8
  const AutoUpdateTask_1 = __importDefault(require("./AutoUpdateTask"));
12
- const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
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"));
13
13
  class Tasks {
14
14
  constructor() {
15
15
  this.tasks = [
16
- new SyncTransactionStatusTask_1.default(),
16
+ // new SyncTransactionStatusTask(),
17
17
  new AutoUpdateTask_1.default(),
18
- new SyncDepositEvents_1.default({
19
- chainId: 43114
20
- }),
21
- new ProcessDepositEvents_1.default({
22
- chainId: 43114
23
- }),
24
- new SyncWithdrawEvents_1.default({
25
- chainId: 137,
26
- itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
27
- }),
28
- new ProcessWithdrawEvents_1.default({
29
- chainId: 137,
30
- })
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 }),
31
27
  ];
32
28
  }
33
29
  async start() {
34
30
  for (const task of this.tasks) {
35
31
  try {
36
32
  task.start();
33
+ await (0, waait_1.default)(1000);
37
34
  }
38
35
  catch (error) {
39
36
  console.error(`Error starting task: ${task.constructor.name}`);