@instadapp/interop-x 0.0.0-dev.d4e8223 → 0.0.0-dev.d71f27e

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 (72) hide show
  1. package/dist/package.json +2 -2
  2. package/dist/src/abi/index.js +2 -4
  3. package/dist/src/abi/interopXContract.json +391 -0
  4. package/dist/src/alias.js +10 -0
  5. package/dist/src/constants/addresses.js +3 -3
  6. package/dist/src/constants/index.js +0 -1
  7. package/dist/src/db/models/transaction.js +27 -9
  8. package/dist/src/gnosis/actions/index.js +9 -0
  9. package/dist/src/gnosis/actions/withdraw/index.js +41 -0
  10. package/dist/src/gnosis/index.js +20 -0
  11. package/dist/src/index.js +7 -18
  12. package/dist/src/net/protocol/dial/SignatureDialProtocol.js +9 -10
  13. package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +2 -0
  14. package/dist/src/net/protocol/index.js +11 -1
  15. package/dist/src/tasks/{InteropXGateway/ProcessDepositEvents.js → InteropXContract/ProcessBridgeRequestEvents.js} +43 -53
  16. package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js +78 -0
  17. package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js +89 -0
  18. package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +2 -0
  19. package/dist/src/tasks/index.js +13 -30
  20. package/dist/src/typechain/{InteropBridgeToken.js → InteropXContract.js} +0 -0
  21. package/dist/src/typechain/factories/InteropXContract__factory.js +526 -0
  22. package/dist/src/typechain/factories/index.js +3 -5
  23. package/dist/src/typechain/index.js +3 -5
  24. package/dist/src/utils/index.js +14 -84
  25. package/package.json +2 -2
  26. package/src/abi/index.ts +2 -4
  27. package/src/abi/interopXContract.json +391 -0
  28. package/src/alias.ts +6 -0
  29. package/src/constants/addresses.ts +3 -3
  30. package/src/constants/index.ts +0 -1
  31. package/src/db/models/transaction.ts +66 -21
  32. package/src/gnosis/actions/index.ts +5 -0
  33. package/src/gnosis/actions/withdraw/index.ts +56 -0
  34. package/src/gnosis/index.ts +19 -0
  35. package/src/index.ts +6 -17
  36. package/src/net/protocol/dial/SignatureDialProtocol.ts +11 -13
  37. package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +3 -1
  38. package/src/net/protocol/index.ts +13 -3
  39. package/src/tasks/{InteropXGateway/ProcessDepositEvents.ts → InteropXContract/ProcessBridgeRequestEvents.ts} +62 -103
  40. package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts +116 -0
  41. package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts +120 -0
  42. package/src/tasks/Transactions/SyncTransactionStatusTask.ts +2 -0
  43. package/src/tasks/index.ts +15 -37
  44. package/src/typechain/InteropXContract.ts +524 -0
  45. package/src/typechain/factories/InteropXContract__factory.ts +533 -0
  46. package/src/typechain/factories/index.ts +1 -2
  47. package/src/typechain/index.ts +2 -4
  48. package/src/utils/index.ts +46 -125
  49. package/tsconfig.json +7 -2
  50. package/dist/src/abi/interopBridgeToken.json +0 -298
  51. package/dist/src/abi/interopXGateway.json +0 -184
  52. package/dist/src/constants/itokens.js +0 -13
  53. package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +0 -146
  54. package/dist/src/tasks/InteropBridge/SyncBurnEvents.js +0 -71
  55. package/dist/src/tasks/InteropBridge/SyncMintEvents.js +0 -67
  56. package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -74
  57. package/dist/src/tasks/InteropXGateway/SyncWithdrawtEvents.js +0 -72
  58. package/dist/src/typechain/InteropXGateway.js +0 -2
  59. package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -471
  60. package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
  61. package/src/abi/interopBridgeToken.json +0 -298
  62. package/src/abi/interopXGateway.json +0 -184
  63. package/src/constants/itokens.ts +0 -10
  64. package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts +0 -231
  65. package/src/tasks/InteropBridge/SyncBurnEvents.ts +0 -121
  66. package/src/tasks/InteropBridge/SyncMintEvents.ts +0 -99
  67. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -124
  68. package/src/tasks/InteropXGateway/SyncWithdrawtEvents.ts +0 -105
  69. package/src/typechain/InteropBridgeToken.ts +0 -692
  70. package/src/typechain/InteropXGateway.ts +0 -407
  71. package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -478
  72. package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
