@instadapp/interop-x 0.0.0-dev.80722d6 → 0.0.0-dev.8965b57

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. package/bin/interop-x +1 -1
  2. package/dist/package.json +73 -0
  3. package/dist/{abi → src/abi}/erc20.json +0 -0
  4. package/dist/{abi → src/abi}/gnosisSafe.json +0 -0
  5. package/dist/{abi → src/abi}/index.js +2 -4
  6. package/dist/src/abi/interopXContract.json +391 -0
  7. package/dist/src/alias.js +10 -0
  8. package/dist/src/api/index.js +36 -0
  9. package/dist/{config → src/config}/index.js +11 -1
  10. package/dist/{constants → src/constants}/addresses.js +3 -11
  11. package/dist/{constants → src/constants}/index.js +0 -0
  12. package/dist/{constants → src/constants}/tokens.js +31 -1
  13. package/dist/{db → src/db}/index.js +0 -0
  14. package/dist/{db → src/db}/models/index.js +0 -0
  15. package/dist/{db → src/db}/models/transaction.js +27 -9
  16. package/dist/{db → src/db}/sequelize.js +0 -0
  17. package/dist/src/gnosis/actions/index.js +9 -0
  18. package/dist/src/gnosis/actions/withdraw/index.js +55 -0
  19. package/dist/src/gnosis/index.js +20 -0
  20. package/dist/src/index.js +119 -0
  21. package/dist/{logger → src/logger}/index.js +0 -0
  22. package/dist/{net → src/net}/index.js +0 -0
  23. package/dist/{net → src/net}/peer/index.js +8 -3
  24. package/dist/{net → src/net}/pool/index.js +32 -9
  25. package/dist/{net → src/net}/protocol/dial/BaseDialProtocol.js +0 -0
  26. package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js +21 -12
  27. package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +30 -0
  28. package/dist/{net → src/net}/protocol/index.js +51 -1
  29. package/dist/src/tasks/AutoUpdateTask.js +70 -0
  30. package/dist/{tasks → src/tasks}/BaseTask.js +12 -4
  31. package/dist/src/tasks/InteropXContract/ProcessBridgeRequestEvents.js +152 -0
  32. package/dist/src/tasks/InteropXContract/SyncBridgeRequestEvents.js +77 -0
  33. package/dist/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.js +89 -0
  34. package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +55 -0
  35. package/dist/src/tasks/index.js +38 -0
  36. package/dist/{typechain → src/typechain}/Erc20.js +0 -0
  37. package/dist/{typechain → src/typechain}/GnosisSafe.js +0 -0
  38. package/dist/{typechain/InteropBridgeToken.js → src/typechain/InteropXContract.js} +0 -0
  39. package/dist/{typechain → src/typechain}/common.js +0 -0
  40. package/dist/{typechain → src/typechain}/factories/Erc20__factory.js +0 -0
  41. package/dist/{typechain → src/typechain}/factories/GnosisSafe__factory.js +0 -0
  42. package/dist/src/typechain/factories/InteropXContract__factory.js +526 -0
  43. package/dist/src/typechain/factories/index.js +12 -0
  44. package/dist/{typechain → src/typechain}/index.js +3 -5
  45. package/dist/{types.js → src/types.js} +0 -0
  46. package/dist/src/utils/index.js +168 -0
  47. package/package.json +13 -6
  48. package/patches/@ethersproject+properties+5.6.0.patch +13 -0
  49. package/src/abi/index.ts +2 -4
  50. package/src/abi/interopXContract.json +391 -0
  51. package/src/alias.ts +6 -0
  52. package/src/api/index.ts +36 -0
  53. package/src/config/index.ts +11 -1
  54. package/src/constants/addresses.ts +3 -11
  55. package/src/constants/tokens.ts +32 -2
  56. package/src/db/models/transaction.ts +68 -25
  57. package/src/gnosis/actions/index.ts +5 -0
  58. package/src/gnosis/actions/withdraw/index.ts +76 -0
  59. package/src/gnosis/index.ts +19 -0
  60. package/src/index.ts +101 -24
  61. package/src/net/peer/index.ts +9 -7
  62. package/src/net/pool/index.ts +41 -11
  63. package/src/net/protocol/dial/SignatureDialProtocol.ts +23 -13
  64. package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +33 -0
  65. package/src/net/protocol/index.ts +67 -1
  66. package/src/tasks/AutoUpdateTask.ts +82 -0
  67. package/src/tasks/BaseTask.ts +14 -4
  68. package/src/tasks/InteropXContract/ProcessBridgeRequestEvents.ts +216 -0
  69. package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts +114 -0
  70. package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts +120 -0
  71. package/src/tasks/Transactions/SyncTransactionStatusTask.ts +67 -0
  72. package/src/tasks/index.ts +24 -5
  73. package/src/typechain/InteropXContract.ts +524 -0
  74. package/src/typechain/factories/InteropXContract__factory.ts +533 -0
  75. package/src/typechain/factories/index.ts +1 -2
  76. package/src/typechain/index.ts +2 -4
  77. package/src/utils/index.ts +119 -8
  78. package/tsconfig.json +7 -2
  79. package/dist/abi/interopBridgeToken.json +0 -286
  80. package/dist/abi/interopXGateway.json +0 -184
  81. package/dist/index.js +0 -63
  82. package/dist/tasks/InteropXGateway/SyncDepositEvents.js +0 -79
  83. package/dist/tasks/index.js +0 -27
  84. package/dist/typechain/InteropXGateway.js +0 -2
  85. package/dist/typechain/factories/InteropBridgeToken__factory.js +0 -459
  86. package/dist/typechain/factories/InteropXGateway__factory.js +0 -265
  87. package/dist/typechain/factories/index.js +0 -14
  88. package/dist/utils/index.js +0 -101
  89. package/src/abi/interopBridgeToken.json +0 -286
  90. package/src/abi/interopXGateway.json +0 -184
  91. package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -114
  92. package/src/typechain/InteropBridgeToken.ts +0 -686
  93. package/src/typechain/InteropXGateway.ts +0 -407
  94. package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -466
  95. package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
