@instadapp/interop-x 0.0.0-dev.1abc1ca → 0.0.0-dev.1f933be

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/bin/interop-x +1 -1
  2. package/dist/package.json +10 -6
  3. package/dist/src/abi/index.js +2 -4
  4. package/dist/src/abi/interopXContract.json +391 -0
  5. package/dist/src/alias.js +10 -0
  6. package/dist/src/api/index.js +6 -3
  7. package/dist/src/config/index.js +11 -1
  8. package/dist/src/constants/addresses.js +3 -3
  9. package/dist/src/constants/index.js +0 -1
  10. package/dist/src/db/models/transaction.js +27 -9
  11. package/dist/src/gnosis/actions/index.js +9 -0
  12. package/dist/src/gnosis/actions/withdraw/index.js +41 -0
  13. package/dist/src/gnosis/index.js +20 -0
  14. package/dist/src/index.js +75 -24
  15. package/dist/src/net/peer/index.js +8 -3
  16. package/dist/src/net/pool/index.js +32 -9
  17. package/dist/src/net/protocol/dial/SignatureDialProtocol.js +10 -4
  18. package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +30 -0
  19. package/dist/src/net/protocol/index.js +51 -1
  20. package/dist/src/tasks/AutoUpdateTask.js +70 -0
  21. package/dist/src/tasks/BaseTask.js +12 -4
  22. package/dist/src/tasks/InteropXContract/ProcessBridgeRequestEvents.js +147 -0
  23. package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js +78 -0
  24. package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +55 -0
  25. package/dist/src/tasks/index.js +12 -4
  26. package/dist/src/typechain/{InteropBridgeToken.js → InteropXContract.js} +0 -0
  27. package/dist/src/typechain/factories/InteropXContract__factory.js +526 -0
  28. package/dist/src/typechain/factories/index.js +3 -5
  29. package/dist/src/typechain/index.js +3 -5
  30. package/dist/src/utils/index.js +69 -38
  31. package/package.json +10 -6
  32. package/patches/@ethersproject+properties+5.6.0.patch +13 -0
  33. package/src/abi/index.ts +2 -4
  34. package/src/abi/interopXContract.json +391 -0
  35. package/src/alias.ts +6 -0
  36. package/src/api/index.ts +5 -2
  37. package/src/config/index.ts +11 -1
  38. package/src/constants/addresses.ts +3 -3
  39. package/src/constants/index.ts +0 -1
  40. package/src/db/models/transaction.ts +59 -21
  41. package/src/gnosis/actions/index.ts +5 -0
  42. package/src/gnosis/actions/withdraw/index.ts +56 -0
  43. package/src/gnosis/index.ts +19 -0
  44. package/src/index.ts +96 -26
  45. package/src/net/peer/index.ts +9 -7
  46. package/src/net/pool/index.ts +41 -11
  47. package/src/net/protocol/dial/SignatureDialProtocol.ts +12 -6
  48. package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +33 -0
  49. package/src/net/protocol/index.ts +67 -1
  50. package/src/tasks/AutoUpdateTask.ts +82 -0
  51. package/src/tasks/BaseTask.ts +14 -4
  52. package/src/tasks/InteropXContract/ProcessBridgeRequestEvents.ts +211 -0
  53. package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts +116 -0
  54. package/src/tasks/Transactions/SyncTransactionStatusTask.ts +67 -0
  55. package/src/tasks/index.ts +19 -5
  56. package/src/typechain/InteropXContract.ts +524 -0
  57. package/src/typechain/factories/InteropXContract__factory.ts +533 -0
  58. package/src/typechain/factories/index.ts +1 -2
  59. package/src/typechain/index.ts +2 -4
  60. package/src/utils/index.ts +109 -54
  61. package/tsconfig.json +7 -2
  62. package/dist/src/abi/interopBridgeToken.json +0 -286
  63. package/dist/src/abi/interopXGateway.json +0 -184
  64. package/dist/src/constants/itokens.js +0 -13
  65. package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +0 -140
  66. package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -75
  67. package/dist/src/typechain/InteropXGateway.js +0 -2
  68. package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -459
  69. package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
  70. package/src/abi/interopBridgeToken.json +0 -286
  71. package/src/abi/interopXGateway.json +0 -184
  72. package/src/constants/itokens.ts +0 -10
  73. package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +0 -232
  74. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -126
  75. package/src/typechain/InteropBridgeToken.ts +0 -686
  76. package/src/typechain/InteropXGateway.ts +0 -407
  77. package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -466
  78. package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
