@instadapp/interop-x 0.0.0-dev.a861339 → 0.0.0-dev.a9cd1d2

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 (44) hide show
  1. package/dist/package.json +12 -11
  2. package/dist/src/abi/index.js +2 -2
  3. package/dist/src/abi/interopX.json +1436 -0
  4. package/dist/src/api/index.js +1 -1
  5. package/dist/src/constants/addresses.js +2 -7
  6. package/dist/src/constants/tokens.js +62 -39
  7. package/dist/src/db/models/transaction.js +10 -10
  8. package/dist/src/gnosis/actions/withdraw/index.js +106 -33
  9. package/dist/src/gnosis/index.js +3 -3
  10. package/dist/src/index.js +1 -1
  11. package/dist/src/tasks/{InteropXContract/SyncBridgeRequestEvents.js → InteropX/SyncLogSubmitEvents.js} +20 -14
  12. package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +4 -2
  13. package/dist/src/tasks/index.js +4 -10
  14. package/dist/src/typechain/{InteropXContract.js → InteropX.js} +0 -0
  15. package/dist/src/typechain/factories/InteropX__factory.js +1928 -0
  16. package/dist/src/typechain/factories/index.js +3 -3
  17. package/dist/src/typechain/index.js +3 -3
  18. package/dist/src/utils/index.js +36 -9
  19. package/package.json +12 -11
  20. package/src/abi/index.ts +2 -2
  21. package/src/abi/interopX.json +1436 -0
  22. package/src/api/index.ts +1 -1
  23. package/src/constants/addresses.ts +3 -8
  24. package/src/constants/tokens.ts +63 -40
  25. package/src/db/models/transaction.ts +29 -34
  26. package/src/gnosis/actions/withdraw/index.ts +141 -42
  27. package/src/gnosis/index.ts +3 -3
  28. package/src/tasks/{InteropXContract/SyncBridgeRequestEvents.ts → InteropX/SyncLogSubmitEvents.ts} +39 -19
  29. package/src/tasks/Transactions/SyncTransactionStatusTask.ts +4 -2
  30. package/src/tasks/index.ts +5 -13
  31. package/src/typechain/InteropX.ts +1216 -0
  32. package/src/typechain/factories/InteropX__factory.ts +1932 -0
  33. package/src/typechain/factories/index.ts +1 -1
  34. package/src/typechain/index.ts +2 -2
  35. package/src/utils/index.ts +88 -39
  36. package/dist/src/abi/interopXContract.json +0 -391
  37. package/dist/src/tasks/InteropXContract/ProcessBridgeRequestEvents.js +0 -147
  38. package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js +0 -80
  39. package/dist/src/typechain/factories/InteropXContract__factory.js +0 -526
  40. package/src/abi/interopXContract.json +0 -391
  41. package/src/tasks/InteropXContract/ProcessBridgeRequestEvents.ts +0 -211
  42. package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts +0 -112
  43. package/src/typechain/InteropXContract.ts +0 -524
  44. package/src/typechain/factories/InteropXContract__factory.ts +0 -533
