@instadapp/interop-x 0.0.0-dev.edef11e → 0.0.0-dev.ee3d74b
Sign up to get free protection for your applications and to get access to all the features.
- package/.github/workflows/ci.yml +19 -0
- package/dist/package.json +15 -13
- package/dist/src/abi/connectors/index.js +36 -0
- package/dist/src/abi/connectors/v1/aave.js +148 -0
- package/dist/src/abi/connectors/v1/aave_claim.js +4 -0
- package/dist/src/abi/connectors/v1/aave_migrate.js +109 -0
- package/dist/src/abi/connectors/v1/aave_polygon_migrate.js +110 -0
- package/dist/src/abi/connectors/v1/aave_stake.js +4 -0
- package/dist/src/abi/connectors/v1/aave_v1_import.js +54 -0
- package/dist/src/abi/connectors/v1/aave_v2.js +230 -0
- package/dist/src/abi/connectors/v1/aave_v2_import.js +59 -0
- package/dist/src/abi/connectors/v1/authority.js +100 -0
- package/dist/src/abi/connectors/v1/basic.js +136 -0
- package/dist/src/abi/connectors/v1/chi.js +36 -0
- package/dist/src/abi/connectors/v1/comp.js +4 -0
- package/dist/src/abi/connectors/v1/compound.js +4 -0
- package/dist/src/abi/connectors/v1/compoundImport.js +69 -0
- package/dist/src/abi/connectors/v1/compoundImport_v2.js +4 -0
- package/dist/src/abi/connectors/v1/compound_old.js +448 -0
- package/dist/src/abi/connectors/v1/curve.js +140 -0
- package/dist/src/abi/connectors/v1/curve_claim.js +63 -0
- package/dist/src/abi/connectors/v1/curve_gauge.js +158 -0
- package/dist/src/abi/connectors/v1/curve_sbtc.js +140 -0
- package/dist/src/abi/connectors/v1/curve_susd.js +140 -0
- package/dist/src/abi/connectors/v1/curve_three.js +79 -0
- package/dist/src/abi/connectors/v1/curve_y.js +140 -0
- package/dist/src/abi/connectors/v1/dsa_migrate_v1_to_v2.js +4 -0
- package/dist/src/abi/connectors/v1/dydx.js +148 -0
- package/dist/src/abi/connectors/v1/dydx_flash.js +52 -0
- package/dist/src/abi/connectors/v1/fee.js +50 -0
- package/dist/src/abi/connectors/v1/gelato.js +1138 -0
- package/dist/src/abi/connectors/v1/index.js +58 -0
- package/dist/src/abi/connectors/v1/instapool.js +439 -0
- package/dist/src/abi/connectors/v1/instapool_v2.js +126 -0
- package/dist/src/abi/connectors/v1/kyber.js +117 -0
- package/dist/src/abi/connectors/v1/maker.js +480 -0
- package/dist/src/abi/connectors/v1/maker_old.js +300 -0
- package/dist/src/abi/connectors/v1/math.js +43 -0
- package/dist/src/abi/connectors/v1/migrate.js +46 -0
- package/dist/src/abi/connectors/v1/oasis.js +198 -0
- package/dist/src/abi/connectors/v1/oneInch.js +160 -0
- package/dist/src/abi/connectors/v1/polygon_bridge.js +4 -0
- package/dist/src/abi/connectors/v1/refinance.js +4 -0
- package/dist/src/abi/connectors/v1/staking.js +220 -0
- package/dist/src/abi/connectors/v1/swerve.js +179 -0
- package/dist/src/abi/connectors/v1/uniswap.js +297 -0
- package/dist/src/abi/connectors/v2/1INCH-A.js +4 -0
- package/dist/src/abi/connectors/v2/1INCH-B.js +4 -0
- package/dist/src/abi/connectors/v2/AAVE-CLAIM-A.js +4 -0
- package/dist/src/abi/connectors/v2/AAVE-CLAIM-B.js +166 -0
- package/dist/src/abi/connectors/v2/AAVE-STAKE-A.js +4 -0
- package/dist/src/abi/connectors/v2/AAVE-V1-A.js +130 -0
- package/dist/src/abi/connectors/v2/AAVE-V1-IMPORT-A.js +4 -0
- package/dist/src/abi/connectors/v2/AAVE-V2-A.js +230 -0
- package/dist/src/abi/connectors/v2/AAVE-V2-IMPORT-A.js +4 -0
- package/dist/src/abi/connectors/v2/AAVE-V2-IMPORT-B.js +225 -0
- package/dist/src/abi/connectors/v2/AUTHORITY-A.js +100 -0
- package/dist/src/abi/connectors/v2/B-COMPOUND-A.js +4 -0
- package/dist/src/abi/connectors/v2/B-LIQUITY-A.js +4 -0
- package/dist/src/abi/connectors/v2/B-MAKERDAO-A.js +4 -0
- package/dist/src/abi/connectors/v2/BASIC-A.js +136 -0
- package/dist/src/abi/connectors/v2/BASIC-B.js +4 -0
- package/dist/src/abi/connectors/v2/BASIC-C.js +4 -0
- package/dist/src/abi/connectors/v2/COMP-A.js +4 -0
- package/dist/src/abi/connectors/v2/COMPOUND-A.js +4 -0
- package/dist/src/abi/connectors/v2/COMPOUND-IMPORT-A.js +4 -0
- package/dist/src/abi/connectors/v2/COMPOUND-IMPORT-B.js +195 -0
- package/dist/src/abi/connectors/v2/G-UNISWAP-A.js +4 -0
- package/dist/src/abi/connectors/v2/GELATO-AAVE-A.js +4 -0
- package/dist/src/abi/connectors/v2/INST-A.js +4 -0
- package/dist/src/abi/connectors/v2/INST-LM-A.js +4 -0
- package/dist/src/abi/connectors/v2/INST-STAKING-A.js +4 -0
- package/dist/src/abi/connectors/v2/INST-STAKING-B.js +4 -0
- package/dist/src/abi/connectors/v2/INSTAPOOL-A.js +4 -0
- package/dist/src/abi/connectors/v2/LIQUITY-A.js +4 -0
- package/dist/src/abi/connectors/v2/MAKERDAO-A.js +4 -0
- package/dist/src/abi/connectors/v2/MAKERDAO-CLAIM-A.js +136 -0
- package/dist/src/abi/connectors/v2/PARASWAP-A.js +4 -0
- package/dist/src/abi/connectors/v2/POLYGON-BRIDGE-A.js +4 -0
- package/dist/src/abi/connectors/v2/REFINANCE-A.js +4 -0
- package/dist/src/abi/connectors/v2/REFLEXER-A.js +4 -0
- package/dist/src/abi/connectors/v2/STAKE-ERC20-A.js +4 -0
- package/dist/src/abi/connectors/v2/UNISWAP-A.js +297 -0
- package/dist/src/abi/connectors/v2/UNISWAP-V2-A.js +4 -0
- package/dist/src/abi/connectors/v2/UNISWAP-V3-A.js +4 -0
- package/dist/src/abi/connectors/v2/UNISWAP-V3-STAKE-A.js +4 -0
- package/dist/src/abi/connectors/v2/WETH-A.js +4 -0
- package/dist/src/abi/connectors/v2/YEARN-VAULT-A.js +4 -0
- package/dist/src/abi/connectors/v2/index.js +89 -0
- package/dist/src/abi/index.js +4 -4
- package/dist/src/abi/interopX.json +1436 -0
- package/dist/src/alias.js +10 -0
- package/dist/src/api/index.js +3 -0
- package/dist/src/constants/addresses.js +4 -7
- package/dist/src/constants/blockConfirmations.js +8 -0
- package/dist/src/constants/index.js +1 -1
- package/dist/src/constants/tokens.js +62 -39
- package/dist/src/db/models/transaction.js +29 -11
- package/dist/src/gnosis/actions/aaveV2/index.js +11 -0
- package/dist/src/gnosis/actions/aaveV2/source.js +62 -0
- package/dist/src/gnosis/actions/aaveV2/target.js +8 -0
- package/dist/src/gnosis/actions/index.js +9 -0
- package/dist/src/gnosis/index.js +20 -0
- package/dist/src/index.js +7 -18
- package/dist/src/net/protocol/dial/SignatureDialProtocol.js +9 -10
- package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +2 -0
- package/dist/src/net/protocol/index.js +15 -5
- package/dist/src/tasks/InteropX/ProcessSubmitSubmitEvents.js +168 -0
- package/dist/src/tasks/InteropX/SyncLogSubmitEvents.js +86 -0
- package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +8 -3
- package/dist/src/tasks/index.js +12 -19
- package/dist/src/typechain/{InteropBridgeToken.js → InteropX.js} +0 -0
- package/dist/src/typechain/factories/InteropX__factory.js +1928 -0
- package/dist/src/typechain/factories/index.js +3 -5
- package/dist/src/typechain/index.js +3 -5
- package/dist/src/utils/index.js +96 -112
- package/package.json +15 -13
- package/src/abi/connectors/index.ts +14 -0
- package/src/abi/connectors/v1/aave.ts +147 -0
- package/src/abi/connectors/v1/aave_claim.ts +3 -0
- package/src/abi/connectors/v1/aave_migrate.ts +108 -0
- package/src/abi/connectors/v1/aave_polygon_migrate.ts +109 -0
- package/src/abi/connectors/v1/aave_stake.ts +3 -0
- package/src/abi/connectors/v1/aave_v1_import.ts +53 -0
- package/src/abi/connectors/v1/aave_v2.ts +229 -0
- package/src/abi/connectors/v1/aave_v2_import.ts +58 -0
- package/src/abi/connectors/v1/authority.ts +99 -0
- package/src/abi/connectors/v1/basic.ts +135 -0
- package/src/abi/connectors/v1/chi.ts +35 -0
- package/src/abi/connectors/v1/comp.ts +3 -0
- package/src/abi/connectors/v1/compound.ts +3 -0
- package/src/abi/connectors/v1/compoundImport.ts +68 -0
- package/src/abi/connectors/v1/compoundImport_v2.ts +3 -0
- package/src/abi/connectors/v1/compound_old.ts +447 -0
- package/src/abi/connectors/v1/curve.ts +139 -0
- package/src/abi/connectors/v1/curve_claim.ts +62 -0
- package/src/abi/connectors/v1/curve_gauge.ts +157 -0
- package/src/abi/connectors/v1/curve_sbtc.ts +139 -0
- package/src/abi/connectors/v1/curve_susd.ts +139 -0
- package/src/abi/connectors/v1/curve_three.ts +78 -0
- package/src/abi/connectors/v1/curve_y.ts +139 -0
- package/src/abi/connectors/v1/dsa_migrate_v1_to_v2.ts +3 -0
- package/src/abi/connectors/v1/dydx.ts +147 -0
- package/src/abi/connectors/v1/dydx_flash.ts +51 -0
- package/src/abi/connectors/v1/fee.ts +49 -0
- package/src/abi/connectors/v1/gelato.ts +1137 -0
- package/src/abi/connectors/v1/index.ts +42 -0
- package/src/abi/connectors/v1/instapool.ts +438 -0
- package/src/abi/connectors/v1/instapool_v2.ts +125 -0
- package/src/abi/connectors/v1/kyber.ts +116 -0
- package/src/abi/connectors/v1/maker.ts +479 -0
- package/src/abi/connectors/v1/maker_old.ts +299 -0
- package/src/abi/connectors/v1/math.ts +42 -0
- package/src/abi/connectors/v1/migrate.ts +45 -0
- package/src/abi/connectors/v1/oasis.ts +197 -0
- package/src/abi/connectors/v1/oneInch.ts +159 -0
- package/src/abi/connectors/v1/polygon_bridge.ts +3 -0
- package/src/abi/connectors/v1/refinance.ts +3 -0
- package/src/abi/connectors/v1/staking.ts +219 -0
- package/src/abi/connectors/v1/swerve.ts +178 -0
- package/src/abi/connectors/v1/uniswap.ts +297 -0
- package/src/abi/connectors/v2/1INCH-A.ts +3 -0
- package/src/abi/connectors/v2/1INCH-B.ts +3 -0
- package/src/abi/connectors/v2/AAVE-CLAIM-A.ts +3 -0
- package/src/abi/connectors/v2/AAVE-CLAIM-B.ts +165 -0
- package/src/abi/connectors/v2/AAVE-STAKE-A.ts +3 -0
- package/src/abi/connectors/v2/AAVE-V1-A.ts +130 -0
- package/src/abi/connectors/v2/AAVE-V1-IMPORT-A.ts +3 -0
- package/src/abi/connectors/v2/AAVE-V2-A.ts +229 -0
- package/src/abi/connectors/v2/AAVE-V2-IMPORT-A.ts +3 -0
- package/src/abi/connectors/v2/AAVE-V2-IMPORT-B.ts +224 -0
- package/src/abi/connectors/v2/AUTHORITY-A.ts +99 -0
- package/src/abi/connectors/v2/B-COMPOUND-A.ts +3 -0
- package/src/abi/connectors/v2/B-LIQUITY-A.ts +3 -0
- package/src/abi/connectors/v2/B-MAKERDAO-A.ts +3 -0
- package/src/abi/connectors/v2/BASIC-A.ts +135 -0
- package/src/abi/connectors/v2/BASIC-B.ts +3 -0
- package/src/abi/connectors/v2/BASIC-C.ts +3 -0
- package/src/abi/connectors/v2/COMP-A.ts +3 -0
- package/src/abi/connectors/v2/COMPOUND-A.ts +3 -0
- package/src/abi/connectors/v2/COMPOUND-IMPORT-A.ts +3 -0
- package/src/abi/connectors/v2/COMPOUND-IMPORT-B.ts +194 -0
- package/src/abi/connectors/v2/G-UNISWAP-A.ts +3 -0
- package/src/abi/connectors/v2/GELATO-AAVE-A.ts +3 -0
- package/src/abi/connectors/v2/INST-A.ts +3 -0
- package/src/abi/connectors/v2/INST-LM-A.ts +3 -0
- package/src/abi/connectors/v2/INST-STAKING-A.ts +3 -0
- package/src/abi/connectors/v2/INST-STAKING-B.ts +3 -0
- package/src/abi/connectors/v2/INSTAPOOL-A.ts +3 -0
- package/src/abi/connectors/v2/LIQUITY-A.ts +3 -0
- package/src/abi/connectors/v2/MAKERDAO-A.ts +3 -0
- package/src/abi/connectors/v2/MAKERDAO-CLAIM-A.ts +135 -0
- package/src/abi/connectors/v2/PARASWAP-A.ts +3 -0
- package/src/abi/connectors/v2/POLYGON-BRIDGE-A.ts +3 -0
- package/src/abi/connectors/v2/REFINANCE-A.ts +3 -0
- package/src/abi/connectors/v2/REFLEXER-A.ts +3 -0
- package/src/abi/connectors/v2/STAKE-ERC20-A.ts +3 -0
- package/src/abi/connectors/v2/UNISWAP-A.ts +297 -0
- package/src/abi/connectors/v2/UNISWAP-V2-A.ts +3 -0
- package/src/abi/connectors/v2/UNISWAP-V3-A.ts +3 -0
- package/src/abi/connectors/v2/UNISWAP-V3-STAKE-A.ts +3 -0
- package/src/abi/connectors/v2/WETH-A.ts +3 -0
- package/src/abi/connectors/v2/YEARN-VAULT-A.ts +3 -0
- package/src/abi/connectors/v2/index.ts +87 -0
- package/src/abi/index.ts +7 -7
- package/src/abi/interopX.json +1436 -0
- package/src/alias.ts +6 -0
- package/src/api/index.ts +3 -0
- package/src/constants/addresses.ts +5 -8
- package/src/constants/blockConfirmations.ts +5 -0
- package/src/constants/index.ts +1 -1
- package/src/constants/tokens.ts +63 -40
- package/src/db/models/transaction.ts +65 -25
- package/src/gnosis/actions/aaveV2/index.ts +9 -0
- package/src/gnosis/actions/aaveV2/source.ts +104 -0
- package/src/gnosis/actions/aaveV2/target.ts +13 -0
- package/src/gnosis/actions/index.ts +5 -0
- package/src/gnosis/index.ts +19 -0
- package/src/index.ts +6 -17
- package/src/net/protocol/dial/SignatureDialProtocol.ts +12 -13
- package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +3 -1
- package/src/net/protocol/index.ts +16 -6
- package/src/tasks/InteropX/ProcessSubmitSubmitEvents.ts +252 -0
- package/src/tasks/InteropX/SyncLogSubmitEvents.ts +138 -0
- package/src/tasks/Transactions/SyncTransactionStatusTask.ts +8 -3
- package/src/tasks/index.ts +15 -21
- package/src/typechain/InteropX.ts +1216 -0
- package/src/typechain/factories/InteropX__factory.ts +1932 -0
- package/src/typechain/factories/index.ts +1 -2
- package/src/typechain/index.ts +2 -4
- package/src/utils/index.ts +229 -183
- package/tsconfig.json +7 -2
- package/dist/src/abi/interopBridgeToken.json +0 -298
- package/dist/src/abi/interopXGateway.json +0 -184
- package/dist/src/constants/itokens.js +0 -13
- package/dist/src/tasks/InteropBridge/ProcessWithdrawEvents.js +0 -146
- package/dist/src/tasks/InteropBridge/SyncWithdrawEvents.js +0 -71
- package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +0 -149
- package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -74
- package/dist/src/typechain/InteropXGateway.js +0 -2
- package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -471
- package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
- package/src/abi/interopBridgeToken.json +0 -298
- package/src/abi/interopXGateway.json +0 -184
- package/src/constants/itokens.ts +0 -10
- package/src/tasks/InteropBridge/ProcessWithdrawEvents.ts +0 -231
- package/src/tasks/InteropBridge/SyncWithdrawEvents.ts +0 -121
- package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +0 -243
- package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -124
- package/src/typechain/InteropBridgeToken.ts +0 -692
- package/src/typechain/InteropXGateway.ts +0 -407
- package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -478
- package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
@@ -36,7 +36,7 @@ interface PeerInfoEvent extends BaseMessageEvent {
|
|
36
36
|
}
|
37
37
|
|
38
38
|
interface TransactionStatusEvent extends BaseMessageEvent {
|
39
|
-
data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'>
|
39
|
+
data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'>
|
40
40
|
}
|
41
41
|
|
42
42
|
declare interface Protocol {
|
@@ -66,25 +66,35 @@ class Protocol extends EventEmitter {
|
|
66
66
|
Buffer.from(transaction.transactionHash),
|
67
67
|
|
68
68
|
Buffer.from(transaction.sourceStatus),
|
69
|
-
Buffer.from(transaction.sourceTransactionHash),
|
69
|
+
Buffer.from(transaction.sourceTransactionHash || ''),
|
70
70
|
transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
|
71
|
+
transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
|
71
72
|
|
72
73
|
Buffer.from(transaction.targetStatus),
|
73
|
-
Buffer.from(transaction.targetTransactionHash),
|
74
|
+
Buffer.from(transaction.targetTransactionHash || ''),
|
74
75
|
transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
|
76
|
+
transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
|
75
77
|
|
76
78
|
Buffer.from(transaction.status),
|
77
79
|
],
|
78
|
-
decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]: [Buffer, Buffer, Buffer, Buffer[], Buffer, Buffer, Buffer[], Buffer]) => ({
|
80
|
+
decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]: [Buffer, Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer]) => ({
|
79
81
|
transactionHash: transactionHash.toString(),
|
80
82
|
|
81
83
|
sourceStatus: sourceStatus.toString(),
|
82
|
-
sourceTransactionHash: sourceTransactionHash.toString(),
|
84
|
+
sourceTransactionHash: sourceTransactionHash.toString() || null,
|
83
85
|
sourceErrors: sourceErrors.map((e) => e.toString()),
|
86
|
+
sourceLogs: sourceLogs.map(e => ({
|
87
|
+
type: e[0].toString(),
|
88
|
+
message: e[1].toString(),
|
89
|
+
})),
|
84
90
|
|
85
91
|
targetStatus: targetStatus.toString(),
|
86
|
-
targetTransactionHash: targetTransactionHash.toString(),
|
92
|
+
targetTransactionHash: targetTransactionHash.toString() || null,
|
87
93
|
targetErrors: targetErrors.map((e) => e.toString()),
|
94
|
+
targetLogs: targetLogs.map(e => ({
|
95
|
+
type: e[0].toString(),
|
96
|
+
message: e[1].toString(),
|
97
|
+
})),
|
88
98
|
|
89
99
|
status: status.toString(),
|
90
100
|
}),
|
@@ -0,0 +1,252 @@
|
|
1
|
+
import { BaseTask } from "../BaseTask";
|
2
|
+
import Logger from "@/logger";
|
3
|
+
import { ethers, Wallet } from "ethers";
|
4
|
+
import abi from "@/abi";
|
5
|
+
import { Transaction } from "@/db";
|
6
|
+
import {
|
7
|
+
buildSignatureBytes,
|
8
|
+
generateGnosisTransaction,
|
9
|
+
generateInteropTransactionHash,
|
10
|
+
getContract,
|
11
|
+
getRpcProviderUrl,
|
12
|
+
LiquidityError,
|
13
|
+
Signature,
|
14
|
+
} from "@/utils";
|
15
|
+
import { addresses, blockConfirmations } from "@/constants";
|
16
|
+
import { ChainId } from "@/types";
|
17
|
+
import config from "@/config";
|
18
|
+
import { GnosisSafe, InteropX } from "@/typechain";
|
19
|
+
import moment from "moment";
|
20
|
+
import { Op } from "sequelize";
|
21
|
+
import { buildGnosisAction } from "@/gnosis";
|
22
|
+
import { peerPool, protocol } from "@/net";
|
23
|
+
import { LogDescription } from "ethers/lib/utils";
|
24
|
+
import wait from "waait";
|
25
|
+
|
26
|
+
class ProcessSubmitSubmitEvents extends BaseTask {
|
27
|
+
sourceProvider: ethers.providers.JsonRpcProvider;
|
28
|
+
sourceGnosisContract: GnosisSafe;
|
29
|
+
sourceWallet: Wallet;
|
30
|
+
chainId: ChainId;
|
31
|
+
leadNodeOnly: boolean = true;
|
32
|
+
blockConfirmationsCount: number = 12;
|
33
|
+
|
34
|
+
constructor({ chainId }: { chainId: ChainId }) {
|
35
|
+
super({
|
36
|
+
logger: new Logger("InteropX::ProcessSubmitSubmitEvents"),
|
37
|
+
});
|
38
|
+
this.chainId = chainId;
|
39
|
+
}
|
40
|
+
|
41
|
+
async pollHandler() {
|
42
|
+
const currentBlockNumber = await this.sourceProvider.getBlockNumber();
|
43
|
+
|
44
|
+
const transaction = await Transaction.findOne({
|
45
|
+
where: {
|
46
|
+
status: "pending",
|
47
|
+
sourceStatus: "pending",
|
48
|
+
sourceChainId: this.chainId,
|
49
|
+
submitBlockNumber: {
|
50
|
+
[Op.lt]: currentBlockNumber - this.blockConfirmationsCount,
|
51
|
+
},
|
52
|
+
sourceDelayUntil: {
|
53
|
+
[Op.or]: {
|
54
|
+
[Op.is]: null,
|
55
|
+
[Op.lt]: new Date(),
|
56
|
+
},
|
57
|
+
},
|
58
|
+
|
59
|
+
submitEvent: { $ne: null },
|
60
|
+
|
61
|
+
createdAt: {
|
62
|
+
[Op.gt]: moment().subtract({ hours: 12 }).toDate(),
|
63
|
+
},
|
64
|
+
},
|
65
|
+
});
|
66
|
+
|
67
|
+
if (!transaction) {
|
68
|
+
return;
|
69
|
+
}
|
70
|
+
|
71
|
+
transaction.sourceStatus = "proccessing";
|
72
|
+
await transaction.save();
|
73
|
+
|
74
|
+
const ownersThreshold = await this.sourceGnosisContract.getThreshold();
|
75
|
+
await wait(10000);
|
76
|
+
|
77
|
+
let data,
|
78
|
+
logs = [];
|
79
|
+
|
80
|
+
try {
|
81
|
+
({ data, logs } = await buildGnosisAction(transaction, "source"));
|
82
|
+
} catch (error) {
|
83
|
+
if (error instanceof LiquidityError) {
|
84
|
+
await transaction.save();
|
85
|
+
transaction.sourceDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
|
86
|
+
transaction.sourceStatus = "pending";
|
87
|
+
|
88
|
+
await transaction.save();
|
89
|
+
|
90
|
+
throw error;
|
91
|
+
return;
|
92
|
+
}
|
93
|
+
|
94
|
+
transaction.sourceStatus = "failed";
|
95
|
+
transaction.sourceErrors = [error.message];
|
96
|
+
transaction.targetStatus = "failed";
|
97
|
+
|
98
|
+
transaction.status = "failed";
|
99
|
+
await transaction.save();
|
100
|
+
protocol.sendTransaction(transaction);
|
101
|
+
return;
|
102
|
+
}
|
103
|
+
|
104
|
+
let gnosisTx = await generateGnosisTransaction(
|
105
|
+
{
|
106
|
+
baseGas: "0",
|
107
|
+
data,
|
108
|
+
gasPrice: "0",
|
109
|
+
gasToken: "0x0000000000000000000000000000000000000000",
|
110
|
+
nonce: "0",
|
111
|
+
operation: "1",
|
112
|
+
refundReceiver: "0x0000000000000000000000000000000000000000",
|
113
|
+
safeAddress: this.sourceGnosisContract.address,
|
114
|
+
safeTxGas: "79668",
|
115
|
+
to: addresses[transaction.sourceChainId].multisend,
|
116
|
+
value: "0",
|
117
|
+
},
|
118
|
+
this.sourceGnosisContract
|
119
|
+
);
|
120
|
+
|
121
|
+
const owners = await this.sourceGnosisContract
|
122
|
+
.getOwners()
|
123
|
+
.then((owners) => owners.map((owner) => owner.toLowerCase()));
|
124
|
+
|
125
|
+
const ownerPeerIds = peerPool.activePeers
|
126
|
+
.filter((peer) => owners.includes(peer.publicAddress.toLowerCase()))
|
127
|
+
.map((peer) => peer.id);
|
128
|
+
|
129
|
+
console.log(
|
130
|
+
`Collecting signatures for execution ${transaction.transactionHash}`
|
131
|
+
);
|
132
|
+
|
133
|
+
console.log(ownerPeerIds);
|
134
|
+
|
135
|
+
const signatures = await protocol.requestSignatures(
|
136
|
+
{
|
137
|
+
type: "source",
|
138
|
+
transactionHash: transaction.transactionHash,
|
139
|
+
safeTxGas: gnosisTx.safeTxGas,
|
140
|
+
safeNonce: gnosisTx.nonce,
|
141
|
+
chainId: this.chainId,
|
142
|
+
},
|
143
|
+
ownerPeerIds
|
144
|
+
);
|
145
|
+
|
146
|
+
const validSignatures = signatures.filter(
|
147
|
+
(s) => !!s.data && s.data !== "0x"
|
148
|
+
) as Signature[];
|
149
|
+
|
150
|
+
console.log({
|
151
|
+
signatures,
|
152
|
+
validSignatures,
|
153
|
+
ownersThreshold: ownersThreshold.toString(),
|
154
|
+
});
|
155
|
+
|
156
|
+
if (
|
157
|
+
validSignatures.length === 0 ||
|
158
|
+
ownersThreshold.gt(validSignatures.length)
|
159
|
+
) {
|
160
|
+
await transaction.save();
|
161
|
+
transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
|
162
|
+
transaction.sourceStatus = "pending";
|
163
|
+
|
164
|
+
await transaction.save();
|
165
|
+
const errorMessage = signatures.find((s) => !!s.error)?.error;
|
166
|
+
throw new Error(
|
167
|
+
`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : "")
|
168
|
+
);
|
169
|
+
}
|
170
|
+
|
171
|
+
console.log(
|
172
|
+
`Executing transaction for execution ${transaction.transactionHash}`
|
173
|
+
);
|
174
|
+
|
175
|
+
const { data: txData } =
|
176
|
+
await this.sourceGnosisContract.populateTransaction.execTransaction(
|
177
|
+
gnosisTx.to,
|
178
|
+
gnosisTx.value,
|
179
|
+
gnosisTx.data,
|
180
|
+
gnosisTx.operation,
|
181
|
+
gnosisTx.safeTxGas,
|
182
|
+
gnosisTx.baseGas,
|
183
|
+
gnosisTx.gasPrice,
|
184
|
+
gnosisTx.gasToken,
|
185
|
+
gnosisTx.refundReceiver,
|
186
|
+
buildSignatureBytes(validSignatures)
|
187
|
+
);
|
188
|
+
|
189
|
+
const txSent = await this.sourceWallet.sendTransaction({
|
190
|
+
from: this.sourceWallet.address,
|
191
|
+
gasPrice: ethers.BigNumber.from(120 * 10 ** 9),
|
192
|
+
to: this.sourceGnosisContract.address,
|
193
|
+
data: txData,
|
194
|
+
});
|
195
|
+
|
196
|
+
console.log(txSent);
|
197
|
+
|
198
|
+
const receipt = await txSent.wait();
|
199
|
+
|
200
|
+
const parsedLogs: LogDescription[] = [];
|
201
|
+
|
202
|
+
receipt.logs.forEach((log) => {
|
203
|
+
try {
|
204
|
+
parsedLogs.push(this.sourceGnosisContract.interface.parseLog(log));
|
205
|
+
} catch (e) {}
|
206
|
+
});
|
207
|
+
|
208
|
+
if (parsedLogs.find((e) => e.name === "ExecutionSuccess")) {
|
209
|
+
console.log("ExecutionSuccess");
|
210
|
+
transaction.sourceStatus = "success";
|
211
|
+
if (txSent.blockNumber)
|
212
|
+
transaction.sourceBlockNumber = txSent.blockNumber;
|
213
|
+
transaction.sourceTransactionHash = txSent.hash;
|
214
|
+
transaction.sourceLogs = logs;
|
215
|
+
await transaction.save();
|
216
|
+
} else {
|
217
|
+
console.log("ExecutionFailure");
|
218
|
+
transaction.sourceStatus = "failed";
|
219
|
+
if (txSent.blockNumber)
|
220
|
+
transaction.sourceBlockNumber = txSent.blockNumber;
|
221
|
+
transaction.sourceTransactionHash = txSent.hash;
|
222
|
+
transaction.sourceTransactionHash = txSent.hash;
|
223
|
+
transaction.status = "failed";
|
224
|
+
await transaction.save();
|
225
|
+
}
|
226
|
+
|
227
|
+
protocol.sendTransaction(transaction);
|
228
|
+
}
|
229
|
+
|
230
|
+
async start(): Promise<void> {
|
231
|
+
this.blockConfirmationsCount = blockConfirmations[this.chainId] + 1;
|
232
|
+
|
233
|
+
this.sourceProvider = new ethers.providers.JsonRpcProvider(
|
234
|
+
getRpcProviderUrl(this.chainId)
|
235
|
+
);
|
236
|
+
|
237
|
+
this.sourceWallet = new ethers.Wallet(
|
238
|
+
config.privateKey!,
|
239
|
+
this.sourceProvider
|
240
|
+
);
|
241
|
+
|
242
|
+
this.sourceGnosisContract = getContract<GnosisSafe>(
|
243
|
+
addresses[this.chainId].gnosisSafe,
|
244
|
+
abi.gnosisSafe,
|
245
|
+
this.sourceWallet
|
246
|
+
);
|
247
|
+
|
248
|
+
await super.start();
|
249
|
+
}
|
250
|
+
}
|
251
|
+
|
252
|
+
export default ProcessSubmitSubmitEvents;
|
@@ -0,0 +1,138 @@
|
|
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 {
|
7
|
+
generateInteropTransactionHash,
|
8
|
+
getContract,
|
9
|
+
getRpcProviderUrl,
|
10
|
+
} from "@/utils";
|
11
|
+
import { addresses } from "@/constants";
|
12
|
+
import { ChainId } from "@/types";
|
13
|
+
import config from "@/config";
|
14
|
+
import { InteropX } from "@/typechain";
|
15
|
+
|
16
|
+
class SyncLogSubmitEvents extends BaseTask {
|
17
|
+
contractAddress: string;
|
18
|
+
provider: ethers.providers.JsonRpcProvider;
|
19
|
+
contract: InteropX;
|
20
|
+
chainId: ChainId;
|
21
|
+
|
22
|
+
constructor({ chainId }: { chainId: ChainId }) {
|
23
|
+
super({
|
24
|
+
logger: new Logger("InteropX::SyncLogSubmitEvents"),
|
25
|
+
});
|
26
|
+
this.chainId = chainId;
|
27
|
+
}
|
28
|
+
|
29
|
+
async pollHandler() {
|
30
|
+
const currentBlock = await this.provider.getBlockNumber();
|
31
|
+
|
32
|
+
const events = await this.contract.queryFilter(
|
33
|
+
this.contract.filters.LogSubmit(),
|
34
|
+
currentBlock - 2000,
|
35
|
+
currentBlock
|
36
|
+
);
|
37
|
+
|
38
|
+
let processedEvents = 0;
|
39
|
+
|
40
|
+
for (const event of events) {
|
41
|
+
try {
|
42
|
+
if (!event.args) {
|
43
|
+
continue;
|
44
|
+
}
|
45
|
+
|
46
|
+
const {
|
47
|
+
position,
|
48
|
+
actionId,
|
49
|
+
actionIdHashHash,
|
50
|
+
sourceSender,
|
51
|
+
sourceDsaId,
|
52
|
+
targetDsaId,
|
53
|
+
sourceChainId,
|
54
|
+
targetChainId,
|
55
|
+
vnonce,
|
56
|
+
metadata,
|
57
|
+
} = event.args;
|
58
|
+
|
59
|
+
const uniqueIdentifier = {
|
60
|
+
actionId,
|
61
|
+
vnonce: vnonce.toString(),
|
62
|
+
sourceSender: sourceSender.toString(),
|
63
|
+
sourceChainId: sourceChainId.toNumber(),
|
64
|
+
targetChainId: targetChainId.toNumber(),
|
65
|
+
sourceDsaId: sourceDsaId.toString(),
|
66
|
+
targetDsaId: targetDsaId.toString(),
|
67
|
+
};
|
68
|
+
|
69
|
+
let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
|
70
|
+
|
71
|
+
const transaction = await Transaction.findOne({
|
72
|
+
where: { transactionHash },
|
73
|
+
});
|
74
|
+
|
75
|
+
if (transaction) {
|
76
|
+
continue;
|
77
|
+
}
|
78
|
+
|
79
|
+
await Transaction.create({
|
80
|
+
transactionHash,
|
81
|
+
...uniqueIdentifier,
|
82
|
+
submitChainId: this.chainId,
|
83
|
+
submitTransactionHash: event.transactionHash,
|
84
|
+
submitBlockNumber: event.blockNumber,
|
85
|
+
submitCreatedAt: new Date(),
|
86
|
+
submitEvent: {
|
87
|
+
actionId,
|
88
|
+
actionIdHashHash,
|
89
|
+
vnonce: vnonce.toString(),
|
90
|
+
position: {
|
91
|
+
withdraw: position.withdraw.map((v) => ({
|
92
|
+
sourceToken: v.sourceToken,
|
93
|
+
targetToken: v.targetToken,
|
94
|
+
amount: v.amount.toString(),
|
95
|
+
})),
|
96
|
+
supply: position.supply.map((v) => ({
|
97
|
+
sourceToken: v.sourceToken,
|
98
|
+
targetToken: v.targetToken,
|
99
|
+
amount: v.amount.toString(),
|
100
|
+
})),
|
101
|
+
},
|
102
|
+
sourceChainId: sourceChainId.toNumber(),
|
103
|
+
targetChainId: targetChainId.toNumber(),
|
104
|
+
sourceSender,
|
105
|
+
sourceDsaId: sourceDsaId.toString(),
|
106
|
+
targetDsaId: targetDsaId.toString(),
|
107
|
+
metadata,
|
108
|
+
},
|
109
|
+
});
|
110
|
+
|
111
|
+
this.logger.info(`New InteropX tranaction: ${transactionHash} `);
|
112
|
+
} catch (error) {
|
113
|
+
this.logger.error(error);
|
114
|
+
}
|
115
|
+
}
|
116
|
+
|
117
|
+
if (processedEvents > 0)
|
118
|
+
this.logger.info(`${processedEvents} events processed`);
|
119
|
+
}
|
120
|
+
|
121
|
+
async start(): Promise<void> {
|
122
|
+
this.contractAddress = addresses[this.chainId].interopX;
|
123
|
+
|
124
|
+
this.provider = new ethers.providers.JsonRpcProvider(
|
125
|
+
getRpcProviderUrl(this.chainId)
|
126
|
+
);
|
127
|
+
|
128
|
+
this.contract = getContract<InteropX>(
|
129
|
+
this.contractAddress,
|
130
|
+
abi.interopX,
|
131
|
+
new ethers.Wallet(config.privateKey!, this.provider)
|
132
|
+
);
|
133
|
+
|
134
|
+
await super.start();
|
135
|
+
}
|
136
|
+
}
|
137
|
+
|
138
|
+
export default SyncLogSubmitEvents;
|
@@ -20,14 +20,17 @@ class SyncTransactionStatusTask extends BaseTask {
|
|
20
20
|
const leadNode = peerPool.getLeadPeer();
|
21
21
|
|
22
22
|
if (!leadNode) {
|
23
|
+
console.log("No lead node found");
|
23
24
|
return;
|
24
25
|
}
|
25
26
|
|
26
27
|
const transaction = await Transaction.findOne({
|
27
28
|
where: {
|
28
|
-
status:
|
29
|
-
|
30
|
-
|
29
|
+
status: {
|
30
|
+
[Op.notIn] : ['success', 'failed'],
|
31
|
+
},
|
32
|
+
createdAt: {
|
33
|
+
[Op.lt]: new Date(Date.now() - 15 * 60 * 1000),
|
31
34
|
},
|
32
35
|
}
|
33
36
|
})
|
@@ -49,10 +52,12 @@ class SyncTransactionStatusTask extends BaseTask {
|
|
49
52
|
transaction.sourceStatus = transactionStatus.sourceStatus
|
50
53
|
transaction.sourceTransactionHash = transactionStatus.sourceTransactionHash
|
51
54
|
transaction.sourceErrors = transactionStatus.sourceErrors
|
55
|
+
transaction.sourceLogs = transactionStatus.sourceLogs
|
52
56
|
|
53
57
|
transaction.targetStatus = transactionStatus.targetStatus
|
54
58
|
transaction.targetTransactionHash = transactionStatus.targetTransactionHash
|
55
59
|
transaction.targetErrors = transactionStatus.targetErrors
|
60
|
+
transaction.targetLogs = transactionStatus.targetLogs
|
56
61
|
|
57
62
|
transaction.status = transactionStatus.status
|
58
63
|
|
package/src/tasks/index.ts
CHANGED
@@ -1,40 +1,34 @@
|
|
1
1
|
import { BaseTask } from "./BaseTask";
|
2
|
-
import
|
3
|
-
import InteropXGatewaySyncDepositEvents from "./InteropXGateway/SyncDepositEvents";
|
2
|
+
import wait from "waait";
|
4
3
|
|
5
|
-
import InteropBridgeSyncWithdrawEvents from "./InteropBridge/SyncWithdrawEvents";
|
6
|
-
import InteropBridgeProcessWithdrawEvents from "./InteropBridge/ProcessWithdrawEvents";
|
7
|
-
import AutoUpdateTask from "./AutoUpdateTask";
|
8
4
|
import SyncTransactionStatusTask from "./Transactions/SyncTransactionStatusTask";
|
9
5
|
|
6
|
+
import AutoUpdateTask from "./AutoUpdateTask";
|
7
|
+
|
8
|
+
import SyncLogSubmitEvents from "./InteropX/SyncLogSubmitEvents";
|
9
|
+
import ProcessSubmitSubmitEvents from "./InteropX/ProcessSubmitSubmitEvents";
|
10
|
+
|
10
11
|
export class Tasks {
|
11
|
-
|
12
|
+
|
12
13
|
tasks: BaseTask[] = [
|
13
|
-
new SyncTransactionStatusTask(),
|
14
|
+
// new SyncTransactionStatusTask(),
|
14
15
|
new AutoUpdateTask(),
|
15
16
|
|
16
|
-
|
17
|
-
|
18
|
-
}),
|
17
|
+
// InteropX
|
18
|
+
new SyncLogSubmitEvents({ chainId: 137 }),
|
19
|
+
new SyncLogSubmitEvents({ chainId: 43114 }),
|
19
20
|
|
20
|
-
new
|
21
|
-
|
22
|
-
}),
|
21
|
+
new ProcessSubmitSubmitEvents({ chainId: 137 }),
|
22
|
+
new ProcessSubmitSubmitEvents({ chainId: 43114 }),
|
23
23
|
|
24
|
-
new
|
25
|
-
chainId: 137,
|
26
|
-
itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
|
27
|
-
}),
|
28
|
-
|
29
|
-
new InteropBridgeProcessWithdrawEvents({
|
30
|
-
chainId: 137,
|
31
|
-
})
|
24
|
+
new SyncTransactionStatusTask(),
|
32
25
|
];
|
33
26
|
|
34
27
|
async start() {
|
35
28
|
for (const task of this.tasks) {
|
36
29
|
try {
|
37
30
|
task.start();
|
31
|
+
await wait(1000)
|
38
32
|
} catch (error) {
|
39
33
|
console.error(`Error starting task: ${task.constructor.name}`);
|
40
34
|
}
|