@instadapp/interop-x 0.0.0-dev.75809ae → 0.0.0-dev.7913ed9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (277) hide show
  1. package/.env.example +2 -1
  2. package/.github/workflows/ci.yml +19 -0
  3. package/dist/package.json +76 -0
  4. package/dist/src/abi/connectors/index.js +36 -0
  5. package/dist/src/abi/connectors/v1/aave.js +148 -0
  6. package/dist/src/abi/connectors/v1/aave_claim.js +4 -0
  7. package/dist/src/abi/connectors/v1/aave_migrate.js +109 -0
  8. package/dist/src/abi/connectors/v1/aave_polygon_migrate.js +110 -0
  9. package/dist/src/abi/connectors/v1/aave_stake.js +4 -0
  10. package/dist/src/abi/connectors/v1/aave_v1_import.js +54 -0
  11. package/dist/src/abi/connectors/v1/aave_v2.js +230 -0
  12. package/dist/src/abi/connectors/v1/aave_v2_import.js +59 -0
  13. package/dist/src/abi/connectors/v1/authority.js +100 -0
  14. package/dist/src/abi/connectors/v1/basic.js +136 -0
  15. package/dist/src/abi/connectors/v1/chi.js +36 -0
  16. package/dist/src/abi/connectors/v1/comp.js +4 -0
  17. package/dist/src/abi/connectors/v1/compound.js +4 -0
  18. package/dist/src/abi/connectors/v1/compoundImport.js +69 -0
  19. package/dist/src/abi/connectors/v1/compoundImport_v2.js +4 -0
  20. package/dist/src/abi/connectors/v1/compound_old.js +448 -0
  21. package/dist/src/abi/connectors/v1/curve.js +140 -0
  22. package/dist/src/abi/connectors/v1/curve_claim.js +63 -0
  23. package/dist/src/abi/connectors/v1/curve_gauge.js +158 -0
  24. package/dist/src/abi/connectors/v1/curve_sbtc.js +140 -0
  25. package/dist/src/abi/connectors/v1/curve_susd.js +140 -0
  26. package/dist/src/abi/connectors/v1/curve_three.js +79 -0
  27. package/dist/src/abi/connectors/v1/curve_y.js +140 -0
  28. package/dist/src/abi/connectors/v1/dsa_migrate_v1_to_v2.js +4 -0
  29. package/dist/src/abi/connectors/v1/dydx.js +148 -0
  30. package/dist/src/abi/connectors/v1/dydx_flash.js +52 -0
  31. package/dist/src/abi/connectors/v1/fee.js +50 -0
  32. package/dist/src/abi/connectors/v1/gelato.js +1138 -0
  33. package/dist/src/abi/connectors/v1/index.js +58 -0
  34. package/dist/src/abi/connectors/v1/instapool.js +439 -0
  35. package/dist/src/abi/connectors/v1/instapool_v2.js +126 -0
  36. package/dist/src/abi/connectors/v1/kyber.js +117 -0
  37. package/dist/src/abi/connectors/v1/maker.js +480 -0
  38. package/dist/src/abi/connectors/v1/maker_old.js +300 -0
  39. package/dist/src/abi/connectors/v1/math.js +43 -0
  40. package/dist/src/abi/connectors/v1/migrate.js +46 -0
  41. package/dist/src/abi/connectors/v1/oasis.js +198 -0
  42. package/dist/src/abi/connectors/v1/oneInch.js +160 -0
  43. package/dist/src/abi/connectors/v1/polygon_bridge.js +4 -0
  44. package/dist/src/abi/connectors/v1/refinance.js +4 -0
  45. package/dist/src/abi/connectors/v1/staking.js +220 -0
  46. package/dist/src/abi/connectors/v1/swerve.js +179 -0
  47. package/dist/src/abi/connectors/v1/uniswap.js +297 -0
  48. package/dist/src/abi/connectors/v2/1INCH-A.js +4 -0
  49. package/dist/src/abi/connectors/v2/1INCH-B.js +4 -0
  50. package/dist/src/abi/connectors/v2/AAVE-CLAIM-A.js +4 -0
  51. package/dist/src/abi/connectors/v2/AAVE-CLAIM-B.js +166 -0
  52. package/dist/src/abi/connectors/v2/AAVE-STAKE-A.js +4 -0
  53. package/dist/src/abi/connectors/v2/AAVE-V1-A.js +130 -0
  54. package/dist/src/abi/connectors/v2/AAVE-V1-IMPORT-A.js +4 -0
  55. package/dist/src/abi/connectors/v2/AAVE-V2-A.js +230 -0
  56. package/dist/src/abi/connectors/v2/AAVE-V2-IMPORT-A.js +4 -0
  57. package/dist/src/abi/connectors/v2/AAVE-V2-IMPORT-B.js +225 -0
  58. package/dist/src/abi/connectors/v2/AUTHORITY-A.js +100 -0
  59. package/dist/src/abi/connectors/v2/B-COMPOUND-A.js +4 -0
  60. package/dist/src/abi/connectors/v2/B-LIQUITY-A.js +4 -0
  61. package/dist/src/abi/connectors/v2/B-MAKERDAO-A.js +4 -0
  62. package/dist/src/abi/connectors/v2/BASIC-A.js +136 -0
  63. package/dist/src/abi/connectors/v2/BASIC-B.js +4 -0
  64. package/dist/src/abi/connectors/v2/BASIC-C.js +4 -0
  65. package/dist/src/abi/connectors/v2/COMP-A.js +4 -0
  66. package/dist/src/abi/connectors/v2/COMPOUND-A.js +4 -0
  67. package/dist/src/abi/connectors/v2/COMPOUND-IMPORT-A.js +4 -0
  68. package/dist/src/abi/connectors/v2/COMPOUND-IMPORT-B.js +195 -0
  69. package/dist/src/abi/connectors/v2/G-UNISWAP-A.js +4 -0
  70. package/dist/src/abi/connectors/v2/GELATO-AAVE-A.js +4 -0
  71. package/dist/src/abi/connectors/v2/INST-A.js +4 -0
  72. package/dist/src/abi/connectors/v2/INST-LM-A.js +4 -0
  73. package/dist/src/abi/connectors/v2/INST-STAKING-A.js +4 -0
  74. package/dist/src/abi/connectors/v2/INST-STAKING-B.js +4 -0
  75. package/dist/src/abi/connectors/v2/INSTAPOOL-A.js +4 -0
  76. package/dist/src/abi/connectors/v2/LIQUITY-A.js +4 -0
  77. package/dist/src/abi/connectors/v2/MAKERDAO-A.js +4 -0
  78. package/dist/src/abi/connectors/v2/MAKERDAO-CLAIM-A.js +136 -0
  79. package/dist/src/abi/connectors/v2/PARASWAP-A.js +4 -0
  80. package/dist/src/abi/connectors/v2/POLYGON-BRIDGE-A.js +4 -0
  81. package/dist/src/abi/connectors/v2/REFINANCE-A.js +4 -0
  82. package/dist/src/abi/connectors/v2/REFLEXER-A.js +4 -0
  83. package/dist/src/abi/connectors/v2/STAKE-ERC20-A.js +4 -0
  84. package/dist/src/abi/connectors/v2/UNISWAP-A.js +297 -0
  85. package/dist/src/abi/connectors/v2/UNISWAP-V2-A.js +4 -0
  86. package/dist/src/abi/connectors/v2/UNISWAP-V3-A.js +4 -0
  87. package/dist/src/abi/connectors/v2/UNISWAP-V3-STAKE-A.js +4 -0
  88. package/dist/src/abi/connectors/v2/WETH-A.js +4 -0
  89. package/dist/src/abi/connectors/v2/YEARN-VAULT-A.js +4 -0
  90. package/dist/src/abi/connectors/v2/index.js +89 -0
  91. package/dist/src/abi/erc20.json +350 -0
  92. package/dist/src/abi/gnosisSafe.json +747 -0
  93. package/dist/src/abi/index.js +15 -0
  94. package/dist/src/abi/interopX.json +1436 -0
  95. package/dist/src/alias.js +10 -0
  96. package/dist/src/api/index.js +36 -0
  97. package/dist/src/config/index.js +31 -0
  98. package/dist/src/constants/addresses.js +17 -0
  99. package/dist/src/constants/blockConfirmations.js +8 -0
  100. package/dist/{constants → src/constants}/index.js +2 -0
  101. package/dist/src/constants/tokens.js +130 -0
  102. package/dist/{db → src/db}/index.js +0 -0
  103. package/dist/{db → src/db}/models/index.js +1 -1
  104. package/dist/src/db/models/transaction.js +72 -0
  105. package/dist/{db → src/db}/sequelize.js +2 -1
  106. package/dist/src/gnosis/actions/aaveV2/index.js +11 -0
  107. package/dist/src/gnosis/actions/aaveV2/source.js +73 -0
  108. package/dist/src/gnosis/actions/aaveV2/target.js +8 -0
  109. package/dist/src/gnosis/actions/index.js +9 -0
  110. package/dist/src/gnosis/index.js +20 -0
  111. package/dist/src/index.js +119 -0
  112. package/dist/{logger → src/logger}/index.js +0 -0
  113. package/dist/{net → src/net}/index.js +0 -0
  114. package/dist/{net → src/net}/peer/index.js +13 -8
  115. package/dist/{net → src/net}/pool/index.js +34 -11
  116. package/dist/{net → src/net}/protocol/dial/BaseDialProtocol.js +1 -1
  117. package/dist/{net → src/net}/protocol/dial/SignatureDialProtocol.js +21 -14
  118. package/dist/src/net/protocol/dial/TransactionStatusDialProtocol.js +30 -0
  119. package/dist/{net → src/net}/protocol/index.js +54 -4
  120. package/dist/src/tasks/AutoUpdateTask.js +70 -0
  121. package/dist/{tasks → src/tasks}/BaseTask.js +14 -6
  122. package/dist/src/tasks/InteropX/ProcessSubmitSubmitEvents.js +180 -0
  123. package/dist/src/tasks/InteropX/SyncLogSubmitEvents.js +86 -0
  124. package/dist/src/tasks/Transactions/SyncTransactionStatusTask.js +58 -0
  125. package/dist/src/tasks/index.js +37 -0
  126. package/dist/src/typechain/Erc20.js +2 -0
  127. package/dist/src/typechain/GnosisSafe.js +2 -0
  128. package/dist/src/typechain/InteropX.js +2 -0
  129. package/dist/src/typechain/common.js +2 -0
  130. package/dist/src/typechain/factories/Erc20__factory.js +367 -0
  131. package/dist/src/typechain/factories/GnosisSafe__factory.js +1174 -0
  132. package/dist/src/typechain/factories/InteropX__factory.js +1928 -0
  133. package/dist/src/typechain/factories/index.js +12 -0
  134. package/dist/src/typechain/index.js +33 -0
  135. package/dist/{types.js → src/types.js} +0 -0
  136. package/dist/src/utils/index.js +223 -0
  137. package/package.json +33 -16
  138. package/patches/@ethersproject+properties+5.6.0.patch +13 -0
  139. package/src/abi/connectors/index.ts +14 -0
  140. package/src/abi/connectors/v1/aave.ts +147 -0
  141. package/src/abi/connectors/v1/aave_claim.ts +3 -0
  142. package/src/abi/connectors/v1/aave_migrate.ts +108 -0
  143. package/src/abi/connectors/v1/aave_polygon_migrate.ts +109 -0
  144. package/src/abi/connectors/v1/aave_stake.ts +3 -0
  145. package/src/abi/connectors/v1/aave_v1_import.ts +53 -0
  146. package/src/abi/connectors/v1/aave_v2.ts +229 -0
  147. package/src/abi/connectors/v1/aave_v2_import.ts +58 -0
  148. package/src/abi/connectors/v1/authority.ts +99 -0
  149. package/src/abi/connectors/v1/basic.ts +135 -0
  150. package/src/abi/connectors/v1/chi.ts +35 -0
  151. package/src/abi/connectors/v1/comp.ts +3 -0
  152. package/src/abi/connectors/v1/compound.ts +3 -0
  153. package/src/abi/connectors/v1/compoundImport.ts +68 -0
  154. package/src/abi/connectors/v1/compoundImport_v2.ts +3 -0
  155. package/src/abi/connectors/v1/compound_old.ts +447 -0
  156. package/src/abi/connectors/v1/curve.ts +139 -0
  157. package/src/abi/connectors/v1/curve_claim.ts +62 -0
  158. package/src/abi/connectors/v1/curve_gauge.ts +157 -0
  159. package/src/abi/connectors/v1/curve_sbtc.ts +139 -0
  160. package/src/abi/connectors/v1/curve_susd.ts +139 -0
  161. package/src/abi/connectors/v1/curve_three.ts +78 -0
  162. package/src/abi/connectors/v1/curve_y.ts +139 -0
  163. package/src/abi/connectors/v1/dsa_migrate_v1_to_v2.ts +3 -0
  164. package/src/abi/connectors/v1/dydx.ts +147 -0
  165. package/src/abi/connectors/v1/dydx_flash.ts +51 -0
  166. package/src/abi/connectors/v1/fee.ts +49 -0
  167. package/src/abi/connectors/v1/gelato.ts +1137 -0
  168. package/src/abi/connectors/v1/index.ts +42 -0
  169. package/src/abi/connectors/v1/instapool.ts +438 -0
  170. package/src/abi/connectors/v1/instapool_v2.ts +125 -0
  171. package/src/abi/connectors/v1/kyber.ts +116 -0
  172. package/src/abi/connectors/v1/maker.ts +479 -0
  173. package/src/abi/connectors/v1/maker_old.ts +299 -0
  174. package/src/abi/connectors/v1/math.ts +42 -0
  175. package/src/abi/connectors/v1/migrate.ts +45 -0
  176. package/src/abi/connectors/v1/oasis.ts +197 -0
  177. package/src/abi/connectors/v1/oneInch.ts +159 -0
  178. package/src/abi/connectors/v1/polygon_bridge.ts +3 -0
  179. package/src/abi/connectors/v1/refinance.ts +3 -0
  180. package/src/abi/connectors/v1/staking.ts +219 -0
  181. package/src/abi/connectors/v1/swerve.ts +178 -0
  182. package/src/abi/connectors/v1/uniswap.ts +297 -0
  183. package/src/abi/connectors/v2/1INCH-A.ts +3 -0
  184. package/src/abi/connectors/v2/1INCH-B.ts +3 -0
  185. package/src/abi/connectors/v2/AAVE-CLAIM-A.ts +3 -0
  186. package/src/abi/connectors/v2/AAVE-CLAIM-B.ts +165 -0
  187. package/src/abi/connectors/v2/AAVE-STAKE-A.ts +3 -0
  188. package/src/abi/connectors/v2/AAVE-V1-A.ts +130 -0
  189. package/src/abi/connectors/v2/AAVE-V1-IMPORT-A.ts +3 -0
  190. package/src/abi/connectors/v2/AAVE-V2-A.ts +229 -0
  191. package/src/abi/connectors/v2/AAVE-V2-IMPORT-A.ts +3 -0
  192. package/src/abi/connectors/v2/AAVE-V2-IMPORT-B.ts +224 -0
  193. package/src/abi/connectors/v2/AUTHORITY-A.ts +99 -0
  194. package/src/abi/connectors/v2/B-COMPOUND-A.ts +3 -0
  195. package/src/abi/connectors/v2/B-LIQUITY-A.ts +3 -0
  196. package/src/abi/connectors/v2/B-MAKERDAO-A.ts +3 -0
  197. package/src/abi/connectors/v2/BASIC-A.ts +135 -0
  198. package/src/abi/connectors/v2/BASIC-B.ts +3 -0
  199. package/src/abi/connectors/v2/BASIC-C.ts +3 -0
  200. package/src/abi/connectors/v2/COMP-A.ts +3 -0
  201. package/src/abi/connectors/v2/COMPOUND-A.ts +3 -0
  202. package/src/abi/connectors/v2/COMPOUND-IMPORT-A.ts +3 -0
  203. package/src/abi/connectors/v2/COMPOUND-IMPORT-B.ts +194 -0
  204. package/src/abi/connectors/v2/G-UNISWAP-A.ts +3 -0
  205. package/src/abi/connectors/v2/GELATO-AAVE-A.ts +3 -0
  206. package/src/abi/connectors/v2/INST-A.ts +3 -0
  207. package/src/abi/connectors/v2/INST-LM-A.ts +3 -0
  208. package/src/abi/connectors/v2/INST-STAKING-A.ts +3 -0
  209. package/src/abi/connectors/v2/INST-STAKING-B.ts +3 -0
  210. package/src/abi/connectors/v2/INSTAPOOL-A.ts +3 -0
  211. package/src/abi/connectors/v2/LIQUITY-A.ts +3 -0
  212. package/src/abi/connectors/v2/MAKERDAO-A.ts +3 -0
  213. package/src/abi/connectors/v2/MAKERDAO-CLAIM-A.ts +135 -0
  214. package/src/abi/connectors/v2/PARASWAP-A.ts +3 -0
  215. package/src/abi/connectors/v2/POLYGON-BRIDGE-A.ts +3 -0
  216. package/src/abi/connectors/v2/REFINANCE-A.ts +3 -0
  217. package/src/abi/connectors/v2/REFLEXER-A.ts +3 -0
  218. package/src/abi/connectors/v2/STAKE-ERC20-A.ts +3 -0
  219. package/src/abi/connectors/v2/UNISWAP-A.ts +297 -0
  220. package/src/abi/connectors/v2/UNISWAP-V2-A.ts +3 -0
  221. package/src/abi/connectors/v2/UNISWAP-V3-A.ts +3 -0
  222. package/src/abi/connectors/v2/UNISWAP-V3-STAKE-A.ts +3 -0
  223. package/src/abi/connectors/v2/WETH-A.ts +3 -0
  224. package/src/abi/connectors/v2/YEARN-VAULT-A.ts +3 -0
  225. package/src/abi/connectors/v2/index.ts +87 -0
  226. package/src/abi/erc20.json +350 -0
  227. package/src/abi/gnosisSafe.json +747 -0
  228. package/src/abi/index.ts +11 -0
  229. package/src/abi/interopX.json +1436 -0
  230. package/src/alias.ts +6 -0
  231. package/src/api/index.ts +36 -0
  232. package/src/config/index.ts +18 -2
  233. package/src/constants/addresses.ts +10 -6
  234. package/src/constants/blockConfirmations.ts +5 -0
  235. package/src/constants/index.ts +2 -0
  236. package/src/constants/tokens.ts +127 -0
  237. package/src/db/index.ts +1 -1
  238. package/src/db/models/index.ts +1 -1
  239. package/src/db/models/transaction.ts +136 -0
  240. package/src/db/sequelize.ts +2 -1
  241. package/src/gnosis/actions/aaveV2/index.ts +9 -0
  242. package/src/gnosis/actions/aaveV2/source.ts +118 -0
  243. package/src/gnosis/actions/aaveV2/target.ts +13 -0
  244. package/src/gnosis/actions/index.ts +5 -0
  245. package/src/gnosis/index.ts +19 -0
  246. package/src/index.ts +118 -7
  247. package/src/net/peer/index.ts +12 -10
  248. package/src/net/pool/index.ts +43 -13
  249. package/src/net/protocol/dial/BaseDialProtocol.ts +1 -1
  250. package/src/net/protocol/dial/SignatureDialProtocol.ts +25 -17
  251. package/src/net/protocol/dial/TransactionStatusDialProtocol.ts +33 -0
  252. package/src/net/protocol/index.ts +70 -4
  253. package/src/tasks/AutoUpdateTask.ts +82 -0
  254. package/src/tasks/BaseTask.ts +16 -7
  255. package/src/tasks/InteropX/ProcessSubmitSubmitEvents.ts +270 -0
  256. package/src/tasks/InteropX/SyncLogSubmitEvents.ts +138 -0
  257. package/src/tasks/Transactions/SyncTransactionStatusTask.ts +70 -0
  258. package/src/tasks/index.ts +21 -2
  259. package/src/typechain/Erc20.ts +491 -0
  260. package/src/typechain/GnosisSafe.ts +1728 -0
  261. package/src/typechain/InteropX.ts +1216 -0
  262. package/src/typechain/common.ts +44 -0
  263. package/src/typechain/factories/Erc20__factory.ts +368 -0
  264. package/src/typechain/factories/GnosisSafe__factory.ts +1178 -0
  265. package/src/typechain/factories/InteropX__factory.ts +1932 -0
  266. package/src/typechain/factories/index.ts +6 -0
  267. package/src/typechain/index.ts +10 -0
  268. package/src/types.ts +2 -2
  269. package/src/utils/index.ts +285 -36
  270. package/tsconfig.json +8 -0
  271. package/dist/config/index.js +0 -17
  272. package/dist/constants/addresses.js +0 -13
  273. package/dist/db/models/execution.js +0 -38
  274. package/dist/index.js +0 -34
  275. package/dist/tasks/index.js +0 -19
  276. package/dist/utils/index.js +0 -89
  277. package/src/db/models/execution.ts +0 -57
