@instadapp/interop-x 0.0.0-dev.8a917f1 → 0.0.0-dev.8d83ec0

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 (78) 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 +7 -18
  14. package/dist/src/net/protocol/dial/SignatureDialProtocol.js +9 -10
  15. package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +2 -0
  16. package/dist/src/net/protocol/index.js +11 -1
  17. package/dist/src/tasks/{InteropXGateway/ProcessDepositEvents.js → InteropXContract/ProcessBridgeRequestEvents.js} +51 -54
  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 +2 -0
  22. package/dist/src/tasks/index.js +16 -31
  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 +6 -17
  41. package/src/net/protocol/dial/SignatureDialProtocol.ts +11 -13
  42. package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +3 -1
  43. package/src/net/protocol/index.ts +13 -3
  44. package/src/tasks/{InteropBridge/ProcessWithdrawEvents.ts → InteropXContract/ProcessBridgeRequestEvents.ts} +89 -93
  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 +2 -0
  49. package/src/tasks/index.ts +18 -37
  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 -298
  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/SyncBurnEvents.js +0 -71
  61. package/dist/src/tasks/InteropBridge/SyncMintEvents.js +0 -67
  62. package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -74
  63. package/dist/src/tasks/InteropXGateway/SyncWithdrawtEvents.js +0 -72
  64. package/dist/src/typechain/InteropXGateway.js +0 -2
  65. package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -471
  66. package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
  67. package/src/abi/interopBridgeToken.json +0 -298
  68. package/src/abi/interopXGateway.json +0 -184
  69. package/src/constants/itokens.ts +0 -10
  70. package/src/tasks/InteropBridge/SyncBurnEvents.ts +0 -121
  71. package/src/tasks/InteropBridge/SyncMintEvents.ts +0 -99
  72. package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +0 -257
  73. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -124
  74. package/src/tasks/InteropXGateway/SyncWithdrawtEvents.ts +0 -105
  75. package/src/typechain/InteropBridgeToken.ts +0 -692
  76. package/src/typechain/InteropXGateway.ts +0 -407
  77. package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -478
  78. 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,30 @@ 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 data;
56
+ let data, logs = [];
72
57
  try {
73
- data = await (0, utils_1.buildDataForTransaction)(transaction);
58
+ ({ data, logs } = await (0, gnosis_1.buildGnosisAction)(transaction, 'source'));
74
59
  }
75
60
  catch (error) {
76
- console.log(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];
77
71
  transaction.targetStatus = 'failed';
78
- transaction.targetErrors = [error.message];
79
72
  transaction.status = 'failed';
80
73
  await transaction.save();
81
74
  net_1.protocol.sendTransaction(transaction);
82
75
  return;
83
76
  }
84
- let gnosisTx = await generateGnosisTransaction({
77
+ let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
85
78
  baseGas: "0",
86
79
  data,
87
80
  gasPrice: "0",
@@ -89,12 +82,12 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
89
82
  nonce: '0',
90
83
  operation: "1",
91
84
  refundReceiver: "0x0000000000000000000000000000000000000000",
92
- safeAddress: safeAddress,
85
+ safeAddress: this.safeContractAddress,
93
86
  safeTxGas: "79668",
94
- to: constants_1.addresses[transaction.targetChainId].multisend,
87
+ to: constants_1.addresses[transaction.sourceChainId].multisend,
95
88
  value: "0",
96
- }, safeContract);
97
- 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()));
98
91
  const ownerPeerIds = net_1.peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id);
99
92
  console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
100
93
  console.log(ownerPeerIds);
@@ -108,55 +101,59 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
108
101
  console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
109
102
  if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
110
103
  await transaction.save();
111
- transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
112
- transaction.targetStatus = 'uninitialised';
104
+ transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
105
+ transaction.sourceStatus = 'uninitialised';
113
106
  await transaction.save();
114
107
  const errorMessage = (_a = signatures.find(s => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
115
108
  throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
116
109
  }
117
110
  console.log(`Executing transaction for execution ${transaction.transactionHash}`);
118
- 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));
119
- console.log({
120
- from: targetWallet.address,
121
- gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9).toString(),
122
- to: safeAddress,
123
- data: txData,
124
- });
125
- const txSent = await targetWallet.sendTransaction({
126
- from: targetWallet.address,
127
- gasPrice: ethers_1.BigNumber.from(120 * 10 ** 9),
128
- 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,
129
116
  data: txData,
130
117
  });
118
+ console.log(txSent);
131
119
  const receipt = await txSent.wait();
132
120
  const parsedLogs = [];