@@ -0,0 +1,114 @@
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 { InteropXContract } from "@/typechain";
11
+
12
+ class SyncBridgeRequestEvents extends BaseTask {
13
+ contractAddress: string;
14
+ provider: ethers.providers.JsonRpcProvider;
15
+ contract: InteropXContract;
16
+ chainId: ChainId;
17
+
18
+ constructor({ chainId }: { chainId: ChainId }) {
19
+ super({
20
+ logger: new Logger("InteropXContract::SyncBridgeRequestEvents"),
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.LogBridgeRequest(),
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 { bridger, position, sourceChainId, targetChainId, metadata } = event.args;
44
+
45
+ const uniqueIdentifier = {
46
+ action: 'withdraw', //todo
47
+ bridger,
48
+ requestTransactionHash: event.transactionHash,
49
+ sourceChainId: sourceChainId.toNumber(),
50
+ targetChainId: targetChainId.toNumber(),
51
+ }
52
+
53
+ let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
54
+
55
+ const transaction = await Transaction.findOne({ where: { transactionHash } });
56
+
57
+ if (transaction) {
58
+ continue;
59
+ }
60
+
61
+ await Transaction.create({
62
+ transactionHash,
63
+ ...uniqueIdentifier,
64
+ requestBlockNumber: event.blockNumber,
65
+ requestEvent: {
66
+ bridger,
67
+ position: {
68
+ withdraw: position.withdraw.map((v) => ({
69
+ sourceToken: v.sourceToken,
70
+ targetToken: v.targetToken,
71
+ amount: v.amount.toString()
72
+ })),
73
+ supply: position.supply.map((v) => ({
74
+ sourceToken: v.sourceToken,
75
+ targetToken: v.targetToken,
76
+ amount: v.amount.toString()
77
+ })),
78
+ },
79
+ sourceChainId: sourceChainId.toNumber(),
80
+ targetChainId: targetChainId.toNumber(),
81
+ metadata,
82
+ }
83
+ })
84
+
85
+ this.logger.info(
86
+ `New bridge request received: ${transactionHash} `
87
+ );
88
+ } catch (error) {
89
+ this.logger.error(error);
90
+ }
91
+ }
92
+
93
+ if (processedEvents > 0)
94
+ this.logger.info(`${processedEvents} events processed`);
95
+ }
96
+
97
+ async start(): Promise<void> {
98
+ this.contractAddress = addresses[this.chainId].interopXContract;
99
+
100
+ this.provider = new ethers.providers.JsonRpcProvider(
101
+ getRpcProviderUrl(this.chainId)
102
+ );
103
+
104
+ this.contract = getContract<InteropXContract>(
105
+ this.contractAddress,
106
+ abi.interopXContract,
107
+ new ethers.Wallet(config.privateKey!, this.provider)
108
+ );
109
+
110
+ await super.start()
111
+ }
112
+ }
113
+
114
+ export default SyncBridgeRequestEvents;
@@ -0,0 +1,120 @@
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 { InteropXContract } from "@/typechain";
11
+ import { Op } from "sequelize";
12
+
13
+ class SyncBridgeRequestSentEvents extends BaseTask {
14
+ contractAddress: string;
15
+ provider: ethers.providers.JsonRpcProvider;
16
+ contract: InteropXContract;
17
+ chainId: ChainId;
18
+
19
+ constructor({ chainId }: { chainId: ChainId }) {
20
+ super({
21
+ logger: new Logger("InteropXContract::SyncBridgeRequestSentEvents"),
22
+ })
23
+ this.chainId = chainId;
24
+ }
25
+
26
+ async pollHandler() {
27
+ const currentBlock = await this.provider.getBlockNumber();
28
+
29
+ const events = await this.contract.queryFilter(
30
+ this.contract.filters.LogBridgeRequestSent(),
31
+ currentBlock - 2000,
32
+ currentBlock,
33
+ );
34
+
35
+ let processedEvents = 0;
36
+
37
+ for (const event of events) {
38
+
39
+ try {
40
+ if (!event.args) {
41
+ continue;
42
+ }
43
+
44
+ const { bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
45
+
46
+ const uniqueIdentifier = {
47
+ action: 'withdraw',
48
+ bridger,
49
+ requestTransactionHash,
50
+ sourceChainId: sourceChainId,
51
+ targetChainId: targetChainId,
52
+ }
53
+
54
+ let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
55
+
56
+ const transaction = await Transaction.findOne({
57
+ where: {
58
+ transactionHash, sourceStatus: {
59
+ [Op.ne]: 'success',
60
+ }
61
+ }
62
+ });
63
+
64
+ if (!transaction) {
65
+ continue;
66
+ }
67
+ transaction.sourceStatus = 'success'
68
+ transaction.sourceBlockNumber = event.blockNumber;
69
+ transaction.sourceTransactionHash = event.transactionHash
70
+ transaction.requestSentEvent = {
71
+ bridger,
72
+ position: {
73
+ withdraw: position.withdraw.map((v) => ({
74
+ sourceToken: v.sourceToken,
75
+ targetToken: v.targetToken,
76
+ amount: v.amount.toString()
77
+ })),
78
+ supply: position.supply.map((v) => ({
79
+ sourceToken: v.sourceToken,
80
+ targetToken: v.targetToken,
81
+ amount: v.amount.toString()
82
+ })),
83
+ },
84
+ sourceChainId: sourceChainId,
85
+ targetChainId: targetChainId,
86
+ metadata,
87
+ requestTransactionHash,
88
+ }
89
+ await transaction.save()
90
+
91
+ this.logger.info(
92
+ `New bridge request sent received: ${transactionHash} `
93
+ );
94
+ } catch (error) {
95
+ this.logger.error(error);
96
+ }
97
+ }
98
+
99
+ if (processedEvents > 0)
100
+ this.logger.info(`${processedEvents} events processed`);
101
+ }
102
+
103
+ async start(): Promise<void> {
104
+ this.contractAddress = addresses[this.chainId].interopXContract;
105
+
106
+ this.provider = new ethers.providers.JsonRpcProvider(
107
+ getRpcProviderUrl(this.chainId)
108
+ );
109
+
110
+ this.contract = getContract<InteropXContract>(
111
+ this.contractAddress,
112
+ abi.interopXContract,
113
+ new ethers.Wallet(config.privateKey!, this.provider)
114
+ );
115
+
116
+ await super.start()
117
+ }
118
+ }
119
+
120
+ export default SyncBridgeRequestSentEvents;
@@ -0,0 +1,67 @@
1
+ import { BaseTask } from "../BaseTask";
2
+ import Logger from '@/logger';
3
+ import config from "@/config";
4
+ import { peerPool, protocol } from "@/net";
5
+ import { Transaction } from "@/db";
6
+ import { Op } from "sequelize";
7
+
8
+ class SyncTransactionStatusTask extends BaseTask {
9
+ pollIntervalMs: number = 60 * 1000
10
+ exceptLeadNode: boolean = true;
11
+
12
+ constructor() {
13
+ super({
14
+ logger: new Logger("SyncTransactionStatusTask"),
15
+ })
16
+ }
17
+
18
+ async pollHandler() {
19
+ // if transaction is pending for more than 1 hour, check lead node for status
20
+ const leadNode = peerPool.getLeadPeer();
21
+
22
+ if (!leadNode) {
23
+ return;
24
+ }
25
+
26
+ const transaction = await Transaction.findOne({
27
+ where: {
28
+ status: 'pending',
29
+ sourceCreatedAt: {
30
+ [Op.gte]: new Date(Date.now() - 60 * 60 * 1000),
31
+ },
32
+ }
33
+ })
34
+
35
+ if (!transaction) {
36
+ return;
37
+ }
38
+
39
+ this.logger.info(`Requesting transaction status for ${transaction.transactionHash}`)
40
+
41
+ const transactionStatus = await protocol.requestTransactionStatus(transaction.transactionHash, leadNode.id);
42
+
43
+ if (!transactionStatus) {
44
+ return;
45
+ }
46
+
47
+ this.logger.info(`Received transaction status for ${transaction.transactionHash}`)
48
+
49
+ transaction.sourceStatus = transactionStatus.sourceStatus
50
+ transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash
51
+ transaction.sourceErrors = transactionStatus.sourceErrors
52
+ transaction.sourceLogs = transactionStatus.sourceLogs
53
+
54
+ transaction.targetStatus = transactionStatus.targetStatus
55
+ transaction.targetTransactionHash = transactionStatus.targetTransactionHash
56
+ transaction.targetErrors = transactionStatus.targetErrors
57
+ transaction.targetLogs = transactionStatus.targetLogs
58
+
59
+ transaction.status = transactionStatus.status
60
+
61
+ await transaction.save()
62
+
63
+ this.logger.info(`Updated transaction status for ${transaction.transactionHash}`)
64
+ }
65
+ }
66
+
67
+ export default SyncTransactionStatusTask;
@@ -1,18 +1,37 @@
1
1
  import { BaseTask } from "./BaseTask";
2
- import SyncInteropXGatewayDepositEvents from "./InteropXGateway/SyncDepositEvents";
2
+ import wait from "waait";
3
+
4
+ import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
5
+
6
+ import AutoUpdateTask from "./AutoUpdateTask";
7
+
8
+ import SyncBridgeRequestEvents from "./InteropXContract/SyncBridgeRequestEvents";
9
+ import ProccessBridgeRequestEvents from "./InteropXContract/ProcessBridgeRequestEvents";
10
+ import SyncBridgeRequestSentEvents from "./InteropXContract/SyncBridgeRequestSentEvents";
3
11
 
4
12
  export class Tasks {
5
-
13
+
6
14
  tasks: BaseTask[] = [
7
- new SyncInteropXGatewayDepositEvents({
8
- chainId: 43114
9
- })
15
+ // new SyncTransactionStatusTask(),
16
+ new AutoUpdateTask(),
17
+
18
+ // InteropXContract
19
+
20
+ new SyncBridgeRequestEvents({ chainId: 137 }),
21
+ new SyncBridgeRequestEvents({ chainId: 43114 }),
22
+
23
+ new SyncBridgeRequestSentEvents({ chainId: 137 }),
24
+ new SyncBridgeRequestSentEvents({ chainId: 43114 }),
25
+
26
+ new ProccessBridgeRequestEvents({ chainId: 137 }),
27
+ new ProccessBridgeRequestEvents({ chainId: 43114 }),
10
28
  ];
11
29
 
12
30
  async start() {
13
31
  for (const task of this.tasks) {
14
32
  try {
15
33
  task.start();
34
+ await wait(1000)
16
35
  } catch (error) {
17
36
  console.error(`Error starting task: ${task.constructor.name}`);
18
37
  }