@instadapp/interop-x 0.0.0-dev.75809ae → 0.0.0-dev.75c5f3d
Sign up to get free protection for your applications and to get access to all the features.
- package/.env.example +2 -1
- package/.github/workflows/ci.yml +19 -0
- package/dist/package.json +76 -0
- 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/erc20.json +350 -0
- package/dist/src/abi/gnosisSafe.json +747 -0
- package/dist/src/abi/index.js +17 -0
- 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 +36 -0
- package/dist/src/config/index.js +31 -0
- package/dist/src/constants/addresses.js +19 -0
- package/dist/src/constants/blockConfirmations.js +8 -0
- package/dist/{constants → src/constants}/index.js +2 -0
- package/dist/src/constants/tokens.js +130 -0
- package/dist/{db → src/db}/index.js +0 -0
- package/dist/{db → src/db}/models/index.js +1 -1
- package/dist/src/db/models/transaction.js +76 -0
- package/dist/{db → src/db}/sequelize.js +2 -1
- 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 +119 -0
- package/dist/{logger → src/logger}/index.js +0 -0
- package/dist/{net → src/net}/index.js +0 -0
- package/dist/{net → src/net}/peer/index.js +13 -8
- package/dist/{net → src/net}/pool/index.js +34 -11
- package/dist/{net → src/net}/protocol/dial/BaseDialProtocol.js +1 -1
- package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js +21 -14
- package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +30 -0
- package/dist/{net → src/net}/protocol/index.js +54 -4
- package/dist/src/tasks/AutoUpdateTask.js +70 -0
- package/dist/{tasks → src/tasks}/BaseTask.js +14 -6
- package/dist/src/tasks/InteropX/ProcessSubmitSubmitEvents.js +179 -0
- package/dist/src/tasks/InteropX/ProcessValidateEvents.js +183 -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 +58 -0
- package/dist/src/tasks/index.js +43 -0
- package/dist/src/typechain/Erc20.js +2 -0
- package/dist/src/typechain/GnosisSafe.js +2 -0
- package/dist/src/typechain/InstList.js +2 -0
- package/dist/src/typechain/InteropX.js +2 -0
- package/dist/src/typechain/common.js +2 -0
- package/dist/src/typechain/factories/Erc20__factory.js +367 -0
- package/dist/src/typechain/factories/GnosisSafe__factory.js +1174 -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 +14 -0
- package/dist/src/typechain/index.js +35 -0
- package/dist/{types.js → src/types.js} +0 -0
- package/dist/src/utils/index.js +223 -0
- package/package.json +33 -16
- package/patches/@ethersproject+properties+5.6.0.patch +13 -0
- 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/erc20.json +350 -0
- package/src/abi/gnosisSafe.json +747 -0
- package/src/abi/index.ts +13 -0
- 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 +36 -0
- package/src/config/index.ts +18 -2
- package/src/constants/addresses.ts +12 -6
- package/src/constants/blockConfirmations.ts +5 -0
- package/src/constants/index.ts +2 -0
- package/src/constants/tokens.ts +127 -0
- package/src/db/index.ts +1 -1
- package/src/db/models/index.ts +1 -1
- package/src/db/models/transaction.ts +169 -0
- package/src/db/sequelize.ts +2 -1
- 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 +118 -7
- package/src/net/peer/index.ts +12 -10
- package/src/net/pool/index.ts +43 -13
- package/src/net/protocol/dial/BaseDialProtocol.ts +1 -1
- package/src/net/protocol/dial/SignatureDialProtocol.ts +25 -17
- package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +33 -0
- package/src/net/protocol/index.ts +70 -4
- package/src/tasks/AutoUpdateTask.ts +82 -0
- package/src/tasks/BaseTask.ts +16 -7
- package/src/tasks/InteropX/ProcessSubmitSubmitEvents.ts +269 -0
- package/src/tasks/InteropX/ProcessValidateEvents.ts +274 -0
- package/src/tasks/InteropX/SyncLogSubmitEvents.ts +139 -0
- package/src/tasks/InteropX/SyncLogValidateEvents.ts +152 -0
- package/src/tasks/Transactions/SyncTransactionStatusTask.ts +70 -0
- package/src/tasks/index.ts +29 -2
- package/src/typechain/Erc20.ts +491 -0
- package/src/typechain/GnosisSafe.ts +1728 -0
- package/src/typechain/InstList.ts +402 -0
- package/src/typechain/InteropX.ts +1216 -0
- package/src/typechain/common.ts +44 -0
- package/src/typechain/factories/Erc20__factory.ts +368 -0
- package/src/typechain/factories/GnosisSafe__factory.ts +1178 -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 +7 -0
- package/src/typechain/index.ts +12 -0
- package/src/types.ts +2 -2
- package/src/utils/index.ts +285 -36
- package/tsconfig.json +8 -0
- package/dist/config/index.js +0 -17
- package/dist/constants/addresses.js +0 -13
- package/dist/db/models/execution.js +0 -38
- package/dist/index.js +0 -34
- package/dist/tasks/index.js +0 -19
- package/dist/utils/index.js +0 -89
- package/src/db/models/execution.ts +0 -57
@@ -3,8 +3,10 @@ import Libp2p from 'libp2p';
|
|
3
3
|
import { bufferToInt, rlp } from 'ethereumjs-util'
|
4
4
|
import { SignatureDialProtocol, ISignatureRequest, ISignatureResponse } from "./dial/SignatureDialProtocol";
|
5
5
|
import { IPeerInfo, peerPool } from "..";
|
6
|
-
import config from "config";
|
7
|
-
import { Event } from "types";
|
6
|
+
import config from "@/config";
|
7
|
+
import { Event } from "@/types";
|
8
|
+
import { Transaction } from "@/db";
|
9
|
+
import { TransactionStatusDialProtocol } from "./dial/TransactionStatusDialProtocol";
|
8
10
|
|
9
11
|
export interface ProtocolOptions {
|
10
12
|
/* Handshake timeout in ms (default: 8000) */
|
@@ -33,7 +35,12 @@ interface PeerInfoEvent extends BaseMessageEvent {
|
|
33
35
|
data: Omit<IPeerInfo, 'id' | 'updated' | 'idle' | 'pooled'>
|
34
36
|
}
|
35
37
|
|
38
|
+
interface TransactionStatusEvent extends BaseMessageEvent {
|
39
|
+
data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'>
|
40
|
+
}
|
41
|
+
|
36
42
|
declare interface Protocol {
|
43
|
+
on(event: 'TransactionStatus', listener: (payload: TransactionStatusEvent) => void): this;
|
37
44
|
on(event: 'PeerInfo', listener: (payload: PeerInfoEvent) => void): this;
|
38
45
|
on(event: string, listener: (payload: BaseMessageEvent) => void): this;
|
39
46
|
}
|
@@ -44,7 +51,7 @@ class Protocol extends EventEmitter {
|
|
44
51
|
private protocolMessages: Message[] = [
|
45
52
|
{
|
46
53
|
name: 'PeerInfo',
|
47
|
-
code:
|
54
|
+
code: 0x01,
|
48
55
|
encode: (info: Pick<IPeerInfo, 'publicAddress'>) => [
|
49
56
|
Buffer.from(info.publicAddress),
|
50
57
|
],
|
@@ -52,13 +59,54 @@ class Protocol extends EventEmitter {
|
|
52
59
|
publicAddress: publicAddress.toString(),
|
53
60
|
}),
|
54
61
|
},
|
62
|
+
{
|
63
|
+
name: 'TransactionStatus',
|
64
|
+
code: 0x02,
|
65
|
+
encode: (transaction: Transaction) => [
|
66
|
+
Buffer.from(transaction.transactionHash),
|
67
|
+
|
68
|
+
Buffer.from(transaction.sourceStatus),
|
69
|
+
Buffer.from(transaction.sourceTransactionHash || ''),
|
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)]) : [],
|
72
|
+
|
73
|
+
Buffer.from(transaction.targetStatus),
|
74
|
+
Buffer.from(transaction.targetTransactionHash || ''),
|
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)]) : [],
|
77
|
+
|
78
|
+
Buffer.from(transaction.status),
|
79
|
+
],
|
80
|
+
decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]: [Buffer, Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer]) => ({
|
81
|
+
transactionHash: transactionHash.toString(),
|
82
|
+
|
83
|
+
sourceStatus: sourceStatus.toString(),
|
84
|
+
sourceTransactionHash: sourceTransactionHash.toString() || null,
|
85
|
+
sourceErrors: sourceErrors.map((e) => e.toString()),
|
86
|
+
sourceLogs: sourceLogs.map(e => ({
|
87
|
+
type: e[0].toString(),
|
88
|
+
message: e[1].toString(),
|
89
|
+
})),
|
90
|
+
|
91
|
+
targetStatus: targetStatus.toString(),
|
92
|
+
targetTransactionHash: targetTransactionHash.toString() || null,
|
93
|
+
targetErrors: targetErrors.map((e) => e.toString()),
|
94
|
+
targetLogs: targetLogs.map(e => ({
|
95
|
+
type: e[0].toString(),
|
96
|
+
message: e[1].toString(),
|
97
|
+
})),
|
98
|
+
|
99
|
+
status: status.toString(),
|
100
|
+
}),
|
101
|
+
},
|
55
102
|
];
|
56
103
|
private signature: SignatureDialProtocol;
|
104
|
+
private transactionStatus: TransactionStatusDialProtocol;
|
57
105
|
|
58
106
|
|
59
107
|
start({ libp2p, topic = null, }) {
|
60
108
|
this.libp2p = libp2p
|
61
|
-
this.topic = topic || 'protocol'
|
109
|
+
this.topic = topic || 'itnerop-x-protocol'
|
62
110
|
|
63
111
|
if (this.libp2p.isStarted()) this.init()
|
64
112
|
|
@@ -73,6 +121,7 @@ class Protocol extends EventEmitter {
|
|
73
121
|
})
|
74
122
|
|
75
123
|
this.signature = new SignatureDialProtocol(this.libp2p);
|
124
|
+
this.transactionStatus = new TransactionStatusDialProtocol(this.libp2p);
|
76
125
|
}
|
77
126
|
|
78
127
|
|
@@ -121,6 +170,14 @@ class Protocol extends EventEmitter {
|
|
121
170
|
this.libp2p.pubsub.publish(this.topic, encoded)
|
122
171
|
}
|
123
172
|
|
173
|
+
public sendTransaction(transaction: Transaction) {
|
174
|
+
const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus')!
|
175
|
+
|
176
|
+
const encoded = rlp.encode([message.code, message.encode(transaction)]);
|
177
|
+
|
178
|
+
this.libp2p.pubsub.publish(this.topic, encoded)
|
179
|
+
}
|
180
|
+
|
124
181
|
async requestSignatures(data: ISignatureRequest, peerIds?: string[]) {
|
125
182
|
try {
|
126
183
|
peerIds = peerIds || peerPool.activePeerIds;
|
@@ -133,6 +190,15 @@ class Protocol extends EventEmitter {
|
|
133
190
|
return []
|
134
191
|
}
|
135
192
|
}
|
193
|
+
|
194
|
+
async requestTransactionStatus(transactionHash: string, peerId: string) {
|
195
|
+
try {
|
196
|
+
return await this.transactionStatus.send(transactionHash, peerId);
|
197
|
+
} catch (error) {
|
198
|
+
console.log(error);
|
199
|
+
return null
|
200
|
+
}
|
201
|
+
}
|
136
202
|
}
|
137
203
|
|
138
204
|
export const protocol = new Protocol();
|
@@ -0,0 +1,82 @@
|
|
1
|
+
import { BaseTask } from "./BaseTask";
|
2
|
+
import Logger from '@/logger';
|
3
|
+
import spawnAsync from 'await-spawn';
|
4
|
+
import { spawn } from 'child_process'
|
5
|
+
import config from "@/config";
|
6
|
+
import wait from "waait";
|
7
|
+
import packageJson from "../../package.json";
|
8
|
+
|
9
|
+
const currentVersion = packageJson.version;
|
10
|
+
const tag = config.staging ? 'dev' : 'latest';
|
11
|
+
|
12
|
+
class AutoUpdateTask extends BaseTask {
|
13
|
+
pollIntervalMs: number = 60 * 10 * 1000
|
14
|
+
|
15
|
+
constructor() {
|
16
|
+
super({
|
17
|
+
logger: new Logger("AutoUpdateTask"),
|
18
|
+
})
|
19
|
+
}
|
20
|
+
|
21
|
+
prePollHandler(): boolean {
|
22
|
+
return config.autoUpdate && !config.isLeadNode();
|
23
|
+
}
|
24
|
+
|
25
|
+
async getInstalledVersion() {
|
26
|
+
try {
|
27
|
+
const stdout = await spawnAsync('npm', ['-g', 'ls', '--depth=0', '--json'])
|
28
|
+
return JSON.parse(stdout.toString()).dependencies[packageJson.name].version
|
29
|
+
} catch (error) {
|
30
|
+
this.logger.error(error)
|
31
|
+
return currentVersion
|
32
|
+
}
|
33
|
+
}
|
34
|
+
|
35
|
+
async getLatestVersion() {
|
36
|
+
try {
|
37
|
+
const stdout = await spawnAsync('npm', ['view', `${packageJson.name}@${tag}`, 'version'])
|
38
|
+
return stdout.toString().trim()
|
39
|
+
} catch (error) {
|
40
|
+
this.logger.error(error)
|
41
|
+
return currentVersion
|
42
|
+
}
|
43
|
+
}
|
44
|
+
|
45
|
+
async pollHandler() {
|
46
|
+
const version = await this.getLatestVersion()
|
47
|
+
|
48
|
+
if (version === currentVersion) {
|
49
|
+
return;
|
50
|
+
}
|
51
|
+
|
52
|
+
this.logger.warn(`New version ${version} available.`)
|
53
|
+
|
54
|
+
this.logger.info('Updating...')
|
55
|
+
|
56
|
+
await spawnAsync('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
|
57
|
+
|
58
|
+
await wait(5000)
|
59
|
+
|
60
|
+
if (version !== await this.getInstalledVersion()) {
|
61
|
+
this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
|
62
|
+
return;
|
63
|
+
}
|
64
|
+
|
65
|
+
this.logger.warn(`Installed version ${version}`)
|
66
|
+
this.logger.warn(`Restarting...`)
|
67
|
+
|
68
|
+
|
69
|
+
// TODO: its restarting in the bg, but it should be in the fg
|
70
|
+
const subprocess = spawn(process.argv[0], process.argv.slice(1), {
|
71
|
+
cwd: process.cwd(),
|
72
|
+
stdio: "inherit",
|
73
|
+
// shell: process.env.SHELL,
|
74
|
+
});
|
75
|
+
|
76
|
+
subprocess.unref();
|
77
|
+
|
78
|
+
process.exit()
|
79
|
+
}
|
80
|
+
}
|
81
|
+
|
82
|
+
export default AutoUpdateTask;
|
package/src/tasks/BaseTask.ts
CHANGED
@@ -1,8 +1,7 @@
|
|
1
|
-
import config from "config";
|
2
|
-
import { ethers } from "ethers";
|
1
|
+
import config from "@/config";
|
3
2
|
import EventEmitter from "events";
|
4
3
|
import wait from "waait";
|
5
|
-
import Logger from "
|
4
|
+
import Logger from "@/logger";
|
6
5
|
|
7
6
|
export interface IBaseTask {
|
8
7
|
pollCheck(): Promise<void>
|
@@ -20,6 +19,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
|
|
20
19
|
started: boolean = false
|
21
20
|
pollIntervalMs: number = 10 * 1000
|
22
21
|
leadNodeOnly: boolean = false
|
22
|
+
exceptLeadNode: boolean = false
|
23
23
|
|
24
24
|
public constructor({ logger }: { logger?: Logger }) {
|
25
25
|
super()
|
@@ -38,7 +38,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
|
|
38
38
|
await this.pollHandler()
|
39
39
|
}
|
40
40
|
} catch (err) {
|
41
|
-
this.logger.error(`poll check error
|
41
|
+
this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`)
|
42
42
|
}
|
43
43
|
|
44
44
|
await this.postPollHandler()
|
@@ -46,11 +46,20 @@ export class BaseTask extends EventEmitter implements IBaseTask {
|
|
46
46
|
}
|
47
47
|
|
48
48
|
prePollHandler(): boolean {
|
49
|
-
if
|
50
|
-
|
49
|
+
if(config.isMaintenanceMode()){
|
50
|
+
this.logger.warn('Maintenance mode is enabled. Skipping task.')
|
51
|
+
return false
|
51
52
|
}
|
52
53
|
|
53
|
-
|
54
|
+
if (this.exceptLeadNode) {
|
55
|
+
return !config.isLeadNode();
|
56
|
+
}
|
57
|
+
|
58
|
+
if (this.leadNodeOnly) {
|
59
|
+
return config.isLeadNode()
|
60
|
+
}
|
61
|
+
|
62
|
+
return true
|
54
63
|
}
|
55
64
|
|
56
65
|
async pollHandler() {
|
@@ -0,0 +1,269 @@
|
|
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
|
+
this.logger.debug(`Processing transaction ${transaction.transactionHash}`);
|
72
|
+
|
73
|
+
transaction.sourceStatus = "proccessing";
|
74
|
+
await transaction.save();
|
75
|
+
|
76
|
+
const ownersThreshold = await this.sourceGnosisContract.getThreshold();
|
77
|
+
await wait(10000);
|
78
|
+
|
79
|
+
this.logger.debug(`Build gnosis action for ${transaction.transactionHash}`);
|
80
|
+
|
81
|
+
let data,
|
82
|
+
logs = [];
|
83
|
+
|
84
|
+
try {
|
85
|
+
({ data, logs } = await buildGnosisAction(transaction, "source"));
|
86
|
+
} catch (error) {
|
87
|
+
if (error instanceof LiquidityError) {
|
88
|
+
await transaction.save();
|
89
|
+
transaction.sourceDelayUntil = new Date(Date.now() + 60 * 5 * 1000);
|
90
|
+
transaction.sourceStatus = "pending";
|
91
|
+
|
92
|
+
await transaction.save();
|
93
|
+
|
94
|
+
throw error;
|
95
|
+
return;
|
96
|
+
}
|
97
|
+
|
98
|
+
transaction.sourceStatus = "failed";
|
99
|
+
transaction.sourceErrors = [error.message];
|
100
|
+
transaction.targetStatus = "failed";
|
101
|
+
|
102
|
+
transaction.status = "failed";
|
103
|
+
await transaction.save();
|
104
|
+
protocol.sendTransaction(transaction);
|
105
|
+
return;
|
106
|
+
}
|
107
|
+
|
108
|
+
this.logger.debug(
|
109
|
+
`Generating gnosis tx for ${transaction.transactionHash}`
|
110
|
+
);
|
111
|
+
|
112
|
+
let gnosisTx = await generateGnosisTransaction(
|
113
|
+
{
|
114
|
+
baseGas: "0",
|
115
|
+
data,
|
116
|
+
gasPrice: "0",
|
117
|
+
gasToken: "0x0000000000000000000000000000000000000000",
|
118
|
+
nonce: "0",
|
119
|
+
operation: "1",
|
120
|
+
refundReceiver: "0x0000000000000000000000000000000000000000",
|
121
|
+
safeAddress: this.sourceGnosisContract.address,
|
122
|
+
safeTxGas: "79668",
|
123
|
+
to: addresses[transaction.sourceChainId].multisend,
|
124
|
+
value: "0",
|
125
|
+
},
|
126
|
+
this.sourceGnosisContract
|
127
|
+
);
|
128
|
+
|
129
|
+
const owners = await this.sourceGnosisContract
|
130
|
+
.getOwners()
|
131
|
+
.then((owners) => owners.map((owner) => owner.toLowerCase()));
|
132
|
+
|
133
|
+
const ownerPeerIds = peerPool.activePeers
|
134
|
+
.filter((peer) => owners.includes(peer.publicAddress.toLowerCase()))
|
135
|
+
.map((peer) => peer.id);
|
136
|
+
|
137
|
+
console.log(
|
138
|
+
`Collecting signatures for execution ${transaction.transactionHash}`
|
139
|
+
);
|
140
|
+
|
141
|
+
console.log(ownerPeerIds);
|
142
|
+
|
143
|
+
const signatures = await protocol.requestSignatures(
|
144
|
+
{
|
145
|
+
type: "source",
|
146
|
+
transactionHash: transaction.transactionHash,
|
147
|
+
safeTxGas: gnosisTx.safeTxGas,
|
148
|
+
safeNonce: gnosisTx.nonce,
|
149
|
+
chainId: this.chainId,
|
150
|
+
},
|
151
|
+
ownerPeerIds
|
152
|
+
);
|
153
|
+
|
154
|
+
const validSignatures = signatures.filter(
|
155
|
+
(s) => !!s.data && s.data !== "0x"
|
156
|
+
) as Signature[];
|
157
|
+
|
158
|
+
console.log({
|
159
|
+
signatures,
|
160
|
+
validSignatures,
|
161
|
+
ownersThreshold: ownersThreshold.toString(),
|
162
|
+
});
|
163
|
+
|
164
|
+
if (
|
165
|
+
validSignatures.length === 0 ||
|
166
|
+
ownersThreshold.gt(validSignatures.length)
|
167
|
+
) {
|
168
|
+
await transaction.save();
|
169
|
+
transaction.sourceDelayUntil = new Date(Date.now() + 30 * 1000);
|
170
|
+
transaction.sourceStatus = "pending";
|
171
|
+
|
172
|
+
await transaction.save();
|
173
|
+
const errorMessage = signatures.find((s) => !!s.error)?.error;
|
174
|
+
throw new Error(
|
175
|
+
`Not enough signatures` + (errorMessage ? `: ${errorMessage}` : "")
|
176
|
+
);
|
177
|
+
}
|
178
|
+
|
179
|
+
console.log(
|
180
|
+
`Executing transaction for execution ${transaction.transactionHash}`
|
181
|
+
);
|
182
|
+
|
183
|
+
const { data: txData } =
|
184
|
+
await this.sourceGnosisContract.populateTransaction.execTransaction(
|
185
|
+
gnosisTx.to,
|
186
|
+
gnosisTx.value,
|
187
|
+
gnosisTx.data,
|
188
|
+
gnosisTx.operation,
|
189
|
+
gnosisTx.safeTxGas,
|
190
|
+
gnosisTx.baseGas,
|
191
|
+
gnosisTx.gasPrice,
|
192
|
+
gnosisTx.gasToken,
|
193
|
+
gnosisTx.refundReceiver,
|
194
|
+
buildSignatureBytes(validSignatures)
|
195
|
+
);
|
196
|
+
|
197
|
+
const [gasPrice, gasLimit] = await Promise.all([
|
198
|
+
this.sourceProvider.getGasPrice(),
|
199
|
+
this.sourceProvider.estimateGas({
|
200
|
+
from: this.sourceWallet.address,
|
201
|
+
to: this.sourceGnosisContract.address,
|
202
|
+
data: txData,
|
203
|
+
}),
|
204
|
+
]);
|
205
|
+
|
206
|
+
const txSent = await this.sourceWallet.sendTransaction({
|
207
|
+
from: this.sourceWallet.address,
|
208
|
+
to: this.sourceGnosisContract.address,
|
209
|
+
gasPrice: gasPrice.mul(120).div(100),
|
210
|
+
gasLimit: 5_000_000,//gasLimit.mul(120).div(100),
|
211
|
+
data: txData,
|
212
|
+
});
|
213
|
+
|
214
|
+
console.log(txSent);
|
215
|
+
|
216
|
+
const receipt = await txSent.wait();
|
217
|
+
|
218
|
+
const parsedLogs: LogDescription[] = [];
|
219
|
+
|
220
|
+
receipt.logs.forEach((log) => {
|
221
|
+
try {
|
222
|
+
parsedLogs.push(this.sourceGnosisContract.interface.parseLog(log));
|
223
|
+
} catch (e) {}
|
224
|
+
});
|
225
|
+
|
226
|
+
if (parsedLogs.find((e) => e.name === "ExecutionSuccess")) {
|
227
|
+
console.log("ExecutionSuccess");
|
228
|
+
transaction.sourceStatus = "success";
|
229
|
+
if (txSent.blockNumber)
|
230
|
+
transaction.sourceBlockNumber = txSent.blockNumber;
|
231
|
+
transaction.sourceTransactionHash = txSent.hash;
|
232
|
+
transaction.sourceLogs = logs;
|
233
|
+
await transaction.save();
|
234
|
+
} else {
|
235
|
+
console.log("ExecutionFailure");
|
236
|
+
transaction.sourceStatus = "failed";
|
237
|
+
if (txSent.blockNumber)
|
238
|
+
transaction.sourceBlockNumber = txSent.blockNumber;
|
239
|
+
transaction.sourceTransactionHash = txSent.hash;
|
240
|
+
transaction.status = "failed";
|
241
|
+
await transaction.save();
|
242
|
+
}
|
243
|
+
|
244
|
+
protocol.sendTransaction(transaction);
|
245
|
+
}
|
246
|
+
|
247
|
+
async start(): Promise<void> {
|
248
|
+
this.blockConfirmationsCount = blockConfirmations[this.chainId] + 1;
|
249
|
+
|
250
|
+
this.sourceProvider = new ethers.providers.JsonRpcProvider(
|
251
|
+
getRpcProviderUrl(this.chainId)
|
252
|
+
);
|
253
|
+
|
254
|
+
this.sourceWallet = new ethers.Wallet(
|
255
|
+
config.privateKey!,
|
256
|
+
this.sourceProvider
|
257
|
+
);
|
258
|
+
|
259
|
+
this.sourceGnosisContract = getContract<GnosisSafe>(
|
260
|
+
addresses[this.chainId].gnosisSafe,
|
261
|
+
abi.gnosisSafe,
|
262
|
+
this.sourceWallet
|
263
|
+
);
|
264
|
+
|
265
|
+
await super.start();
|
266
|
+
}
|
267
|
+
}
|
268
|
+
|
269
|
+
export default ProcessSubmitSubmitEvents;
|