@instadapp/interop-x 0.0.0-dev.de23e71 → 0.0.0-dev.e33810b

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 (69) 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/constants/addresses.js +3 -3
  5. package/dist/src/constants/index.js +0 -1
  6. package/dist/src/constants/tokens.js +31 -1
  7. package/dist/src/db/models/transaction.js +19 -11
  8. package/dist/src/gnosis/actions/index.js +0 -2
  9. package/dist/src/gnosis/actions/withdraw/index.js +55 -0
  10. package/dist/src/gnosis/index.js +4 -4
  11. package/dist/src/index.js +4 -2
  12. package/dist/src/net/protocol/dial/SignatureDialProtocol.js +6 -2
  13. package/dist/src/tasks/{InteropBridge/ProcessWithdrawEvents.js → InteropXContract/ProcessBridgeRequestEvents.js} +42 -52
  14. package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js +78 -0
  15. package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js +90 -0
  16. package/dist/src/tasks/index.js +13 -30
  17. package/dist/src/typechain/{InteropBridgeToken.js → InteropXContract.js} +0 -0
  18. package/dist/src/typechain/factories/InteropXContract__factory.js +635 -0
  19. package/dist/src/typechain/factories/index.js +3 -5
  20. package/dist/src/typechain/index.js +3 -5
  21. package/dist/src/utils/index.js +37 -8
  22. package/package.json +13 -12
  23. package/src/abi/index.ts +2 -4
  24. package/src/abi/interopXContract.json +454 -0
  25. package/src/constants/addresses.ts +3 -3
  26. package/src/constants/index.ts +0 -1
  27. package/src/constants/tokens.ts +32 -2
  28. package/src/db/models/transaction.ts +58 -27
  29. package/src/gnosis/actions/index.ts +0 -2
  30. package/src/gnosis/actions/withdraw/index.ts +77 -0
  31. package/src/gnosis/index.ts +5 -5
  32. package/src/index.ts +3 -1
  33. package/src/net/protocol/dial/SignatureDialProtocol.ts +6 -2
  34. package/src/tasks/{InteropBridge/ProcessWithdrawEvents.ts → InteropXContract/ProcessBridgeRequestEvents.ts} +66 -99
  35. package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts +115 -0
  36. package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts +121 -0
  37. package/src/tasks/index.ts +15 -37
  38. package/src/typechain/InteropXContract.ts +680 -0
  39. package/src/typechain/factories/InteropXContract__factory.ts +642 -0
  40. package/src/typechain/factories/index.ts +1 -2
  41. package/src/typechain/index.ts +2 -4
  42. package/src/utils/index.ts +78 -8
  43. package/dist/src/abi/interopBridgeToken.json +0 -298
  44. package/dist/src/abi/interopXGateway.json +0 -184
  45. package/dist/src/constants/itokens.js +0 -13
  46. package/dist/src/gnosis/actions/deposit.js +0 -48
  47. package/dist/src/gnosis/actions/withdraw.js +0 -50
  48. package/dist/src/tasks/InteropBridge/SyncBurnEvents.js +0 -71
  49. package/dist/src/tasks/InteropBridge/SyncMintEvents.js +0 -67
  50. package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +0 -164
  51. package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -74
  52. package/dist/src/tasks/InteropXGateway/SyncWithdrawtEvents.js +0 -72
  53. package/dist/src/typechain/InteropXGateway.js +0 -2
  54. package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -471
  55. package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
  56. package/src/abi/interopBridgeToken.json +0 -298
  57. package/src/abi/interopXGateway.json +0 -184
  58. package/src/constants/itokens.ts +0 -10
  59. package/src/gnosis/actions/deposit.ts +0 -63
  60. package/src/gnosis/actions/withdraw.ts +0 -67
  61. package/src/tasks/InteropBridge/SyncBurnEvents.ts +0 -119
  62. package/src/tasks/InteropBridge/SyncMintEvents.ts +0 -99
  63. package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +0 -260
  64. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -124
  65. package/src/tasks/InteropXGateway/SyncWithdrawtEvents.ts +0 -105
  66. package/src/typechain/InteropBridgeToken.ts +0 -692
  67. package/src/typechain/InteropXGateway.ts +0 -407
  68. package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -478
  69. package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