package/src/index.ts CHANGED
@@ -1,21 +1,132 @@
1
- import { assert } from "console";
1
+ import './alias'
2
+ import expandHomeDir from "expand-home-dir";
3
+ import fs from 'fs-extra'
4
+
2
5
  import dotenv from "dotenv";
3
- import { Tasks } from "tasks";
4
- import Logger from "./logger";
5
- import { startPeer } from "./net";
6
+ import chalk from 'chalk';
7
+ import { ethers } from "ethers";
8
+ import packageJson from '../package.json'
6
9
  dotenv.config();
7
10
 
8
- assert(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
9
-
11
+ import Logger from "@/logger";
10
12
  const logger = new Logger('Process')
11
13
 
14
+ const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
15
+
16
+ const printUsage = () => {
17
+ console.log()
18
+ console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
19
+ console.log()
20
+
21
+ console.log('Usage:')
22
+ console.log(' interop-x help Show this message')
23
+ console.log(' interop-x version Print out the installed version of Interop X')
24
+
25
+ console.log()
26
+
27
+ console.log(' interop-x down Put the node into maintenance mode')
28
+ console.log(' interop-x up Take the node out of maintenance mode')
29
+
30
+ console.log()
31
+
32
+ console.log(' PRIVATE_KEY=abcd1234 interop-x Start the node with the given private key')
33
+ console.log(' PRIVATE_KEY=abcd1234 STAGING=true interop-x Start the node in staging mode')
34
+ console.log(' PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x Start the node in auto update mode')
35
+ console.log(' PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x Start the node with custom API host and port')
36
+ console.log()
37
+
38
+ }
39
+
40
+ if (process.argv.at(-1) === 'help') {
41
+ printUsage()
42
+ process.exit(0)
43
+ }
44
+
45
+ const basePath = expandHomeDir(`~/.interop-x`);
46
+
47
+ if (process.argv.at(-1) === 'down') {
48
+ fs.outputFileSync(basePath + '/maintenance', Date.now().toString())
49
+ console.log(chalk.red('Maintenance mode enabled'))
50
+ process.exit(0)
51
+ }
52
+
53
+ if (process.argv.at(-1) === 'up') {
54
+ fs.removeSync(basePath + '/maintenance')
55
+ console.log(chalk.green('Maintenance mode disabled'))
56
+ process.exit(0)
57
+ }
58
+
59
+
60
+ if (process.argv.at(-1) === 'version') {
61
+ console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
62
+ process.exit(0)
63
+ }
64
+
65
+ if (!process.env.PRIVATE_KEY) {
66
+ console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
67
+ printUsage()
68
+ process.exit(1)
69
+ }
70
+ try {
71
+ new ethers.Wallet(process.env.PRIVATE_KEY!)
72
+ } catch (e) {
73
+ console.error(chalk.bgRed.white('Invalid private key\n'))
74
+ printUsage()
75
+ process.exit(1)
76
+ }
77
+
78
+ logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
79
+
80
+ import { Tasks } from "@/tasks";
81
+ import { startPeer, protocol, peerPool } from "@/net";
82
+ import { startApiServer } from '@/api';
83
+ import { Transaction } from './db';
84
+ import { shortenHash } from './utils';
85
+
12
86
  async function main() {
13
87
 
14
88
  startPeer({})
15
89
 
16
90
  const tasks = new Tasks()
17
91
 
18
- tasks.start();
92
+ setTimeout(() => {
93
+ tasks.start();
94
+ }, 10000)
95
+
96
+ startApiServer()
97
+
98
+ protocol.on('TransactionStatus', async (payload) => {
99
+ if (!peerPool.isLeadNode(payload.peerId)) {
100
+ const peer = peerPool.getPeer(payload.peerId)
101
+
102
+ if (!peer) {
103
+ return;
104
+ }
105
+
106
+ logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
107
+ return;
108
+ }
109
+
110
+ const transaction = await Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } })
111
+
112
+ if (!transaction) {
113
+ return;
114
+ }
115
+
116
+ transaction.sourceStatus = payload.data.sourceStatus
117
+ transaction.sourceTransactionHash = payload.data.sourceTransactionHash
118
+ transaction.sourceErrors = payload.data.sourceErrors
119
+ transaction.sourceLogs = payload.data.sourceLogs
120
+
121
+ transaction.targetStatus = payload.data.targetStatus
122
+ transaction.targetTransactionHash = payload.data.targetTransactionHash
123
+ transaction.targetErrors = payload.data.targetErrors
124
+ transaction.targetLogs = payload.data.targetLogs
125
+
126
+ transaction.status = payload.data.status
127
+
128
+ await transaction.save()
129
+ })
19
130
  }