@@ -10,12 +10,17 @@ const config_1 = __importDefault(require("@/config"));
10
10
  const db_1 = require("@/db");
11
11
  const utils_1 = require("@/utils");
12
12
  const constants_1 = require("@/constants");
13
+ const gnosis_1 = require("@/gnosis");
13
14
  class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
14
15
  constructor(libp2p) {
15
16
  super(libp2p, '/interop-x/signatures');
16
17
  this.timeout = 30000;
17
18
  }
18
19
  async response(data) {
20
+ console.log({
21
+ tag: 'SignatureDialProtocol',
22
+ data
23
+ });
19
24
  const signer = config_1.default.wallet;
20
25
  let transaction;
21
26
  let maxTimeout = 20000;
@@ -33,17 +38,11 @@ class SignatureDialProtocol extends BaseDialProtocol_1.BaseDialProtocol {
33
38
  error: 'Event not found'
34
39
  };
35
40
  }
36
- console.log("signing:", {
37
- to: constants_1.addresses[transaction.targetChainId].multisend,
38
- data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
39
- chainId: transaction.targetChainId,
40
- safeTxGas: data.safeTxGas,
41
- nonce: data.safeNonce,
42
- });
41
+ const { data: gnosisData } = await (0, gnosis_1.buildGnosisAction)(transaction, data.type);
43
42
  const signedData = await (0, utils_1.signGnosisSafeTx)({
44
- to: constants_1.addresses[transaction.targetChainId].multisend,
45
- data: await (0, utils_1.buildDataForTransaction)(transaction, data.type),
46
- chainId: transaction.targetChainId,
43
+ to: constants_1.addresses[transaction.sourceChainId].multisend,
44
+ data: gnosisData,
45
+ chainId: transaction.sourceChainId,
47
46
  safeTxGas: data.safeTxGas,
48
47
  nonce: data.safeNonce,
49
48
  }, { signer });
@@ -18,9 +18,11 @@ class TransactionStatusDialProtocol extends BaseDialProtocol_1.BaseDialProtocol
18
18
  sourceStatus: transaction.sourceStatus,
19
19
  sourceTransactionHash: transaction.sourceTransactionHash,
20
20
  sourceErrors: transaction.sourceErrors,
21
+ sourceLogs: transaction.sourceLogs,
21
22
  targetStatus: transaction.targetStatus,
22
23
  targetTransactionHash: transaction.targetTransactionHash,
23
24
  targetErrors: transaction.targetErrors,
25
+ targetLogs: transaction.targetLogs,
24
26
  status: transaction.status,
25
27
  };
26
28
  }
@@ -33,19 +33,29 @@ class Protocol extends stream_1.EventEmitter {
33
33
  Buffer.from(transaction.sourceStatus),
34
34
  Buffer.from(transaction.sourceTransactionHash || ''),
35
35
  transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
36
+ transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
36
37
  Buffer.from(transaction.targetStatus),
37
38
  Buffer.from(transaction.targetTransactionHash || ''),
38
39
  transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
40
+ transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
39
41
  Buffer.from(transaction.status),
40
42
  ],