@@ -1,147 +0,0 @@
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 sequelize_1 = require("sequelize");
14
- const config_1 = __importDefault(require("@/config"));
15
- const waait_1 = __importDefault(require("waait"));
16
- const gnosis_1 = require("@/gnosis");
17
- const net_1 = require("@/net");
18
- class ProccessBridgeRequestEvents extends BaseTask_1.BaseTask {
19
- constructor({ chainId }) {
20
- super({
21
- logger: new logger_1.default("InteropXContract::ProccessBridgeRequestEvents"),
22
- });
23
- this.leadNodeOnly = true;
24
- this.chainId = chainId;
25
- }
26
- async pollHandler() {
27
- var _a;
28
- const blockNumber = await this.provider.getBlockNumber();
29
- const transaction = await db_1.Transaction.findOne({
30
- where: {
31
- status: 'pending',
32
- sourceStatus: 'uninitialised',
33
- createdAt: {
34
- [sequelize_1.Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
35
- },
36
- sourceDelayUntil: {
37
- [sequelize_1.Op.or]: {
38
- [sequelize_1.Op.is]: null,
39
- [sequelize_1.Op.lt]: new Date(),
40
- }
41
- },
42
- requestBlockNumber: {
43
- [sequelize_1.Op.lt]: blockNumber - 12,
44
- },
45
- sourceChainId: this.chainId,
46
- }
47
- });
48
- if (!transaction) {
49
- return;
50
- }
51
- console.log(`Processing transaction ${transaction.transactionHash}`);
52
- transaction.targetStatus = 'pending';
53
- await transaction.save();
54
- const ownersThreshold = await this.safeContract.getThreshold();
55
- await (0, waait_1.default)(10000);
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)({
71
- baseGas: "0",
72
- data,
73
- gasPrice: "0",
74
- gasToken: "0x0000000000000000000000000000000000000000",
75
- nonce: '0',
76
- operation: "1",
77
- refundReceiver: "0x0000000000000000000000000000000000000000",
78
- safeAddress: this.safeContractAddress,
79
- safeTxGas: "79668",
80
- to: constants_1.addresses[transaction.sourceChainId].multisend,
81
- value: "0",
82
- }, this.safeContract);
83
- const owners = await this.safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
84
- const ownerPeerIds = net_1.peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id);
85
- console.log(`Collecting signatures for execution ${transaction.transactionHash}`);
86
- console.log(ownerPeerIds);
87
- const signatures = await net_1.protocol.requestSignatures({
88
- type: 'source',
89
- transactionHash: transaction.transactionHash,
90
- safeTxGas: gnosisTx.safeTxGas,
91
- safeNonce: gnosisTx.nonce
92
- }, ownerPeerIds);
93
- const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x');
94
- console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
95
- if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
96
- await transaction.save();
97
- transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
98
- transaction.sourceStatus = 'uninitialised';
99
- await transaction.save();
100
- const errorMessage = (_a = signatures.find(s => !!s.error)) === null || _a === void 0 ? void 0 : _a.error;
101
- throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
102
- }
103
- console.log(`Executing transaction for execution ${transaction.transactionHash}`);
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,
109
- data: txData,
110
- });
111
- console.log(txSent);
112
- const receipt = await txSent.wait();
113
- const parsedLogs = [];
114
- receipt.logs.forEach((log) => {
115
- try {
116
- parsedLogs.push(this.safeContract.interface.parseLog(log));
117
- }
118
- catch (e) { }
119
- });
120
- if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
121
- console.log('ExecutionSuccess');
122
- transaction.sourceStatus = 'success';
123
- transaction.sourceTransactionHash = txSent.hash;
124
- transaction.sourceLogs = logs;
125
- transaction.status = 'success';
126
- await transaction.save();
127
- }
128
- else {
129
- console.log('ExecutionFailure');
130
- transaction.sourceStatus = 'failed';
131
- transaction.sourceTransactionHash = txSent.hash;
132
- transaction.status = 'failed';
133
- await transaction.save();
134
- }
135
- net_1.protocol.sendTransaction(transaction);
136
- }
137
- async start() {
138
- this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
139
- this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
140
- this.sourceWallet = new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider);
141
- this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, this.sourceWallet);
142
- this.safeContractAddress = constants_1.addresses[this.chainId].gnosisSafe;
143
- this.safeContract = (0, utils_1.getContract)(this.safeContractAddress, abi_1.default.gnosisSafe, this.sourceWallet);
144
- await super.start();
145
- }
146
- }
147
- exports.default = ProccessBridgeRequestEvents;
@@ -1,80 +0,0 @@
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 SyncBridgeRequestSentEvents extends BaseTask_1.BaseTask {
15
- constructor({ chainId }) {
16
- super({
17
- logger: new logger_1.default("InteropXContract::SyncBridgeRequestSentEvents"),
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.LogBridgeRequestSent(), 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, requestTransactionHash, metadata } = event.args;
31
- const uniqueIdentifier = {
32
- action: 'withdraw',
33
- bridger,
34
- requestTransactionHash,
35
- sourceChainId: sourceChainId,
36
- targetChainId: targetChainId,
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
- transaction.sourceStatus = 'success';
44
- transaction.requestSentEvent = {
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,
59
- targetChainId: targetChainId,
60
- metadata,
61
- requestTransactionHash,
62
- };
63
- await transaction.save();
64
- this.logger.info(`New bridge reques sent received: ${transactionHash} `);
65
- }
66
- catch (error) {
67
- this.logger.error(error);
68
- }
69
- }
70
- if (processedEvents > 0)
71
- this.logger.info(`${processedEvents} events processed`);
72
- }
73
- async start() {
74
- this.contractAddress = constants_1.addresses[this.chainId].interopXContract;
75
- this.provider = new ethers_1.ethers.providers.JsonRpcProvider((0, utils_1.getRpcProviderUrl)(this.chainId));
76
- this.contract = (0, utils_1.getContract)(this.contractAddress, abi_1.default.interopXContract, new ethers_1.ethers.Wallet(config_1.default.privateKey, this.provider));
77
- await super.start();
78
- }
79
- }
80
- exports.default = SyncBridgeRequestSentEvents;