133
121
  receipt.logs.forEach((log) => {
134
122
  try {
135
- parsedLogs.push(safeContract.interface.parseLog(log));
123
+ parsedLogs.push(this.safeContract.interface.parseLog(log));
136
124
  }
137
125
  catch (e) { }
138
126
  });
139
127
  if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
140
128
  console.log('ExecutionSuccess');
141
- transaction.targetStatus = 'success';
142
- transaction.targetTransactionHash = txSent.hash;
129
+ transaction.sourceStatus = 'success';
130
+ if (txSent.blockNumber)
131
+ transaction.sourceBlockNumber = txSent.blockNumber;
132
+ transaction.sourceTransactionHash = txSent.hash;
133
+ transaction.sourceLogs = logs;
143
134
  transaction.status = 'success';
144
135
  await transaction.save();
145
136
  }
146
137
  else {
147
138
  console.log('ExecutionFailure');
148
- transaction.targetStatus = 'failed';
149
- transaction.targetTransactionHash = txSent.hash;
139
+ transaction.sourceStatus = 'failed';
140
+ if (txSent.blockNumber)
141
+ transaction.sourceBlockNumber = txSent.blockNumber;
142
+ transaction.sourceTransactionHash = txSent.hash;
143
+ transaction.sourceTransactionHash = txSent.hash;
150
144
  transaction.status = 'failed';
151
145
  await transaction.save();
152
146
  }
153
147
  net_1.protocol.sendTransaction(transaction);
154
148
  }
155
149
  async start() {
156
- this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
150
+ this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
157
151
  this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
158
- this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXGateway, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
152
+ this.sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider);
153
+ this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, this.sourceWallet);
154
+ this.safeContractAddress = constants_1.addresses[this.chainId].gnosisSafe;
155
+ this.safeContract = (0, utils_1.getContract)(this.safeContractAddress, abi_1.default.gnosisSafe, this.sourceWallet);
159
156
  await super.start();
160
157
  }
161
158
  }
162
- exports.default = ProcessDepositEvents;
159
+ 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;
@@ -42,9 +42,11 @@ class SyncTransactionStatusTask extends BaseTask_1.BaseTask {
42
42
  transaction.sourceStatus = transactionStatus.sourceStatus;
43
43
  transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash;
44
44
  transaction.sourceErrors = transactionStatus.sourceErrors;
45
+ transaction.sourceLogs = transactionStatus.sourceLogs;
45
46
  transaction.targetStatus = transactionStatus.targetStatus;
46
47
  transaction.targetTransactionHash = transactionStatus.targetTransactionHash;
47
48
  transaction.targetErrors = transactionStatus.targetErrors;
49
+ transaction.targetLogs = transactionStatus.targetLogs;
48
50
  transaction.status = transactionStatus.status;
49
51
  await transaction.save();
50
52
  this.logger.info(`Updated transaction status for ${transaction.transactionHash}`);
@@ -4,48 +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 SyncWithdrawtEvents_1 = __importDefault(require("./InteropXGateway/SyncWithdrawtEvents"));
10
- const SyncBurnEvents_1 = __importDefault(require("./InteropBridge/SyncBurnEvents"));
11
- const SyncBurnEvents_2 = __importDefault(require("./InteropBridge/SyncBurnEvents"));
12
- const SyncMintEvents_1 = __importDefault(require("./InteropBridge/SyncMintEvents"));
13
- const SyncTransactionStatusTask_1 = __importDefault(require("./Transactions/SyncTransactionStatusTask"));
7
+ const waait_1 = __importDefault(require("waait"));
14
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"));
15
13
  class Tasks {
16
14
  constructor() {
17
15
  this.tasks = [
18
- new SyncTransactionStatusTask_1.default(),
16
+ // new SyncTransactionStatusTask(),
19
17
  new AutoUpdateTask_1.default(),
20
- // InteropXGateway
21
- new SyncDepositEvents_1.default({
22
- chainId: 43114
23
- }),
24
- new ProcessDepositEvents_1.default({
25
- chainId: 43114
26
- }),
27
- new SyncWithdrawtEvents_1.default({
28
- chainId: 43114
29
- }),
30
- // InteropBridge
31
- new SyncBurnEvents_1.default({
32
- chainId: 137,
33
- itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
34
- }),
35
- new SyncMintEvents_1.default({
36
- chainId: 137,
37
- itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
38
- }),
39
- new SyncBurnEvents_2.default({
40
- chainId: 137,
41
- itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
42
- })
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 }),
43
27
  ];
44
28
  }
45
29
  async start() {
46
30
  for (const task of this.tasks) {
47
31
  try {
48
32
  task.start();
33
+ await (0, waait_1.default)(1000);
49
34
  }
50
35
  catch (error) {
51
36
  console.error(`Error starting task: ${task.constructor.name}`);