41
- decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]) => ({
43
+ decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]) => ({
42
44
  transactionHash: transactionHash.toString(),
43
45
  sourceStatus: sourceStatus.toString(),
44
46
  sourceTransactionHash: sourceTransactionHash.toString() || null,
45
47
  sourceErrors: sourceErrors.map((e) => e.toString()),
48
+ sourceLogs: sourceLogs.map(e => ({
49
+ type: e[0].toString(),
50
+ message: e[1].toString(),
51
+ })),
46
52
  targetStatus: targetStatus.toString(),
47
53
  targetTransactionHash: targetTransactionHash.toString() || null,
48
54
  targetErrors: targetErrors.map((e) => e.toString()),
55
+ targetLogs: targetLogs.map(e => ({
56
+ type: e[0].toString(),
57
+ message: e[1].toString(),
58
+ })),
49
59
  status: status.toString(),
50
60
  }),
51
61
  },
@@ -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,23 @@ 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
61
  console.log(error);
62
+ transaction.sourceStatus = 'failed';
63
+ transaction.sourceErrors = [error.message];
77
64
  transaction.targetStatus = 'failed';
78
- transaction.targetErrors = [error.message];
79
65
  transaction.status = 'failed';
80
66
  await transaction.save();
81
67
  net_1.protocol.sendTransaction(transaction);
82
68
  return;
83
69
  }
84
- let gnosisTx = await generateGnosisTransaction({
70
+ let gnosisTx = await (0, utils_1.generateGnosisTransaction)({
85
71
  baseGas: "0",
86
72
  data,
87
73
  gasPrice: "0",
@@ -89,12 +75,12 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
89
75
  nonce: '0',
90
76
  operation: "1",
91
77
  refundReceiver: "0x0000000000000000000000000000000000000000",
92
- safeAddress: safeAddress,
78
+ safeAddress: this.safeContractAddress,
93
79
  safeTxGas: "79668",
94
- to: constants_1.addresses[transaction.targetChainId].multisend,
80
+ to: constants_1.addresses[transaction.sourceChainId].multisend,
95
81
  value: "0",
96
- }, safeContract);
97
- 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()));
98
84
  const ownerPeerIds = net_1.peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id);
99
85
  console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
100
86
  console.log(ownerPeerIds);
@@ -108,55 +94,59 @@ class ProcessDepositEvents extends BaseTask_1.BaseTask {
108
94
  console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
109
95
  if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
110
96
  await transaction.save();
111
- transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
112
- transaction.targetStatus = 'uninitialised';
97
+ transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
98
+ transaction.sourceStatus = 'uninitialised';
113
99
  await transaction.save();
114
100
  const errorMessage = (_a = signatures.find(s => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
115
101
  throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
116
102
  }
117
103
  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,
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,
129
109
  data: txData,
130
110
  });
111
+ console.log(txSent);
131
112
  const receipt = await txSent.wait();
132
113
  const parsedLogs = [];
133
114
  receipt.logs.forEach((log) => {
134
115
  try {
135
- parsedLogs.push(safeContract.interface.parseLog(log));
116
+ parsedLogs.push(this.safeContract.interface.parseLog(log));
136
117
  }
137
118
  catch (e) { }
138
119
  });
139
120
  if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
140
121
  console.log('ExecutionSuccess');
141
- transaction.targetStatus = 'success';
142
- transaction.targetTransactionHash = txSent.hash;
122
+ transaction.sourceStatus = 'success';
123
+ if (txSent.blockNumber)
124
+ transaction.sourceBlockNumber = txSent.blockNumber;
125
+ transaction.sourceTransactionHash = txSent.hash;
126
+ transaction.sourceLogs = logs;
143
127
  transaction.status = 'success';
144
128
  await transaction.save();
145
129
  }
146
130
  else {
147
131
  console.log('ExecutionFailure');
148
- transaction.targetStatus = 'failed';
149
- transaction.targetTransactionHash = txSent.hash;
132
+ transaction.sourceStatus = 'failed';
133
+ if (txSent.blockNumber)
134
+ transaction.sourceBlockNumber = txSent.blockNumber;
135
+ transaction.sourceTransactionHash = txSent.hash;
136
+ transaction.sourceTransactionHash = txSent.hash;
150
137
  transaction.status = 'failed';
151
138
  await transaction.save();
152
139
  }