@@ -1,232 +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 { buildDataForTransaction, buildSignatureBytes, 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
-
16
- const generateGnosisTransaction = async (transactionData: any, safeContract: any) => {
17
- let isExecuted = await safeContract.dataHashes(
18
- await safeContract.getTransactionHash(
19
- transactionData.to,
20
- transactionData.value,
21
- transactionData.data,
22
- transactionData.operation,
23
- transactionData.safeTxGas,
24
- transactionData.baseGas,
25
- transactionData.gasPrice,
26
- transactionData.gasToken,
27
- transactionData.refundReceiver,
28
- transactionData.nonce
29
- )
30
- )
31
-
32
- while (isExecuted == 1) {
33
- transactionData.safeTxGas = BigNumber.from(String(transactionData.safeTxGas)).add(1).toString()
34
-
35
- isExecuted = await safeContract.dataHashes(
36
- await safeContract.getTransactionHash(
37
- transactionData.to,
38
- transactionData.value,
39
- transactionData.data,
40
- transactionData.operation,
41
- transactionData.safeTxGas,
42
- transactionData.baseGas,
43
- transactionData.gasPrice,
44
- transactionData.gasToken,
45
- transactionData.refundReceiver,
46
- transactionData.nonce
47
- )
48
- )
49
- }
50
-
51
- return transactionData
52
- }
53
-
54
- class ProcessDepositEvents extends BaseTask {
55
- contractAddress: string;
56
- provider: ethers.providers.JsonRpcProvider;
57
- contract: InteropXGateway;
58
- chainId: ChainId;
59
- leadNodeOnly = true
60
-
61
- constructor({ chainId }: { chainId: ChainId }) {
62
- super({
63
- logger: new Logger("InteropXGateway::ProcessDepositEvents"),
64
- })
65
- this.chainId = chainId;
66
- }
67
-
68
- async pollHandler() {
69
- const blockNumber = await this.provider.getBlockNumber()
70
-
71
- const transaction = await Transaction.findOne({
72
- where: {
73
- status: 'pending',
74
- sourceStatus: 'success',
75
- action: 'deposit',
76
- sourceCreatedAt: {
77
- [Op.gte]: new Date(Date.now() - 12 * 60 * 60 * 1000),
78
- },
79
- sourceBlockNumber: {
80
- [Op.lt]: blockNumber - 12,
81
- }
82
- }
83
- })
84
-
85
- if (!transaction) {
86
- return;
87
- }
88
-
89
-
90
- transaction.sourceStatus = 'pending';
91
- await transaction.save();
92
-
93
-
94
- // refresh event data?
95
-
96
- const targetChainProvider = new ethers.providers.JsonRpcProvider(
97
- getRpcProviderUrl(transaction.targetChainId as ChainId)
98
- );
99
-
100
- const targetWallet = new ethers.Wallet(config.privateKey!, targetChainProvider);
101
-
102
- const safeAddress = addresses[transaction.targetChainId].gnosisSafe;
103
-
104
- const safeContract = new ethers.Contract(
105
- safeAddress,
106
- abi.gnosisSafe,
107
- targetWallet
108
- ) as GnosisSafe;
109
-
110
- const ownersThreshold = await safeContract.getThreshold();
111
-
112
- await wait(10000);
113
-
114
- let gnosisTx = await generateGnosisTransaction({
115
- baseGas: "0",
116
- data: buildDataForTransaction(transaction),
117
- gasPrice: "0",
118
- gasToken: "0x0000000000000000000000000000000000000000",
119
- nonce: '0',
120
- operation: "1",
121
- refundReceiver: "0x0000000000000000000000000000000000000000",
122
- safeAddress: safeAddress,
123
- safeTxGas: "79668",
124
- to: addresses[transaction.targetChainId].multisend,
125
- value: "0",
126
- }, safeContract);
127
-
128
- const owners = await safeContract.getOwners().then(owners => owners.map(owner => owner.toLowerCase()));
129
-
130
- const ownerPeerIds = peerPool.activePeers.filter(peer => owners.includes(peer.publicAddress.toLowerCase())).map(peer => peer.id)
131
-
132
- console.log(`Collecting signatures for execution ${transaction.transactionHash}`)
133
-
134
- const signatures = await protocol.requestSignatures({
135
- type: 'source',
136
- transactionHash: transaction.transactionHash,
137
- safeTxGas: gnosisTx.safeTxGas,
138
- safeNonce: gnosisTx.nonce
139
- }, ownerPeerIds)
140
-
141
-
142
- const validSignatures = signatures.filter(s => !!s.data && s.data !== '0x') as Signature[];
143
-
144
- console.log({ signatures, validSignatures, ownersThreshold: ownersThreshold.toString() });
145
-
146
- if (validSignatures.length === 0 || ownersThreshold.gt(validSignatures.length)) {
147
- await transaction.save();
148
- transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
149
- transaction.sourceStatus = 'pending'
150
-
151
- await transaction.save();
152
- const errorMessage = signatures.find(s => !!s.error)?.error;
153
- throw new Error(`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : ''));
154
- }
155
-
156
- const execTransactionParams = [
157
- gnosisTx.to,
158
- gnosisTx.value,
159
- gnosisTx.data,
160
- gnosisTx.operation,
161
- gnosisTx.safeTxGas,
162
- gnosisTx.baseGas,
163
- gnosisTx.gasPrice,
164
- gnosisTx.gasToken,
165
- gnosisTx.refundReceiver,
166
- buildSignatureBytes(validSignatures),
167
- ];
168
-
169
- console.log(`Executing transaction for execution ${transaction.transactionHash}`)
170
-
171
- console.log({
172
- execTransactionParams
173
- })
174
-
175
- const { data: txData } = await safeContract.populateTransaction.execTransaction(
176
- gnosisTx.to,
177
- gnosisTx.value,
178
- gnosisTx.data,
179
- gnosisTx.operation,
180
- gnosisTx.safeTxGas,
181
- gnosisTx.baseGas,
182
- gnosisTx.gasPrice,
183
- gnosisTx.gasToken,
184
- gnosisTx.refundReceiver,
185
- buildSignatureBytes(validSignatures)
186
- );
187
-
188
- const txSent = await targetWallet.sendTransaction({
189
- from: targetWallet.address,
190
- gasPrice: BigNumber.from(120 * 10 ** 9),
191
- gasLimit: BigNumber.from(6_000_000),
192
- to: safeAddress,
193
- data: txData,
194
- })
195
-
196
- const receipt = await txSent.wait();
197
-
198
- const parsedLogs: LogDescription[] = [];
199
-
200
- receipt.logs.forEach((log) => {
201
- try {
202
- parsedLogs.push(safeContract.interface.parseLog(log));
203
- } catch (e) { }
204
- });
205
-
206
- if (parsedLogs.find(e => e.name === 'ExecutionSuccess')) {
207
- console.log('ExecutionSuccess')
208
- } else {
209
- console.log('ExecutionFailure')
210
- }
211
- }
212
-
213
- async start(): Promise<void> {
214
- this.logger.info(`Starting execution watcher on interop chain`);
215
-
216
- this.contractAddress = addresses[this.chainId].interopXGateway;
217
-
218
- this.provider = new ethers.providers.JsonRpcProvider(
219
- getRpcProviderUrl(this.chainId)
220
- );
221
-
222
- this.contract = new ethers.Contract(
223
- this.contractAddress,
224
- abi.interopXGateway,
225
- new ethers.Wallet(config.privateKey!, this.provider)
226
- ) as InteropXGateway;
227
-
228
- await super.start()
229
- }
230
- }
231
-
232
- export default ProcessDepositEvents;
@@ -1,126 +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, 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.toNumber(),
49
- targetChainId: targetChainId.toNumber(),
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
- ammout: amount.toString(),
81
- vnonce: vnonce.toString(),
82
- },
83
-
84
- sourceEvent: {
85
- user,
86
- sourceChainId: sourceChainId.toString(),
87
- targetChainId: targetChainId.toString(),
88
- token: token,
89
- ammout: amount.toString(),
90
- vnonce: vnonce.toString(),
91
- },
92
- status: "pending",
93
- })
94
-
95
- this.logger.info(
96
- `Execution 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.logger.info(`Starting execution watcher on interop chain`);
109
-
110
- this.contractAddress = addresses[this.chainId].interopXGateway;
111
-
112
- this.provider = new ethers.providers.JsonRpcProvider(
113
- getRpcProviderUrl(this.chainId)
114
- );
115
-
116
- this.contract = new ethers.Contract(
117
- this.contractAddress,
118
- abi.interopXGateway,
119
- new ethers.Wallet(config.privateKey!, this.provider)
120
- ) as InteropXGateway;
121
-
122
- await super.start()
123
- }
124
- }
125
-
126
- export default SyncDepositEvents;