@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
package/src/alias.ts
ADDED
package/src/api/index.ts
CHANGED
@@ -1,17 +1,14 @@
|
|
1
1
|
export const addresses = {
|
2
|
-
1: {
|
3
|
-
gnosisSafe: '0x811Bff6eF88dAAA0aD6438386B534A81cE3F160F',
|
4
|
-
multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
|
5
|
-
interopXGateway: '',
|
6
|
-
},
|
7
2
|
137: {
|
8
3
|
gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
|
9
4
|
multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
|
10
|
-
|
5
|
+
interopX: '0xDB6083df37C5F224a3dF84A4B5f9fB60b6c8670a',
|
6
|
+
dsaAddress: '0x9Fbd453a8e7a158510fBae5D9935958507cf4b19',
|
11
7
|
},
|
12
8
|
43114: {
|
13
9
|
gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
|
14
10
|
multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
|
15
|
-
|
11
|
+
interopX: '0xd61f55C6d9deD35B9d13243b816c4BcC1d78592b',
|
12
|
+
dsaAddress: '0xFcB7d826E32081c4799de2f83b47b49df600dc8c',
|
16
13
|
}
|
17
|
-
}
|
14
|
+
} as Record<number, { gnosisSafe: string, multisend: string, interopX: string, dsaAddress: string }>
|
package/src/constants/index.ts
CHANGED
package/src/constants/tokens.ts
CHANGED
@@ -1,104 +1,127 @@
|
|
1
1
|
export const tokens = {
|
2
|
-
1: [
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
2
|
+
// 1: [
|
3
|
+
// {
|
4
|
+
// aliases: ['eth'],
|
5
|
+
// symbol: "ETH",
|
6
|
+
// name: "Ethereum",
|
7
|
+
// address: "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
|
8
|
+
// decimals: 18,
|
9
|
+
// },
|
10
|
+
// {
|
11
|
+
// aliases: ['weth'],
|
12
|
+
// symbol: "WETH",
|
13
|
+
// name: "Wrapped Ethereum",
|
14
|
+
// address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
|
15
|
+
// decimals: 18,
|
16
|
+
// },
|
17
|
+
// {
|
18
|
+
// aliases: ['dai'],
|
19
|
+
// symbol: "DAI",
|
20
|
+
// name: "DAI Stable",
|
21
|
+
// address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
|
22
|
+
// decimals: 18,
|
23
|
+
// },
|
24
|
+
// {
|
25
|
+
// aliases: ['usdc'],
|
26
|
+
// symbol: "USDC",
|
27
|
+
// name: "USD Coin",
|
28
|
+
// address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
|
29
|
+
// decimals: 6,
|
30
|
+
// },
|
31
|
+
// {
|
32
|
+
// aliases: ['usdt'],
|
33
|
+
// symbol: "USDT",
|
34
|
+
// name: "Tether USD Coin",
|
35
|
+
// address: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
|
36
|
+
// decimals: 6,
|
37
|
+
// },
|
38
|
+
// {
|
39
|
+
// aliases: ['wbtc'],
|
40
|
+
// symbol: "WBTC",
|
41
|
+
// name: "Wrapped BTC",
|
42
|
+
// address: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
|
43
|
+
// decimals: 8,
|
44
|
+
// },
|
45
|
+
// ],
|
34
46
|
137: [
|
35
47
|
{
|
48
|
+
aliases: ['eth', 'weth'],
|
36
49
|
symbol: "ETH",
|
37
50
|
name: "Ethereum",
|
38
51
|
address: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619",
|
39
52
|
decimals: 18,
|
40
53
|
},
|
41
54
|
{
|
55
|
+
aliases: ['dai'],
|
42
56
|
symbol: "DAI",
|
43
57
|
name: "DAI Stable",
|
44
58
|
address: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063",
|
45
59
|
decimals: 18,
|
46
60
|
},
|
47
61
|
{
|
62
|
+
aliases: ['usdc'],
|
48
63
|
symbol: "USDC",
|
49
64
|
name: "USD Coin",
|
50
65
|
address: "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174",
|
51
66
|
decimals: 6,
|
52
67
|
},
|
53
68
|
{
|
69
|
+
aliases: ['usdt'],
|
54
70
|
symbol: "USDT",
|
55
71
|
name: "Tether USD Coin",
|
56
72
|
address: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F",
|
57
73
|
decimals: 6,
|
58
74
|
},
|
59
75
|
{
|
76
|
+
aliases: ['wbtc'],
|
60
77
|
symbol: "WBTC",
|
61
78
|
name: "Wrapped BTC",
|
62
79
|
address: "0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6",
|
63
80
|
decimals: 8,
|
64
81
|
},
|
65
|
-
{
|
66
|
-
symbol: "AVAX",
|
67
|
-
name: "Avalanche Token",
|
68
|
-
address: "0x2C89bbc92BD86F8075d1DEcc58C7F4E0107f286b",
|
69
|
-
decimals: 18,
|
70
|
-
},
|
71
82
|
],
|
72
83
|
43114: [
|
73
84
|
{
|
85
|
+
aliases: ['eth', 'weth'],
|
74
86
|
symbol: "ETH",
|
75
87
|
name: "Ethereum",
|
76
88
|
address: "0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB",
|
77
89
|
decimals: 18,
|
78
90
|
},
|
79
91
|
{
|
92
|
+
aliases: ['dai'],
|
80
93
|
symbol: "DAI",
|
81
94
|
name: "DAI Stable",
|
82
95
|
address: "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
|
83
96
|
decimals: 18,
|
84
97
|
},
|
85
98
|
{
|
99
|
+
aliases: ['usdc'],
|
86
100
|
symbol: "USDC",
|
87
101
|
name: "USD Coin",
|
88
102
|
address: "0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664",
|
89
103
|
decimals: 6,
|
90
104
|
},
|
91
105
|
{
|
92
|
-
|
106
|
+
aliases: ['usdt'],
|
107
|
+
symbol: "USDt",
|
93
108
|
name: "Tether USD Coin",
|
109
|
+
address: "0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7",
|
110
|
+
decimals: 6,
|
111
|
+
},
|
112
|
+
{
|
113
|
+
aliases: ['usdt'],
|
114
|
+
symbol: "USDT.e",
|
115
|
+
name: "Tether USD",
|
94
116
|
address: "0xc7198437980c041c805A1EDcbA50c1Ce5db95118",
|
95
117
|
decimals: 6,
|
96
118
|
},
|
97
119
|
{
|
120
|
+
aliases: ["wbtc"],
|
98
121
|
symbol: "WBTC",
|
99
122
|
name: "Wrapped BTC",
|
100
123
|
address: "0x50b7545627a5162F82A992c33b87aDc75187B218",
|
101
124
|
decimals: 8,
|
102
125
|
},
|
103
126
|
],
|
104
|
-
}
|
127
|
+
} as Record<number, { aliases: string[], symbol: string, name: string, address: string, decimals: number }[]>;
|
@@ -1,40 +1,64 @@
|
|
1
1
|
import { sequelize } from '@/db/sequelize'
|
2
2
|
import { CreationOptional, InferAttributes, InferCreationAttributes, Model, DataTypes } from 'sequelize';
|
3
3
|
|
4
|
+
export interface IPositionTokenInfo {
|
5
|
+
amount: string;
|
6
|
+
sourceToken: string;
|
7
|
+
targetToken: string;
|
8
|
+
}
|
9
|
+
|
10
|
+
export interface IPosition {
|
11
|
+
supply: IPositionTokenInfo[];
|
12
|
+
withdraw: IPositionTokenInfo[];
|
13
|
+
}
|
14
|
+
|
4
15
|
export class Transaction extends Model<InferAttributes<Transaction>, InferCreationAttributes<Transaction>> {
|
5
16
|
declare id: CreationOptional<number>;
|
6
17
|
|
7
18
|
declare transactionHash: string;
|
8
|
-
declare
|
9
|
-
declare
|
10
|
-
declare
|
19
|
+
declare vnonce: string;
|
20
|
+
declare actionId: string;
|
21
|
+
declare sourceSender: string;
|
11
22
|
|
23
|
+
declare submitChainId: number;
|
12
24
|
declare submitTransactionHash: string;
|
13
25
|
declare submitBlockNumber: number;
|
26
|
+
declare submitCreatedAt: Date;
|
14
27
|
|
15
28
|
declare sourceChainId: number;
|
29
|
+
declare sourceDsaId: string;
|
16
30
|
declare sourceTransactionHash: CreationOptional<string>;
|
17
31
|
declare sourceBlockNumber: CreationOptional<number>;
|
18
|
-
declare sourceStatus: string
|
32
|
+
declare sourceStatus: CreationOptional<string>;
|
19
33
|
declare sourceErrors: CreationOptional<string[]>;
|
34
|
+
declare sourceLogs: CreationOptional<any[]>;
|
20
35
|
declare sourceCreatedAt: CreationOptional<Date>;
|
21
36
|
declare sourceDelayUntil: CreationOptional<Date>;
|
22
37
|
|
23
38
|
declare targetChainId: number;
|
39
|
+
declare targetDsaId: string;
|
24
40
|
declare targetTransactionHash: CreationOptional<string>;
|
25
41
|
declare targetBlockNumber: CreationOptional<number>;
|
26
|
-
declare targetStatus: string
|
42
|
+
declare targetStatus: CreationOptional<string>;
|
27
43
|
declare targetErrors: CreationOptional<string[]>;
|
44
|
+
declare targetLogs: CreationOptional<any[]>;
|
28
45
|
declare targetCreatedAt: CreationOptional<Date>;
|
29
46
|
declare targetDelayUntil: CreationOptional<Date>;
|
30
47
|
|
31
|
-
declare submitEvent:
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
48
|
+
declare submitEvent: {
|
49
|
+
position: IPosition;
|
50
|
+
actionId: string;
|
51
|
+
actionIdHashHash: string;
|
52
|
+
sourceSender: string;
|
53
|
+
sourceDsaId: string;
|
54
|
+
targetDsaId: string;
|
55
|
+
sourceChainId: number;
|
56
|
+
targetChainId: number;
|
57
|
+
vnonce: string;
|
58
|
+
metadata: string;
|
59
|
+
};
|
60
|
+
|
61
|
+
declare status: CreationOptional<string>;
|
38
62
|
|
39
63
|
declare createdAt: CreationOptional<Date>;
|
40
64
|
declare updatedAt: CreationOptional<Date>;
|
@@ -47,23 +71,32 @@ Transaction.init({
|
|
47
71
|
primaryKey: true
|
48
72
|
},
|
49
73
|
|
50
|
-
submitTransactionHash: DataTypes.NUMBER,
|
51
|
-
submitBlockNumber: DataTypes.NUMBER,
|
52
|
-
|
53
74
|
transactionHash: DataTypes.STRING,
|
54
|
-
|
75
|
+
actionId: DataTypes.STRING,
|
76
|
+
vnonce: DataTypes.STRING,
|
77
|
+
sourceSender: DataTypes.STRING,
|
55
78
|
|
56
|
-
|
57
|
-
|
79
|
+
submitChainId: DataTypes.NUMBER,
|
80
|
+
submitTransactionHash: DataTypes.STRING,
|
81
|
+
submitBlockNumber: DataTypes.NUMBER,
|
82
|
+
submitCreatedAt: DataTypes.DATE,
|
58
83
|
|
59
84
|
sourceChainId: DataTypes.NUMBER,
|
85
|
+
sourceDsaId: DataTypes.STRING,
|
60
86
|
sourceTransactionHash: DataTypes.STRING,
|
61
87
|
sourceBlockNumber: DataTypes.NUMBER,
|
62
|
-
sourceStatus:
|
88
|
+
sourceStatus: {
|
89
|
+
type: DataTypes.STRING,
|
90
|
+
defaultValue: 'pending'
|
91
|
+
},
|
63
92
|
sourceErrors: {
|
64
93
|
type: DataTypes.JSON,
|
65
94
|
// defaultValue: [],
|
66
95
|
},
|
96
|
+
sourceLogs: {
|
97
|
+
type: DataTypes.JSON,
|
98
|
+
// defaultValue: [],
|
99
|
+
},
|
67
100
|
sourceCreatedAt: {
|
68
101
|
type: DataTypes.DATE,
|
69
102
|
defaultValue: Date.now()
|
@@ -71,21 +104,28 @@ Transaction.init({
|
|
71
104
|
sourceDelayUntil: DataTypes.STRING,
|
72
105
|
|
73
106
|
targetChainId: DataTypes.NUMBER,
|
107
|
+
targetDsaId: DataTypes.STRING,
|
74
108
|
targetTransactionHash: DataTypes.STRING,
|
75
109
|
targetBlockNumber: DataTypes.NUMBER,
|
76
|
-
targetStatus:
|
110
|
+
targetStatus: {
|
111
|
+
type: DataTypes.STRING,
|
112
|
+
defaultValue: 'pending'
|
113
|
+
},
|
77
114
|
targetErrors: {
|
78
115
|
type: DataTypes.JSON,
|
79
116
|
// defaultValue: [],
|
80
117
|
},
|
118
|
+
targetLogs: {
|
119
|
+
type: DataTypes.JSON,
|
120
|
+
// defaultValue: [],
|
121
|
+
},
|
81
122
|
targetCreatedAt: DataTypes.DATE,
|
82
123
|
targetDelayUntil: DataTypes.DATE,
|
83
124
|
|
84
|
-
submitEvent:
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
metadata: DataTypes.JSON,
|
125
|
+
submitEvent: {
|
126
|
+
type: DataTypes.JSON,
|
127
|
+
allowNull: false
|
128
|
+
},
|
89
129
|
|
90
130
|
status: {
|
91
131
|
type: DataTypes.STRING,
|
@@ -0,0 +1,9 @@
|
|
1
|
+
import { Transaction } from "@/db";
|
2
|
+
import source from "./source";
|
3
|
+
import target from "./target";
|
4
|
+
|
5
|
+
|
6
|
+
|
7
|
+
export default async function (transaction: Transaction, type: 'source' | 'target') {
|
8
|
+
return type === 'source' ? source(transaction) : target(transaction);
|
9
|
+
}
|
@@ -0,0 +1,104 @@
|
|
1
|
+
import abi from "@/abi";
|
2
|
+
import config from "@/config";
|
3
|
+
import { addresses } from "@/constants";
|
4
|
+
import { Transaction } from "@/db";
|
5
|
+
import { InteropX } from "@/typechain";
|
6
|
+
import { ChainId } from "@/types";
|
7
|
+
import { encodeConnectorMethod, getContract, getRpcProviderUrl } from "@/utils";
|
8
|
+
import { ethers } from "ethers";
|
9
|
+
import { MetaTransaction, OperationType } from "ethers-multisend";
|
10
|
+
|
11
|
+
export default async function (transaction: Transaction) {
|
12
|
+
const transactions: MetaTransaction[] = [];
|
13
|
+
const logs: any[] = [];
|
14
|
+
|
15
|
+
const {
|
16
|
+
position,
|
17
|
+
actionId,
|
18
|
+
actionIdHashHash,
|
19
|
+
sourceSender,
|
20
|
+
sourceDsaId,
|
21
|
+
targetDsaId,
|
22
|
+
sourceChainId,
|
23
|
+
targetChainId,
|
24
|
+
vnonce,
|
25
|
+
metadata,
|
26
|
+
} = transaction.submitEvent;
|
27
|
+
|
28
|
+
const sourceChainProvider = new ethers.providers.JsonRpcProvider(
|
29
|
+
getRpcProviderUrl(sourceChainId as ChainId)
|
30
|
+
);
|
31
|
+
const sourceWallet = new ethers.Wallet(
|
32
|
+
config.privateKey,
|
33
|
+
sourceChainProvider
|
34
|
+
);
|
35
|
+
const interopAddress = addresses[sourceChainId].interopX;
|
36
|
+
const contract = getContract<InteropX>(
|
37
|
+
interopAddress,
|
38
|
+
abi.interopX,
|
39
|
+
sourceWallet
|
40
|
+
);
|
41
|
+
|
42
|
+
const sourceSpells: any[] = [];
|
43
|
+
const commonSpells = [];
|
44
|
+
|
45
|
+
for (const withdraw of position.withdraw) {
|
46
|
+
let spellData = {
|
47
|
+
connector: "AAVE-V2-A",
|
48
|
+
method: "payback",
|
49
|
+
args: [withdraw.sourceToken, withdraw.amount, "2", "0", "0"],
|
50
|
+
};
|
51
|
+
|
52
|
+
sourceSpells.push({
|
53
|
+
connector: spellData.method,
|
54
|
+
data: encodeConnectorMethod(spellData),
|
55
|
+
});
|
56
|
+
}
|
57
|
+
|
58
|
+
for (const supply of position.supply) {
|
59
|
+
let spellDataWithdraw = {
|
60
|
+
connector: "AAVE-V2-A",
|
61
|
+
method: "withdraw",
|
62
|
+
args: [supply.sourceToken, supply.amount, "0", "0"],
|
63
|
+
};
|
64
|
+
|
65
|
+
sourceSpells.push({
|
66
|
+
connector: spellDataWithdraw.method,
|
67
|
+
data: encodeConnectorMethod(spellDataWithdraw),
|
68
|
+
});
|
69
|
+
|
70
|
+
let spellDataBasicWithdraw = {
|
71
|
+
connector: "BASIC-A",
|
72
|
+
method: "withdraw",
|
73
|
+
args: [supply.sourceToken, supply.amount, interopAddress, "0", "0"],
|
74
|
+
};
|
75
|
+
|
76
|
+
sourceSpells.push({
|
77
|
+
connector: spellDataBasicWithdraw.method,
|
78
|
+
data: encodeConnectorMethod(spellDataBasicWithdraw),
|
79
|
+
});
|
80
|
+
}
|
81
|
+
|
82
|
+
const { data } = await contract.populateTransaction.sourceAction(
|
83
|
+
sourceSpells,
|
84
|
+
commonSpells,
|
85
|
+
position,
|
86
|
+
actionId,
|
87
|
+
sourceSender,
|
88
|
+
sourceDsaId,
|
89
|
+
targetDsaId,
|
90
|
+
sourceChainId,
|
91
|
+
targetChainId,
|
92
|
+
vnonce,
|
93
|
+
metadata
|
94
|
+
);
|
95
|
+
|
96
|
+
transactions.push({
|
97
|
+
to: interopAddress,
|
98
|
+
data: data!,
|
99
|
+
value: "0",
|
100
|
+
operation: OperationType.Call,
|
101
|
+
});
|
102
|
+
|
103
|
+
return { transactions, logs };
|
104
|
+
}
|
@@ -0,0 +1,13 @@
|
|
1
|
+
|
2
|
+
|
3
|
+
import { Transaction } from "@/db";
|
4
|
+
import { MetaTransaction, OperationType } from "ethers-multisend";
|
5
|
+
|
6
|
+
|
7
|
+
export default async function (transaction: Transaction) {
|
8
|
+
const transactions: MetaTransaction[] = [];
|
9
|
+
const logs: any[] = [];
|
10
|
+
|
11
|
+
|
12
|
+
return { transactions, logs }
|
13
|
+
}
|
@@ -0,0 +1,19 @@
|
|
1
|
+
import { Transaction } from "@/db";
|
2
|
+
import { encodeMulti } from "ethers-multisend";
|
3
|
+
import actions from "./actions";
|
4
|
+
|
5
|
+
export const buildGnosisAction = async (transaction: Transaction, type: 'source' | 'target') => {
|
6
|
+
// type = type || (transaction.sourceStatus === 'success' ? 'target' : 'source')
|
7
|
+
|
8
|
+
if (actions.hasOwnProperty(transaction.actionId)) {
|
9
|
+
|
10
|
+
const { transactions, logs } = await actions[transaction.actionId](transaction, type);
|
11
|
+
|
12
|
+
return {
|
13
|
+
data: encodeMulti(transactions).data,
|
14
|
+
logs
|
15
|
+
};
|
16
|
+
}
|
17
|
+
|
18
|
+
throw new Error(`Unknown action: ${transaction.actionId}`);
|
19
|
+
}
|
package/src/index.ts
CHANGED
@@ -1,22 +1,7 @@
|
|
1
|
-
import
|
1
|
+
import './alias'
|
2
2
|
import expandHomeDir from "expand-home-dir";
|
3
3
|
import fs from 'fs-extra'
|
4
|
-
moduleAlias.addAliases({
|
5
|
-
"@/": __dirname + "/",
|
6
|
-
"@/logger": __dirname + "/logger",
|
7
|
-
"@/tasks": __dirname + "/tasks",
|
8
|
-
"@/utils": __dirname + "/utils",
|
9
|
-
"@/api": __dirname + "/api",
|
10
|
-
"@/net": __dirname + "/net",
|
11
|
-
"@/db": __dirname + "/db",
|
12
|
-
"@/config": __dirname + "/config",
|
13
|
-
"@/types": __dirname + "/types",
|
14
|
-
"@/abi": __dirname + "/abi",
|
15
|
-
"@/constants": __dirname + "/constants",
|
16
|
-
"@/typechain": __dirname + "/typechain"
|
17
|
-
})
|
18
4
|
|
19
|
-
moduleAlias();
|
20
5
|
import dotenv from "dotenv";
|
21
6
|
import chalk from 'chalk';
|
22
7
|
import { ethers } from "ethers";
|
@@ -104,7 +89,9 @@ async function main() {
|
|
104
89
|
|
105
90
|
const tasks = new Tasks()
|
106
91
|
|
107
|
-
|
92
|
+
setTimeout(() => {
|
93
|
+
tasks.start();
|
94
|
+
}, 10000)
|
108
95
|
|
109
96
|
startApiServer()
|
110
97
|
|
@@ -129,10 +116,12 @@ async function main() {
|
|
129
116
|
transaction.sourceStatus = payload.data.sourceStatus
|
130
117
|
transaction.sourceTransactionHash = payload.data.sourceTransactionHash
|
131
118
|
transaction.sourceErrors = payload.data.sourceErrors
|
119
|
+
transaction.sourceLogs = payload.data.sourceLogs
|
132
120
|
|
133
121
|
transaction.targetStatus = payload.data.targetStatus
|
134
122
|
transaction.targetTransactionHash = payload.data.targetTransactionHash
|
135
123
|
transaction.targetErrors = payload.data.targetErrors
|
124
|
+
transaction.targetLogs = payload.data.targetLogs
|
136
125
|
|
137
126
|
transaction.status = payload.data.status
|
138
127
|
|
@@ -2,15 +2,17 @@ import { BaseDialProtocol } from "./BaseDialProtocol";
|
|
2
2
|
import wait from "waait";
|
3
3
|
import config from "@/config";
|
4
4
|
import { Transaction } from "@/db";
|
5
|
-
import {
|
5
|
+
import { signGnosisSafeTx } from "@/utils";
|
6
6
|
import { addresses } from "@/constants";
|
7
7
|
import { ChainId } from "@/types";
|
8
|
+
import { buildGnosisAction } from "@/gnosis";
|
8
9
|
|
9
10
|
export interface ISignatureRequest {
|
10
|
-
type: 'source' | 'target'
|
11
|
+
type: 'source' | 'target',
|
11
12
|
transactionHash: string
|
12
13
|
safeTxGas: string
|
13
14
|
safeNonce: string
|
15
|
+
chainId: number
|
14
16
|
}
|
15
17
|
export interface ISignatureResponse {
|
16
18
|
signer: string,
|
@@ -25,6 +27,10 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
|
|
25
27
|
}
|
26
28
|
|
27
29
|
async response(data: ISignatureRequest): Promise<ISignatureResponse> {
|
30
|
+
console.log({
|
31
|
+
tag: 'SignatureDialProtocol',
|
32
|
+
data
|
33
|
+
})
|
28
34
|
const signer = config.wallet;
|
29
35
|
|
30
36
|
let transaction: Transaction | null;
|
@@ -46,19 +52,12 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
|
|
46
52
|
error: 'Event not found'
|
47
53
|
};
|
48
54
|
}
|
49
|
-
|
50
|
-
console.log("signing:", {
|
51
|
-
to: addresses[transaction.targetChainId].multisend,
|
52
|
-
data: await buildDataForTransaction(transaction, data.type),
|
53
|
-
chainId: transaction.targetChainId as ChainId,
|
54
|
-
safeTxGas: data.safeTxGas,
|
55
|
-
nonce: data.safeNonce,
|
56
|
-
});
|
55
|
+
const { data: gnosisData } = await buildGnosisAction(transaction, data.type);
|
57
56
|
|
58
57
|
const signedData = await signGnosisSafeTx({
|
59
|
-
to: addresses[
|
60
|
-
data:
|
61
|
-
chainId:
|
58
|
+
to: addresses[data.chainId].multisend,
|
59
|
+
data: gnosisData,
|
60
|
+
chainId: data.chainId as ChainId,
|
62
61
|
safeTxGas: data.safeTxGas,
|
63
62
|
nonce: data.safeNonce,
|
64
63
|
}, { signer });
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import { BaseDialProtocol } from "./BaseDialProtocol";
|
2
2
|
import { Transaction } from "@/db";
|
3
3
|
|
4
|
-
export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'> | null> {
|
4
|
+
export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'> | null> {
|
5
5
|
protected timeout = 30000;
|
6
6
|
|
7
7
|
constructor(libp2p) {
|
@@ -20,10 +20,12 @@ export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick
|
|
20
20
|
sourceStatus: transaction.sourceStatus,
|
21
21
|
sourceTransactionHash: transaction.sourceTransactionHash,
|
22
22
|
sourceErrors: transaction.sourceErrors,
|
23
|
+
sourceLogs: transaction.sourceLogs,
|
23
24
|
|
24
25
|
targetStatus: transaction.targetStatus,
|
25
26
|
targetTransactionHash: transaction.targetTransactionHash,
|
26
27
|
targetErrors: transaction.targetErrors,
|
28
|
+
targetLogs: transaction.targetLogs,
|
27
29
|
|
28
30
|
status: transaction.status,
|
29
31
|
}
|