153
140
  net_1.protocol.sendTransaction(transaction);
154
141
  }
155
142
  async start() {
156
- this.contractAddress = constants_1.addresses[this.chainId].interopXGateway;
143
+ this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
157
144
  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));
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);
159
149
  await super.start();
160
150
  }
161
151
  }
162
- exports.default = ProcessDepositEvents;
152
+ exports.default = ProccessBridgeRequestEvents;
@@ -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 { bridger, position, sourceChainId, targetChainId, metadata } = event.args;
31
+ const uniqueIdentifier = {
32
+ action: 'withdraw',
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), { position,
44
+ metadata, requestBlockNumber: event.blockNumber, requestEvent: {
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,89 @@
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 { bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
32
+ const uniqueIdentifier = {
33
+ action: 'withdraw',
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, sourceStatus: {
43
+ [sequelize_1.Op.ne]: 'success',
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
+ bridger,
55
+ position: {
56
+ withdraw: position.withdraw.map((v) => ({
57
+ sourceToken: v.sourceToken,
58
+ targetToken: v.targetToken,
59
+ amount: v.amount.toString()
60
+ })),
61
+ supply: position.supply.map((v) => ({
62
+ sourceToken: v.sourceToken,
63
+ targetToken: v.targetToken,
64
+ amount: v.amount.toString()
65
+ })),
66
+ },
67
+ sourceChainId: sourceChainId,
68
+ targetChainId: targetChainId,
69
+ metadata,
70
+ requestTransactionHash,
71
+ };
72
+ await transaction.save();
73
+ this.logger.info(`New bridge request sent received: ${transactionHash} `);
74
+ }
75
+ catch (error) {
76
+ this.logger.error(error);
77
+ }
78
+ }
79
+ if (processedEvents > 0)
80
+ this.logger.info(`${processedEvents} events processed`);
81
+ }
82
+ async start() {
83
+ this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
84
+ this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
85
+ this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
86
+ await super.start();
87
+ }
88
+ }
89
+ 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,47 +4,30 @@ 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 ProcessWithdrawEvents_1 = __importDefault(require("./InteropBridge/ProcessWithdrawEvents"));
11
- const SyncBurnEvents_1 = __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"));
15
12
  class Tasks {
16
13
  constructor() {
17
14
  this.tasks = [
18
- new SyncTransactionStatusTask_1.default(),
15
+ // new SyncTransactionStatusTask(),
19
16
  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 ProcessWithdrawEvents_1.default({
32
- chainId: 137,
33
- }),
34
- new SyncMintEvents_1.default({
35
- chainId: 137,
36
- itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
37
- }),
38
- new SyncBurnEvents_1.default({
39
- chainId: 137,
40
- itokenAddress: '0x62c0045f3277e7067cacad3c8038eeabb1bd92d1',
41
- })
17
+ // InteropXContract
18
+ new SyncBridgeRequestEvents_1.default({ chainId: 137 }),
19
+ new SyncBridgeRequestEvents_1.default({ chainId: 43114 }),
20
+ new SyncBridgeRequestSentEvents_1.default({ chainId: 137 }),
21
+ new SyncBridgeRequestSentEvents_1.default({ chainId: 43114 }),
22
+ new ProcessBridgeRequestEvents_1.default({ chainId: 137 }),
23
+ new ProcessBridgeRequestEvents_1.default({ chainId: 43114 }),
42
24
  ];
43
25
  }
44
26
  async start() {
45
27
  for (const task of this.tasks) {
46
28
  try {
47
29
  task.start();
30
+ await (0, waait_1.default)(1000);
48
31
  }
49
32
  catch (error) {
50
33
  console.error(`Error starting task: ${task.constructor.name}`);