20
131
 
21
132
  main()
@@ -5,7 +5,7 @@ import WS from "libp2p-websockets";
5
5
  //@ts-ignore
6
6
  import Mplex from "libp2p-mplex";
7
7
  import { NOISE } from "libp2p-noise";
8
- import Logger from "../../logger";
8
+ import Logger from "@/logger";
9
9
  import Bootstrap from "libp2p-bootstrap";
10
10
  import wait from "waait";
11
11
  import Gossipsub from "@achingbrain/libp2p-gossipsub";
@@ -15,8 +15,9 @@ import MulticastDNS from "libp2p-mdns";
15
15
  import KadDHT from "libp2p-kad-dht";
16
16
  //@ts-ignore
17
17
  import PubsubPeerDiscovery from "libp2p-pubsub-peer-discovery";
18
- import { protocol } from "../protocol";
19
- import config from "../../config";
18
+ import { protocol } from "@/net";
19
+ import config from "@/config";
20
+ import chalk from "chalk";
20
21
 
21
22
  const logger = new Logger("Peer");
22
23
 
@@ -80,7 +81,7 @@ export const startPeer = async ({ }: IPeerOptions) => {
80
81
  },
81
82
  });
82
83
 
83
- logger.info("Peer ID:", node.peerId.toB58String());
84
+ logger.info("Peer ID:", chalk.bold(node.peerId.toB58String()));
84
85
 
