@instadapp/interop-x 0.0.0-dev.e3c1934 → 0.0.0-dev.e916c22
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 +17 -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 +6 -4
- package/dist/src/abi/instList.json +232 -0
- 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/config/index.js +10 -1
- package/dist/src/constants/addresses.js +6 -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 +41 -15
- package/dist/src/gnosis/actions/aaveV2/index.js +11 -0
- package/dist/src/gnosis/actions/aaveV2/source.js +73 -0
- package/dist/src/gnosis/actions/aaveV2/target.js +86 -0
- package/dist/src/gnosis/actions/index.js +9 -0
- package/dist/src/gnosis/index.js +20 -0
- package/dist/src/index.js +34 -22
- package/dist/src/net/protocol/dial/SignatureDialProtocol.js +9 -10
- package/dist/src/net/protocol/dial/{SignatureDialProtocol.1.js → TransactionStatusDialProtocol.js} +2 -0
- package/dist/src/net/protocol/index.js +17 -7
- package/dist/src/tasks/AutoUpdateTask.js +11 -8
- package/dist/src/tasks/BaseTask.js +4 -0
- package/dist/src/tasks/InteropX/ProcessSubmitSubmitEvents.js +179 -0
- package/dist/src/tasks/InteropX/ProcessValidateEvents.js +183 -0
- package/dist/src/tasks/InteropX/SyncLogExecuteEvents.js +112 -0
- package/dist/src/tasks/InteropX/SyncLogSubmitEvents.js +87 -0
- package/dist/src/tasks/InteropX/SyncLogValidateEvents.js +105 -0
- package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +8 -3
- package/dist/src/tasks/index.js +21 -19
- package/dist/src/typechain/{InteropBridgeToken.js → InstList.js} +0 -0
- package/dist/src/typechain/{InteropXGateway.js → InteropX.js} +0 -0
- package/dist/src/typechain/factories/InstList__factory.js +249 -0
- package/dist/src/typechain/factories/InteropX__factory.js +1928 -0
- package/dist/src/typechain/factories/index.js +5 -5
- package/dist/src/typechain/index.js +5 -5
- package/dist/src/utils/index.js +97 -112
- package/package.json +17 -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 +9 -7
- package/src/abi/instList.json +232 -0
- package/src/abi/interopX.json +1436 -0
- package/src/alias.ts +6 -0
- package/src/api/index.ts +3 -0
- package/src/config/index.ts +9 -1
- package/src/constants/addresses.ts +7 -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 +159 -65
- package/src/gnosis/actions/aaveV2/index.ts +9 -0
- package/src/gnosis/actions/aaveV2/source.ts +118 -0
- package/src/gnosis/actions/aaveV2/target.ts +141 -0
- package/src/gnosis/actions/index.ts +5 -0
- package/src/gnosis/index.ts +19 -0
- package/src/index.ts +47 -26
- package/src/net/protocol/dial/SignatureDialProtocol.ts +12 -13
- package/src/net/protocol/dial/{SignatureDialProtocol.1.ts → TransactionStatusDialProtocol.ts} +3 -1
- package/src/net/protocol/index.ts +17 -7
- package/src/tasks/AutoUpdateTask.ts +15 -14
- package/src/tasks/BaseTask.ts +5 -0
- package/src/tasks/InteropX/ProcessSubmitSubmitEvents.ts +269 -0
- package/src/tasks/InteropX/ProcessValidateEvents.ts +274 -0
- package/src/tasks/InteropX/SyncLogExecuteEvents.ts +162 -0
- package/src/tasks/InteropX/SyncLogSubmitEvents.ts +139 -0
- package/src/tasks/InteropX/SyncLogValidateEvents.ts +152 -0
- package/src/tasks/Transactions/SyncTransactionStatusTask.ts +8 -3
- package/src/tasks/index.ts +26 -20
- package/src/typechain/InstList.ts +402 -0
- package/src/typechain/InteropX.ts +1216 -0
- package/src/typechain/factories/InstList__factory.ts +253 -0
- package/src/typechain/factories/InteropX__factory.ts +1932 -0
- package/src/typechain/factories/index.ts +2 -2
- package/src/typechain/index.ts +4 -4
- package/src/utils/index.ts +229 -183
- package/tsconfig.json +7 -2
- package/dist/src/abi/interopBridgeToken.json +0 -286
- 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 -69
- package/dist/src/tasks/InteropXGateway/ProcessDepositEvents.js +0 -149
- package/dist/src/tasks/InteropXGateway/SyncDepositEvents.js +0 -74
- package/dist/src/typechain/factories/InteropBridgeToken__factory.js +0 -459
- package/dist/src/typechain/factories/InteropXGateway__factory.js +0 -265
- package/src/abi/interopBridgeToken.json +0 -286
- 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 -119
- package/src/tasks/InteropXGateway/ProcessDepositEvents.ts +0 -243
- package/src/tasks/InteropXGateway/SyncDepositEvents.ts +0 -124
- package/src/typechain/InteropBridgeToken.ts +0 -686
- package/src/typechain/InteropXGateway.ts +0 -407
- package/src/typechain/factories/InteropBridgeToken__factory.ts +0 -466
- package/src/typechain/factories/InteropXGateway__factory.ts +0 -272
@@ -0,0 +1,139 @@
|
|
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
|
+
actionIdHash: actionIdHashHash,
|
90
|
+
vnonce: vnonce.toString(),
|
91
|
+
position: {
|
92
|
+
withdraw: position.withdraw.map((v) => ({
|
93
|
+
sourceToken: v.sourceToken,
|
94
|
+
targetToken: v.targetToken,
|
95
|
+
amount: v.amount.toString(),
|
96
|
+
})),
|
97
|
+
supply: position.supply.map((v) => ({
|
98
|
+
sourceToken: v.sourceToken,
|
99
|
+
targetToken: v.targetToken,
|
100
|
+
amount: v.amount.toString(),
|
101
|
+
})),
|
102
|
+
},
|
103
|
+
sourceChainId: sourceChainId.toNumber(),
|
104
|
+
targetChainId: targetChainId.toNumber(),
|
105
|
+
sourceSender,
|
106
|
+
sourceDsaId: sourceDsaId.toString(),
|
107
|
+
targetDsaId: targetDsaId.toString(),
|
108
|
+
metadata,
|
109
|
+
},
|
110
|
+
});
|
111
|
+
|
112
|
+
this.logger.info(`New InteropX tranaction: ${transactionHash} `);
|
113
|
+
} catch (error) {
|
114
|
+
this.logger.error(error);
|
115
|
+
}
|
116
|
+
}
|
117
|
+
|
118
|
+
if (processedEvents > 0)
|
119
|
+
this.logger.info(`${processedEvents} events processed`);
|
120
|
+
}
|
121
|
+
|
122
|
+
async start(): Promise<void> {
|
123
|
+
this.contractAddress = addresses[this.chainId].interopX;
|
124
|
+
|
125
|
+
this.provider = new ethers.providers.JsonRpcProvider(
|
126
|
+
getRpcProviderUrl(this.chainId)
|
127
|
+
);
|
128
|
+
|
129
|
+
this.contract = getContract<InteropX>(
|
130
|
+
this.contractAddress,
|
131
|
+
abi.interopX,
|
132
|
+
new ethers.Wallet(config.privateKey!, this.provider)
|
133
|
+
);
|
134
|
+
|
135
|
+
await super.start();
|
136
|
+
}
|
137
|
+
}
|
138
|
+
|
139
|
+
export default SyncLogSubmitEvents;
|
@@ -0,0 +1,152 @@
|
|
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
|
+
import { Op } from "sequelize";
|
16
|
+
|
17
|
+
class SyncLogValidateEvents extends BaseTask {
|
18
|
+
contractAddress: string;
|
19
|
+
provider: ethers.providers.JsonRpcProvider;
|
20
|
+
contract: InteropX;
|
21
|
+
chainId: ChainId;
|
22
|
+
|
23
|
+
constructor({ chainId }: { chainId: ChainId }) {
|
24
|
+
super({
|
25
|
+
logger: new Logger("InteropX::SyncLogValidateEvents"),
|
26
|
+
});
|
27
|
+
this.chainId = chainId;
|
28
|
+
}
|
29
|
+
|
30
|
+
async pollHandler() {
|
31
|
+
const currentBlock = await this.provider.getBlockNumber();
|
32
|
+
|
33
|
+
const events = await this.contract.queryFilter(
|
34
|
+
this.contract.filters.LogValidate(),
|
35
|
+
currentBlock - 2000,
|
36
|
+
currentBlock
|
37
|
+
);
|
38
|
+
|
39
|
+
let processedEvents = 0;
|
40
|
+
|
41
|
+
for (const event of events) {
|
42
|
+
try {
|
43
|
+
if (!event.args) {
|
44
|
+
continue;
|
45
|
+
}
|
46
|
+
|
47
|
+
const {
|
48
|
+
sourceSpells,
|
49
|
+
position,
|
50
|
+
actionId,
|
51
|
+
actionIdHash,
|
52
|
+
sourceSender,
|
53
|
+
sourceDsaId,
|
54
|
+
targetDsaId,
|
55
|
+
sourceChainId,
|
56
|
+
targetChainId,
|
57
|
+
vnonce,
|
58
|
+
metadata,
|
59
|
+
} = event.args;
|
60
|
+
|
61
|
+
const uniqueIdentifier = {
|
62
|
+
actionId,
|
63
|
+
vnonce: vnonce.toString(),
|
64
|
+
sourceSender: sourceSender.toString(),
|
65
|
+
sourceChainId: sourceChainId.toNumber(),
|
66
|
+
targetChainId: targetChainId.toNumber(),
|
67
|
+
sourceDsaId: sourceDsaId.toString(),
|
68
|
+
targetDsaId: targetDsaId.toString(),
|
69
|
+
};
|
70
|
+
|
71
|
+
let transactionHash = generateInteropTransactionHash(uniqueIdentifier);
|
72
|
+
|
73
|
+
const transaction = await Transaction.findOne({
|
74
|
+
where: {
|
75
|
+
transactionHash,
|
76
|
+
validateEvent: { [Op.eq]: null },
|
77
|
+
},
|
78
|
+
});
|
79
|
+
|
80
|
+
if (!transaction) {
|
81
|
+
continue;
|
82
|
+
}
|
83
|
+
|
84
|
+
if (transaction.sourceStatus != "success") {
|
85
|
+
transaction.sourceStatus = "success";
|
86
|
+
}
|
87
|
+
|
88
|
+
if (!transaction.sourceCreatedAt) {
|
89
|
+
transaction.sourceCreatedAt = new Date();
|
90
|
+
}
|
91
|
+
|
92
|
+
transaction.sourceTransactionHash = event.transactionHash;
|
93
|
+
transaction.sourceBlockNumber = event.blockNumber;
|
94
|
+
transaction.sourceLogs = [];
|
95
|
+
transaction.validateEvent = {
|
96
|
+
actionId,
|
97
|
+
actionIdHashHash: actionIdHash,
|
98
|
+
actionIdHash,
|
99
|
+
vnonce: vnonce.toString(),
|
100
|
+
sourceSpells: sourceSpells.map(({ connector, data }) => ({
|
101
|
+
connector,
|
102
|
+
data,
|
103
|
+
})),
|
104
|
+
position: {
|
105
|
+
withdraw: position.withdraw.map((v) => ({
|
106
|
+
sourceToken: v.sourceToken,
|
107
|
+
targetToken: v.targetToken,
|
108
|
+
amount: v.amount.toString(),
|
109
|
+
})),
|
110
|
+
supply: position.supply.map((v) => ({
|
111
|
+
sourceToken: v.sourceToken,
|
112
|
+
targetToken: v.targetToken,
|
113
|
+
amount: v.amount.toString(),
|
114
|
+
})),
|
115
|
+
},
|
116
|
+
sourceChainId: sourceChainId.toNumber(),
|
117
|
+
targetChainId: targetChainId.toNumber(),
|
118
|
+
sourceSender,
|
119
|
+
sourceDsaId: sourceDsaId.toString(),
|
120
|
+
targetDsaId: targetDsaId.toString(),
|
121
|
+
metadata,
|
122
|
+
}
|
123
|
+
await transaction.save();
|
124
|
+
|
125
|
+
this.logger.info(`New InteropX tranaction: ${transactionHash} `);
|
126
|
+
} catch (error) {
|
127
|
+
this.logger.error(error);
|
128
|
+
}
|
129
|
+
}
|
130
|
+
|
131
|
+
if (processedEvents > 0)
|
132
|
+
this.logger.info(`${processedEvents} events processed`);
|
133
|
+
}
|
134
|
+
|
135
|
+
async start(): Promise<void> {
|
136
|
+
this.contractAddress = addresses[this.chainId].interopX;
|
137
|
+
|
138
|
+
this.provider = new ethers.providers.JsonRpcProvider(
|
139
|
+
getRpcProviderUrl(this.chainId)
|
140
|
+
);
|
141
|
+
|
142
|
+
this.contract = getContract<InteropX>(
|
143
|
+
this.contractAddress,
|
144
|
+
abi.interopX,
|
145
|
+
new ethers.Wallet(config.privateKey!, this.provider)
|
146
|
+
);
|
147
|
+
|
148
|
+
await super.start();
|
149
|
+
}
|
150
|
+
}
|
151
|
+
|
152
|
+
export default SyncLogValidateEvents;
|
@@ -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,46 @@
|
|
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
|
+
import SyncLogValidateEvents from "./InteropX/SyncLogValidateEvents";
|
11
|
+
import ProcessValidateEvents from "./InteropX/ProcessValidateEvents";
|
12
|
+
import SyncLogExecuteEvents from "./InteropX/SyncLogExecuteEvents";
|
13
|
+
|
10
14
|
export class Tasks {
|
11
|
-
|
15
|
+
|
12
16
|
tasks: BaseTask[] = [
|
13
|
-
new SyncTransactionStatusTask(),
|
17
|
+
// new SyncTransactionStatusTask(),
|
14
18
|
new AutoUpdateTask(),
|
15
19
|
|
16
|
-
|
17
|
-
|
18
|
-
}),
|
20
|
+
// InteropX
|
21
|
+
new SyncLogSubmitEvents({ chainId: 137 }),
|
22
|
+
new SyncLogSubmitEvents({ chainId: 43114 }),
|
23
|
+
|
24
|
+
new ProcessSubmitSubmitEvents({ chainId: 137 }),
|
25
|
+
new ProcessSubmitSubmitEvents({ chainId: 43114 }),
|
19
26
|
|
20
|
-
new
|
21
|
-
|
22
|
-
}),
|
27
|
+
new SyncLogValidateEvents({ chainId: 137 }),
|
28
|
+
new SyncLogValidateEvents({ chainId: 43114 }),
|
23
29
|
|
24
|
-
new
|
25
|
-
|
26
|
-
itokenAddress: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
|
27
|
-
}),
|
30
|
+
new ProcessValidateEvents({ chainId: 137 }),
|
31
|
+
new ProcessValidateEvents({ chainId: 43114 }),
|
28
32
|
|
29
|
-
new
|
30
|
-
|
31
|
-
|
33
|
+
new SyncLogExecuteEvents({ targetChainId: 137 }),
|
34
|
+
new SyncLogExecuteEvents({ targetChainId: 43114 }),
|
35
|
+
|
36
|
+
new SyncTransactionStatusTask(),
|
32
37
|
];
|
33
38
|
|
34
39
|
async start() {
|
35
40
|
for (const task of this.tasks) {
|
36
41
|
try {
|
37
42
|
task.start();
|
43
|
+
await wait(300)
|
38
44
|
} catch (error) {
|
39
45
|
console.error(`Error starting task: ${task.constructor.name}`);
|
40
46
|
}
|