@@ -1,260 +0,0 @@
1
- import { BaseTask } from "../BaseTask";
2
- import Logger from '@/logger';
3
- import { BigNumber, ethers } from "ethers";
4
- import abi from "@/abi";
5
- import { Transaction } from "@/db";
6
- import { buildSignatureBytes, getContract, getRpcProviderUrl, Signature } from "@/utils";
7
- import { addresses } from "@/constants";
8
- import { ChainId } from "@/types";
9
- import config from "@/config";
10
- import { GnosisSafe, InteropXGateway } from "@/typechain";
11
- import { Op } from "sequelize";
12
- import wait from "waait";
13
- import { peerPool, protocol } from "@/net";
14
- import { LogDescription } from "ethers/lib/utils";
15
- import { buildGnosisAction } from "@/gnosis";
16
-
17
- const generateGnosisTransaction = async (transactionData: any, safeContract: GnosisSafe) => {
18
- console.log(transactionData);
19
-
20
- let isExecuted = await safeContract.dataHashes(
21
- await safeContract.getTransactionHash(
22
- transactionData.to,
23
- transactionData.value,
24
- transactionData.data,
25
- transactionData.operation,
26
- transactionData.safeTxGas,
27
- transactionData.baseGas,
28
- transactionData.gasPrice,
29
- transactionData.gasToken,
30
- transactionData.refundReceiver,
31
- transactionData.nonce
32
- )
33
- )
34
-
35
- while (isExecuted == 1) {
36
- transactionData.safeTxGas = BigNumber.from(String(transactionData.safeTxGas)).add(1).toString()
37
-
38
- isExecuted = await safeContract.dataHashes(
39
- await safeContract.getTransactionHash(
40
- transactionData.to,
41
- transactionData.value,
42
- transactionData.data,
43
- transactionData.operation,
44
- transactionData.safeTxGas,
45
- transactionData.baseGas,
46
- transactionData.gasPrice,
47
- transactionData.gasToken,
48
- transactionData.refundReceiver,
49
- transactionData.nonce
50
- )
51
- )
52
- }
53
-
54
- return transactionData
55
- }
56
-
57
- class ProcessDepositEvents extends BaseTask {
58
- contractAddress: string;
59
- provider: ethers.providers.JsonRpcProvider;
60
- contract: InteropXGateway;
61
- chainId: ChainId;
62
- leadNodeOnly = true
63
-
64
- constructor({ chainId }: { chainId: ChainId }) {
65
- super({
66
- logger: new Logger("InteropXGateway::ProcessDepositEvents"),
67
- })
68
- this.chainId = chainId;
69
- }
70
-
71
- async pollHandler() {
72
- const blockNumber = await this.provider.getBlockNumber()
73
-
74
- const transaction = await Transaction.findOne({
75
- where: {
76
- status: 'pending',
77
- sourceStatus: 'success',
78
- targetStatus: 'uninitialised',
79
- action: 'deposit',
80
- sourceCreatedAt: {
81
- [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
82
- },
83
- targetDelayUntil: {
84
- [Op.or]: {
85
- [Op.is]: null,
86
- [Op.lt]: new Date(),
87
- }
88
- },
89
- sourceBlockNumber: {
90
- [Op.lt]: blockNumber - 12,
91
- },
92
- sourceChainId: this.chainId,
93
- }
94
- })
95
-
96
- if (!transaction) {
97
- return;
98
- }
99
-
100
- console.log(`Processing transaction ${transaction.transactionHash}`);
101
-
102
- transaction.targetStatus = 'pending';
103
- await transaction.save();
104
-
105
- // refresh event data?
106
-
107
- const targetChainProvider = new ethers.providers.JsonRpcProvider(
108
- getRpcProviderUrl(transaction.targetChainId as ChainId)
109
- );
110
-
111
- const targetWallet = new ethers.Wallet(config.privateKey!, targetChainProvider);
112
-
113
- const safeAddress = addresses[transaction.targetChainId].gnosisSafe;
114
-
115
-
116
- const safeContract = getContract<GnosisSafe>(
117
- safeAddress,
118
- abi.gnosisSafe,
119
- targetWallet
120
- )
121
-
122
- const ownersThreshold = await safeContract.getThreshold();
123
- await wait(10000);
124
-
125
- let data, logs = [];
126
-
127
- try {
128
- ({ data, logs } = await buildGnosisAction(transaction));
129
-
130
- } catch (error) {
131
- console.log(error);
132
- transaction.targetStatus = 'failed';
133
- transaction.targetErrors = [error.message];
134
- transaction.status = 'failed'
135
- await transaction.save();
136
- protocol.sendTransaction(transaction)
137
- return;
138
- }
139
-
140
- let gnosisTx = await generateGnosisTransaction({
141
- baseGas: "0",
142
- data,
143
- gasPrice: "0",
144
- gasToken: "0x0000000000000000000000000000000000000000",
145
- nonce: '0',
146
- operation: "1",
147
- refundReceiver: "0x0000000000000000000000000000000000000000",
148
- safeAddress: safeAddress,
149
- safeTxGas: "79668",
150
- to: addresses[transaction.targetChainId].multisend,
151
- value: "0",
152
- }, safeContract);
153
-
154
- const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
155
-
156
- const ownerPeerIds = peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id)
157
-
158
- console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
159
-
160
- console.log(ownerPeerIds);
161
-
162
- const signatures = await protocol.requestSignatures({
163
- type: 'source',
164
- transactionHash: transaction.transactionHash,
165
- safeTxGas: gnosisTx.safeTxGas,
166
- safeNonce: gnosisTx.nonce
167
- }, ownerPeerIds)
168
-
169
-
170
- const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x') as Signature[];
171
-
172
- console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
173
-
174
- if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
175
- await transaction.save();
176
- transaction.targetDelayUntil = new Date(Date.now() + 30 * 1000);
177
- transaction.targetStatus = 'uninitialised'
178
-
179
- await transaction.save();
180
- const errorMessage = signatures.find(s => !!s.error)?.error;
181
- throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
182
- }
183
-
184
-
185
- console.log(`Executing transaction for execution ${transaction.transactionHash}`)
186
-
187
- const { data: txData } = await safeContract.populateTransaction.execTransaction(
188
- gnosisTx.to,
189
- gnosisTx.value,
190
- gnosisTx.data,
191
- gnosisTx.operation,
192
- gnosisTx.safeTxGas,
193
- gnosisTx.baseGas,
194
- gnosisTx.gasPrice,
195
- gnosisTx.gasToken,
196
- gnosisTx.refundReceiver,
197
- buildSignatureBytes(validSignatures)
198
- );
199
-
200
- console.log({
201
- from: targetWallet.address,
202
- gasPrice: BigNumber.from(120 * 10 ** 9).toString(),
203
- to: safeAddress,
204
- data: txData,
205
- })
206
-
207
-
208
- const txSent = await targetWallet.sendTransaction({
209
- from: targetWallet.address,
210
- gasPrice: BigNumber.from(120 * 10 ** 9),
211
- to: safeAddress,
212
- data: txData,
213
- })
214
-
215
- const receipt = await txSent.wait();
216
-
217
- const parsedLogs: LogDescription[] = [];
218
-
219
- receipt.logs.forEach((log) => {
220
- try {
221
- parsedLogs.push(safeContract.interface.parseLog(log));
222
- } catch (e) { }
223
- });
224
-
225
- if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
226
- console.log('ExecutionSuccess')
227
- transaction.targetStatus = 'success'
228
- transaction.targetTransactionHash = txSent.hash
229
- transaction.targetLogs = logs;
230
- transaction.status = 'success'
231
- await transaction.save();
232
- } else {
233
- console.log('ExecutionFailure')
234
- transaction.targetStatus = 'failed'
235
- transaction.targetTransactionHash = txSent.hash
236
- transaction.status = 'failed'
237
- await transaction.save();
238
- }
239
-
240
- protocol.sendTransaction(transaction)
241
- }
242
-
243
- async start(): Promise<void> {
244
- this.contractAddress = addresses[this.chainId].interopXGateway;
245
-
246
- this.provider = new ethers.providers.JsonRpcProvider(
247
- getRpcProviderUrl(this.chainId)
248
- );
249
-
250
- this.contract = getContract<InteropXGateway>(
251
- this.contractAddress,
252
- abi.interopXGateway,
253
- new ethers.Wallet(config.privateKey!, this.provider)
254
- );
255
-
256
- await super.start()
257
- }
258
- }
259
-
260
- export default ProcessDepositEvents;
@@ -1,124 +0,0 @@
1
- import { BaseTask } from "../BaseTask";
2
- import Logger from '@/logger';
3
- import { ethers } from "ethers";
4
- import abi from "@/abi";
5
- import { Transaction } from "@/db";
6
- import { generateInteropTransactionHash, getContract, getRpcProviderUrl } from "@/utils";
7
- import { addresses } from "@/constants";
8
- import { ChainId } from "@/types";
9
- import config from "@/config";
10
- import { InteropXGateway } from "@/typechain";
11
-
12
- class SyncDepositEvents extends BaseTask {
13
- contractAddress: string;
14
- provider: ethers.providers.JsonRpcProvider;
15
- contract: InteropXGateway;
16
- chainId: ChainId;
17
-
18
- constructor({ chainId }: { chainId: ChainId }) {
19
- super({
20
- logger: new Logger("InteropXGateway::SyncDepositEvents"),
21
- })
22
- this.chainId = chainId;
23
- }
24
-
25
- async pollHandler() {
26
- const currentBlock = await this.provider.getBlockNumber();
27
-
28
- const events = await this.contract.queryFilter(
29
- this.contract.filters.LogGatewayDeposit(),
30
- currentBlock - 2000,
31
- currentBlock,
32
- );
33
-
34
- let processedEvents = 0;
35
-
36
- for (const event of events) {
37
-
38
- try {
39
- if (!event.args) {
40
- continue;
41
- }
42
-
43
- const { sourceChainId, targetChainId, user, vnonce, amount, token } = event.args;
44
-
45
- const uniqueIdentifier = {
46
- action: 'deposit',
47
- submitTransactionHash: event.transactionHash,
48
- sourceChainId: sourceChainId,
49
- targetChainId: targetChainId,
50
- }
51
-
52
- if (await Transaction.findOne({ where: uniqueIdentifier })) {
53
- continue;
54
- }
55
-
56
- const tx = await event.getTransaction()
57
-
58
- await Transaction.create({
59
- ...uniqueIdentifier,
60
- transactionHash: generateInteropTransactionHash(uniqueIdentifier),
61
- from: tx.from,
62
- to: user,
63
-
64
-
65
- submitTransactionHash: event.transactionHash,
66
- submitBlockNumber: event.blockNumber,
67
-
68
- // submit & source are the same
69
- sourceTransactionHash: event.transactionHash,
70
- sourceBlockNumber: event.blockNumber,
71
- sourceStatus: "success",
72
-
73
- targetStatus: "uninitialised",
74
-
75
- submitEvent: {
76
- user,
77
- sourceChainId: sourceChainId.toString(),
78
- targetChainId: targetChainId.toString(),
79
- token: token,
80
- amount: amount.toString(),
81
- vnonce: vnonce.toString(),
82
- },
83
-
84
- sourceEvent: {
85
- user,
86
- sourceChainId: sourceChainId.toString(),
87
- targetChainId: targetChainId.toString(),
88
- token: token,
89
- amount: amount.toString(),
90
- vnonce: vnonce.toString(),
91
- },
92
- status: "pending",
93
- })
94
-
95
- this.logger.info(
96
- `Deposit queued: ${event.transactionHash} ${event.blockNumber}`
97
- );
98
- } catch (error) {
99
- this.logger.error(error);
100
- }
101
- }
102
-
103
- if (processedEvents > 0)
104
- this.logger.info(`${processedEvents} events processed`);
105
- }
106
-
107
- async start(): Promise<void> {
108
- this.contractAddress = addresses[this.chainId].interopXGateway;
109
-
110
- this.provider = new ethers.providers.JsonRpcProvider(
111
- getRpcProviderUrl(this.chainId)
112
- );
113
-
114
- this.contract = getContract<InteropXGateway>(
115
- this.contractAddress,
116
- abi.interopXGateway,
117
- new ethers.Wallet(config.privateKey!, this.provider)
118
- );
119
-
120
- await super.start()
121
- }
122
- }
123
-
124
- export default SyncDepositEvents;
@@ -1,105 +0,0 @@
1
- import { BaseTask } from "../BaseTask";
2
- import Logger from '@/logger';
3
- import { ethers } from "ethers";
4
- import abi from "@/abi";
5
- import { Transaction } from "@/db";
6
- import { getContract, getRpcProviderUrl } from "@/utils";
7
- import { addresses } from "@/constants";
8
- import { ChainId } from "@/types";
9
- import config from "@/config";
10
- import { InteropXGateway } from "@/typechain";
11
-
12
- class SyncWithdrawEvents extends BaseTask {
13
- contractAddress: string;
14
- provider: ethers.providers.JsonRpcProvider;
15
- contract: InteropXGateway;
16
- chainId: ChainId;
17
-
18
- constructor({ chainId }: { chainId: ChainId }) {
19
- super({
20
- logger: new Logger("InteropXGateway::SyncWithdrawEvents"),
21
- })
22
- this.chainId = chainId;
23
- }
24
-
25
- async pollHandler() {
26
- const currentBlock = await this.provider.getBlockNumber();
27
-
28
- const events = await this.contract.queryFilter(
29
- this.contract.filters.LogGatewayWithdraw(),
30
- currentBlock - 500,
31
- currentBlock,
32
- );
33
-
34
- let processedEvents = 0;
35
-
36
- for (const event of events) {
37
-
38
- try {
39
- if (!event.args) {
40
- continue;
41
- }
42
-
43
- const { user, token, amount, sourceChainId, targetChainId, transactionHash } = event.args;
44
-
45
- const uniqueIdentifier = {
46
- action: 'withdraw',
47
- submitTransactionHash: transactionHash,
48
- sourceChainId: sourceChainId,
49
- targetChainId: targetChainId,
50
-
51
- targetEvent: null
52
- }
53
- const transaction = await Transaction.findOne({ where: uniqueIdentifier });
54
-
55
- if (!transaction) {
56
- return;
57
- }
58
-
59
- const tx = await event.getTransaction()
60
-
61
- transaction.targetStatus = 'success'
62
- transaction.targetErrors = []
63
- transaction.targetTransactionHash = tx.hash
64
- transaction.targetEvent = {
65
- user,
66
- token,
67
- amount: amount.toString(),
68
- sourceChainId,
69
- targetChainId,
70
- transactionHash,
71
- }
72
- transaction.status = 'success'
73
-
74
- await transaction.save()
75
-
76
- this.logger.info(
77
- `Witdraw confirmation received: ${transaction.transactionHash} `
78
- );
79
- } catch (error) {
80
- this.logger.error(error);
81
- }
82
- }
83
-
84
- if (processedEvents > 0)
85
- this.logger.info(`${processedEvents} events processed`);
86
- }
87
-
88
- async start(): Promise<void> {
89
- this.contractAddress = addresses[this.chainId].interopXGateway;
90
-
91
- this.provider = new ethers.providers.JsonRpcProvider(
92
- getRpcProviderUrl(this.chainId)
93
- );
94
-
95
- this.contract = getContract<InteropXGateway>(
96
- this.contractAddress,
97
- abi.interopXGateway,
98
- new ethers.Wallet(config.privateKey!, this.provider)
99
- );
100
-
101
- await super.start()
102
- }
103
- }
104
-
105
- export default SyncWithdrawEvents;