85
86
  await node.start();
86
87
 
@@ -88,12 +89,13 @@ export const startPeer = async ({ }: IPeerOptions) => {
88
89
  libp2p: node
89
90
  })
90
91
 
91
- node.on("peer:discovery", (peer) =>
92
- logger.log(`Discovered peer ${peer}`)
93
- ); // peer disc.
94
- node.connectionManager.on("peer:connect", (connection) =>
95
- logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
96
- );
92
+ node.on("peer:discovery", (peer) => {
93
+ // logger.log(`Discovered peer ${peer}`)
94
+ }); // peer disc.
95
+
96
+ node.connectionManager.on("peer:connect", (connection) => {
97
+ // logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
98
+ });
97
99
 
98
100
  logger.log("Peer discovery started");
99
101
 
@@ -1,5 +1,12 @@
1
- import { Event } from "../../types";
2
- import config from "../../config";
1
+ import { Event } from "@/types";
2
+ import config from "@/config";
3
+ import Logger from "@/logger";
4
+ import { getAddress } from "ethers/lib/utils";
5
+ import { shortenHash } from "@/utils";
6
+ import chalk from "chalk";
7
+
8
+
9
+ const logger = new Logger('PeerPool')
3
10
 
4
11
  export interface IPeerInfo {
5
12
  id: string;
@@ -75,10 +82,15 @@ export class PeerPool {
75
82
  * @emits {@link Event.POOL_PEER_ADDED}
76
83
  */
77
84
  add(peer?: IPeerInfo) {
78
- if (peer && peer.id && !this.pool.get(peer.id)) {
85
+ if (peer && peer.id) {
86
+ const newPeer = !this.pool.get(peer.id);
79
87
  this.pool.set(peer.id, peer)
80
88
  peer.pooled = true
81
- config.events.emit(Event.POOL_PEER_ADDED, peer)
89
+
90
+ if (newPeer) {
91
+ config.events.emit(Event.POOL_PEER_ADDED, peer)
92
+ logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
93
+ }
82
94
  }
83
95
  }
84
96
 
@@ -92,6 +104,7 @@ export class PeerPool {
92
104
  if (this.pool.delete(peer.id)) {
93
105
  peer.pooled = false
94
106
  config.events.emit(Event.POOL_PEER_REMOVED, peer)
107
+ logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
95
108
  }
96
109
  }
97
110
  }
@@ -100,7 +113,7 @@ export class PeerPool {
100
113
  this.cleanup()
101
114
 
102
115
  return this.peers.filter((p) => {
103
- if(!p.pooled) return false;
116
+ if (!p.pooled) return false;
104
117
 
105
118
  const now = new Date()
106
119
 
@@ -112,16 +125,33 @@ export class PeerPool {
112
125
  return this.activePeers.map((p) => p.id)
113
126
  }
114
127
 
128
+ getPeer(id: string){
129
+ return this.pool.get(id);
130
+ }
115
131
 
116
- cleanup() {
117
- let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
132
+ isLeadNode(id: string) {
133
+ const peer = this.pool.get(id);
118
134
 
119
- this.peers.forEach((peerInfo) => {
120
- if (peerInfo.updated.getTime() < compDate) {
121
- console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
122
- this.remove(peerInfo)
123
- }
124
- })
135
+ if (!peer) {
136
+ return false;
137
+ }
138
+
139
+ return getAddress(peer.publicAddress) === getAddress(config.leadNodeAddress)
140
+ }
141
+
142
+ getLeadPeer() {
143
+ return this.peers.find((p) => this.isLeadNode(p.id))
144
+ }
145
+
146
+ cleanup() {
147
+ // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
148
+
149
+ // this.peers.forEach((peerInfo) => {
150
+ // if (peerInfo.updated.getTime() < compDate) {
151
+ // console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
152
+ // this.remove(peerInfo)
153
+ // }
154
+ // })
125
155
  }
126
156
  }
127
157
 
@@ -1,7 +1,7 @@
1
1
  import pipe from 'it-pipe';
2
2
  import Libp2p from 'libp2p';
3
3
  import PeerId from 'peer-id';
4
- import { asyncCallWithTimeout } from '../../../utils';
4
+ import { asyncCallWithTimeout } from '@/utils';
5
5
  import wait from 'waait';
6
6
 
7
7
  export class BaseDialProtocol<TRequest extends any, TResponse extends any> {
@@ -1,16 +1,18 @@
1
- import { signGnosisSafeTx } from "../../../utils";
2
1
  import { BaseDialProtocol } from "./BaseDialProtocol";
3
2
  import wait from "waait";
4
- import { ChainId } from "../../../types";
5
- import config from "config";
6
- import { addresses } from "../../../constants";
7
- import { Execution } from "db";
3
+ import config from "@/config";
4
+ import { Transaction } from "@/db";
5
+ import { signGnosisSafeTx } from "@/utils";
6
+ import { addresses } from "@/constants";
7
+ import { ChainId } from "@/types";
8
+ import { buildGnosisAction } from "@/gnosis";
8
9
 
9
10
  export interface ISignatureRequest {
10
- type: string,
11
- vnonce: string
11
+ type: 'source' | 'target',
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,
@@ -21,42 +23,48 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
21
23
  protected timeout = 30000;
22
24
 
23
25
  constructor(libp2p) {
24
- super(libp2p, '/signatures')
26
+ super(libp2p, '/interop-x/signatures')
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
- let event: Execution | null;
36
+ let transaction: Transaction | null;
31
37
  let maxTimeout = 20000;
32
38
 
33
39
  do {
34
- event = await Execution.findOne({ where: { vnonce: data.vnonce.toString() } })
40
+ transaction = await Transaction.findOne({ where: { transactionHash: data.transactionHash } })
35
41
 
36
- if (!event) {
42
+ if (!transaction) {
37
43
  await wait(1000);
38
44
  maxTimeout -= 1000;
39
45
  }
40
- } while (!event && maxTimeout > 0)
46
+ } while (!transaction && maxTimeout > 0)
41
47
 
42
- if (!event) {
48
+ if (!transaction) {
43
49
  return {
44
50
  signer: signer.address,
45
51
  data: null,
46
52
  error: 'Event not found'
47
53
  };
48
54
  }
55
+ const { data: gnosisData } = await buildGnosisAction(transaction, data.type);
49
56
 
50
57
  const signedData = await signGnosisSafeTx({
51
- to: addresses[event.chainId as ChainId].multisend,
52
- data: 'TODO',
53
- chainId: event.chainId as ChainId,
58
+ to: addresses[data.chainId].multisend,
59
+ data: gnosisData,
60
+ chainId: data.chainId as ChainId,
54
61
  safeTxGas: data.safeTxGas,
62
+ nonce: data.safeNonce,
55
63
  }, { signer });
56
64
 
57
65
  return {
58
66
  signer: signer.address,
59
- data: signedData,
67
+ data: signedData
60
68
  }
61
69
  }
62
70
  }
@@ -0,0 +1,33 @@
1
+ import { BaseDialProtocol } from "./BaseDialProtocol";
2
+ import { Transaction } from "@/db";
3
+
4
+ export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'> | null> {
5
+ protected timeout = 30000;
6
+
7
+ constructor(libp2p) {
8
+ super(libp2p, '/interop-x/transaction-status')
9
+ }
10
+
11
+ async response(transactionHash: string){
12
+ const transaction = await Transaction.findOne({ where: { transactionHash } })
13
+
14
+ if(! transaction){
15
+ return null
16
+ }
17
+ return {
18
+ transactionHash: transaction.transactionHash,
19
+
20
+ sourceStatus: transaction.sourceStatus,
21
+ sourceTransactionHash: transaction.sourceTransactionHash,
22
+ sourceErrors: transaction.sourceErrors,
23
+ sourceLogs: transaction.sourceLogs,
24
+
25
+ targetStatus: transaction.targetStatus,
26
+ targetTransactionHash: transaction.targetTransactionHash,
27
+ targetErrors: transaction.targetErrors,
28
+ targetLogs: transaction.targetLogs,
29
+
30
+ status: transaction.status,
31
+ }
32
+ }
33
+ }
@@ -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: 0x09,
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;
@@ -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 "../logger";
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: ${err.message}\ntrace: ${err.stack}`)
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 (!this.leadNodeOnly) {
50
- return true
49
+ if(config.isMaintenanceMode()){
50
+ this.logger.warn('Maintenance mode is enabled. Skipping task.')
51
+ return false
51
52
  }
52
53
 
53
- return config.isLeadNode()
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() {