@paraswap/dex-lib 2.16.0 → 2.16.1-generate-state-latest.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (220) hide show
  1. package/build/composed-event-subscriber.d.ts +2 -2
  2. package/build/composed-event-subscriber.js +9 -4
  3. package/build/composed-event-subscriber.js.map +1 -1
  4. package/build/dex/aave-v1/aave-v1.d.ts +1 -1
  5. package/build/dex/aave-v1/aave-v1.js +1 -1
  6. package/build/dex/aave-v1/aave-v1.js.map +1 -1
  7. package/build/dex/aave-v2/aave-v2.d.ts +1 -1
  8. package/build/dex/aave-v2/aave-v2.js +1 -1
  9. package/build/dex/aave-v2/aave-v2.js.map +1 -1
  10. package/build/dex/aave-v3/aave-v3.d.ts +1 -1
  11. package/build/dex/aave-v3/aave-v3.js +1 -1
  12. package/build/dex/aave-v3/aave-v3.js.map +1 -1
  13. package/build/dex/aave-v3/tokens/arbitrum.json +50 -0
  14. package/build/dex/aave-v3/tokens/avalanche.json +74 -0
  15. package/build/dex/aave-v3/tokens/fantom.json +62 -0
  16. package/build/dex/aave-v3/tokens/optimism.json +50 -0
  17. package/build/dex/aave-v3/tokens/polygon.json +116 -0
  18. package/build/dex/aave-v3/utils.d.ts +1 -1
  19. package/build/dex/aave-v3/utils.js.map +1 -1
  20. package/build/dex/balancer-v1/balancer-v1-pool.d.ts +2 -2
  21. package/build/dex/balancer-v1/balancer-v1-pool.js +5 -1
  22. package/build/dex/balancer-v1/balancer-v1-pool.js.map +1 -1
  23. package/build/dex/balancer-v1/balancer-v1.d.ts +1 -1
  24. package/build/dex/balancer-v1/balancer-v1.js +7 -4
  25. package/build/dex/balancer-v1/balancer-v1.js.map +1 -1
  26. package/build/dex/balancer-v1/utils.d.ts +3 -1
  27. package/build/dex/balancer-v1/utils.js +18 -5
  28. package/build/dex/balancer-v1/utils.js.map +1 -1
  29. package/build/dex/balancer-v2/balancer-v2.d.ts +10 -5
  30. package/build/dex/balancer-v2/balancer-v2.js +15 -10
  31. package/build/dex/balancer-v2/balancer-v2.js.map +1 -1
  32. package/build/dex/camelot/camelot.d.ts +2 -2
  33. package/build/dex/camelot/camelot.js +15 -6
  34. package/build/dex/camelot/camelot.js.map +1 -1
  35. package/build/dex/curve-v1/curve-v1.d.ts +1 -1
  36. package/build/dex/curve-v1/curve-v1.js +5 -8
  37. package/build/dex/curve-v1/curve-v1.js.map +1 -1
  38. package/build/dex/curve-v1/pools/curve-metapool.d.ts +2 -2
  39. package/build/dex/curve-v1/pools/curve-metapool.js +12 -4
  40. package/build/dex/curve-v1/pools/curve-metapool.js.map +1 -1
  41. package/build/dex/curve-v1/pools/curve-pool.d.ts +3 -3
  42. package/build/dex/curve-v1/pools/curve-pool.js +13 -4
  43. package/build/dex/curve-v1/pools/curve-pool.js.map +1 -1
  44. package/build/dex/curve-v1/pools/getstate-multicall.d.ts +6 -1
  45. package/build/dex/curve-v1/pools/getstate-multicall.js +32 -25
  46. package/build/dex/curve-v1/pools/getstate-multicall.js.map +1 -1
  47. package/build/dex/curve-v1-factory/curve-v1-factory.d.ts +3 -3
  48. package/build/dex/curve-v1-factory/curve-v1-factory.js +4 -4
  49. package/build/dex/curve-v1-factory/curve-v1-factory.js.map +1 -1
  50. package/build/dex/curve-v1-factory/curve-v1-pool-manager.d.ts +1 -1
  51. package/build/dex/curve-v1-factory/curve-v1-pool-manager.js +1 -1
  52. package/build/dex/curve-v1-factory/curve-v1-pool-manager.js.map +1 -1
  53. package/build/dex/curve-v1-factory/state-polling-pools/custom-pool-polling.d.ts +1 -1
  54. package/build/dex/curve-v1-factory/state-polling-pools/custom-pool-polling.js.map +1 -1
  55. package/build/dex/curve-v1-factory/state-polling-pools/factory-pool-polling.d.ts +1 -1
  56. package/build/dex/curve-v1-factory/state-polling-pools/factory-pool-polling.js.map +1 -1
  57. package/build/dex/curve-v1-factory/state-polling-pools/polling-manager.d.ts +4 -4
  58. package/build/dex/curve-v1-factory/state-polling-pools/polling-manager.js +5 -15
  59. package/build/dex/curve-v1-factory/state-polling-pools/polling-manager.js.map +1 -1
  60. package/build/dex/curve-v1-factory/state-polling-pools/pool-polling-base.d.ts +1 -1
  61. package/build/dex/curve-v1-factory/types.d.ts +1 -1
  62. package/build/dex/generic-rfq/generic-rfq.d.ts +1 -1
  63. package/build/dex/generic-rfq/generic-rfq.js +1 -1
  64. package/build/dex/generic-rfq/generic-rfq.js.map +1 -1
  65. package/build/dex/generic-rfq/utils.js +1 -1
  66. package/build/dex/generic-rfq/utils.js.map +1 -1
  67. package/build/dex/gmx/gmx.d.ts +1 -1
  68. package/build/dex/gmx/gmx.js +1 -1
  69. package/build/dex/gmx/gmx.js.map +1 -1
  70. package/build/dex/gmx/pool.js +5 -4
  71. package/build/dex/gmx/pool.js.map +1 -1
  72. package/build/dex/idex.d.ts +1 -1
  73. package/build/dex/jarvis-v6/jarvis-v6-events.d.ts +4 -3
  74. package/build/dex/jarvis-v6/jarvis-v6-events.js +8 -4
  75. package/build/dex/jarvis-v6/jarvis-v6-events.js.map +1 -1
  76. package/build/dex/jarvis-v6/jarvis-v6.d.ts +1 -1
  77. package/build/dex/jarvis-v6/jarvis-v6.js +12 -8
  78. package/build/dex/jarvis-v6/jarvis-v6.js.map +1 -1
  79. package/build/dex/jarvis-v6/utils.d.ts +2 -1
  80. package/build/dex/jarvis-v6/utils.js +15 -6
  81. package/build/dex/jarvis-v6/utils.js.map +1 -1
  82. package/build/dex/kyberdmm/kyberdmm.js +4 -1
  83. package/build/dex/kyberdmm/kyberdmm.js.map +1 -1
  84. package/build/dex/kyberdmm/pool.d.ts +2 -2
  85. package/build/dex/kyberdmm/pool.js +21 -20
  86. package/build/dex/kyberdmm/pool.js.map +1 -1
  87. package/build/dex/maker-psm/maker-psm.d.ts +3 -3
  88. package/build/dex/maker-psm/maker-psm.js +35 -27
  89. package/build/dex/maker-psm/maker-psm.js.map +1 -1
  90. package/build/dex/maverick-v1/maverick-v1-pool.d.ts +3 -5
  91. package/build/dex/maverick-v1/maverick-v1-pool.js +27 -38
  92. package/build/dex/maverick-v1/maverick-v1-pool.js.map +1 -1
  93. package/build/dex/maverick-v1/maverick-v1.d.ts +2 -2
  94. package/build/dex/maverick-v1/maverick-v1.js +8 -8
  95. package/build/dex/maverick-v1/maverick-v1.js.map +1 -1
  96. package/build/dex/nerve/nerve-pool.d.ts +2 -2
  97. package/build/dex/nerve/nerve-pool.js +28 -25
  98. package/build/dex/nerve/nerve-pool.js.map +1 -1
  99. package/build/dex/nerve/nerve.d.ts +2 -2
  100. package/build/dex/nerve/nerve.js +5 -5
  101. package/build/dex/nerve/nerve.js.map +1 -1
  102. package/build/dex/platypus/platypus.d.ts +3 -3
  103. package/build/dex/platypus/platypus.js +6 -5
  104. package/build/dex/platypus/platypus.js.map +1 -1
  105. package/build/dex/swaap-v1/config.d.ts +1 -1
  106. package/build/dex/swaap-v1/config.js +2 -2
  107. package/build/dex/swaap-v1/swaap-v1-pool.d.ts +3 -3
  108. package/build/dex/swaap-v1/swaap-v1-pool.js +15 -9
  109. package/build/dex/swaap-v1/swaap-v1-pool.js.map +1 -1
  110. package/build/dex/swaap-v1/swaap-v1.d.ts +2 -2
  111. package/build/dex/swaap-v1/swaap-v1.js +11 -8
  112. package/build/dex/swaap-v1/swaap-v1.js.map +1 -1
  113. package/build/dex/synthetix/synthetix-state.js +1 -1
  114. package/build/dex/synthetix/synthetix-state.js.map +1 -1
  115. package/build/dex/synthetix/synthetix.d.ts +1 -1
  116. package/build/dex/synthetix/synthetix.js +5 -4
  117. package/build/dex/synthetix/synthetix.js.map +1 -1
  118. package/build/dex/test-dex/config.d.ts +4 -0
  119. package/build/dex/test-dex/config.js +15 -0
  120. package/build/dex/test-dex/config.js.map +1 -0
  121. package/build/dex/test-dex/test-dex-pool.d.ts +39 -0
  122. package/build/dex/test-dex/test-dex-pool.js +63 -0
  123. package/build/dex/test-dex/test-dex-pool.js.map +1 -0
  124. package/build/dex/test-dex/test-dex.d.ts +37 -0
  125. package/build/dex/test-dex/test-dex.js +126 -0
  126. package/build/dex/test-dex/test-dex.js.map +1 -0
  127. package/build/dex/test-dex/types.d.ts +6 -0
  128. package/build/dex/test-dex/types.js +3 -0
  129. package/build/dex/test-dex/types.js.map +1 -0
  130. package/build/dex/uniswap-v2/uniswap-v2.d.ts +2 -2
  131. package/build/dex/uniswap-v2/uniswap-v2.js +15 -10
  132. package/build/dex/uniswap-v2/uniswap-v2.js.map +1 -1
  133. package/build/dex/uniswap-v3/uniswap-v3-pool.d.ts +3 -3
  134. package/build/dex/uniswap-v3/uniswap-v3-pool.js +33 -27
  135. package/build/dex/uniswap-v3/uniswap-v3-pool.js.map +1 -1
  136. package/build/dex/uniswap-v3/uniswap-v3.d.ts +2 -2
  137. package/build/dex/uniswap-v3/uniswap-v3.js +4 -3
  138. package/build/dex/uniswap-v3/uniswap-v3.js.map +1 -1
  139. package/build/dex/woo-fi-v2/woo-fi-math.d.ts +16 -0
  140. package/build/dex/woo-fi-v2/woo-fi-math.js +137 -0
  141. package/build/dex/woo-fi-v2/woo-fi-math.js.map +1 -0
  142. package/build/dex/woo-fi-v2/woo-fi-v2.d.ts +1 -1
  143. package/build/dex/woo-fi-v2/woo-fi-v2.js +1 -1
  144. package/build/dex/woo-fi-v2/woo-fi-v2.js.map +1 -1
  145. package/build/implementations/local-paraswap-sdk.js +1 -2
  146. package/build/implementations/local-paraswap-sdk.js.map +1 -1
  147. package/build/lib/generics-events-subscribers/erc20-event-subscriber.d.ts +2 -2
  148. package/build/lib/generics-events-subscribers/erc20-event-subscriber.js +17 -12
  149. package/build/lib/generics-events-subscribers/erc20-event-subscriber.js.map +1 -1
  150. package/build/lib/multi-wrapper.d.ts +5 -1
  151. package/build/lib/multi-wrapper.js +21 -2
  152. package/build/lib/multi-wrapper.js.map +1 -1
  153. package/build/lib/tokens/balancer-fetcher.d.ts +5 -1
  154. package/build/lib/tokens/balancer-fetcher.js +7 -9
  155. package/build/lib/tokens/balancer-fetcher.js.map +1 -1
  156. package/build/pricing-helper.d.ts +1 -1
  157. package/build/pricing-helper.js +1 -1
  158. package/build/pricing-helper.js.map +1 -1
  159. package/build/stateful-event-subscriber.d.ts +7 -3
  160. package/build/stateful-event-subscriber.js +25 -22
  161. package/build/stateful-event-subscriber.js.map +1 -1
  162. package/build/utils.d.ts +2 -2
  163. package/build/utils.js +1 -1
  164. package/build/utils.js.map +1 -1
  165. package/dex-template/__DexName__.ts.template +3 -1
  166. package/package.json +1 -1
  167. package/src/composed-event-subscriber.ts +24 -13
  168. package/src/dex/aave-v1/aave-v1.ts +1 -1
  169. package/src/dex/aave-v2/aave-v2.ts +1 -1
  170. package/src/dex/aave-v3/aave-v3.ts +3 -1
  171. package/src/dex/aave-v3/utils.ts +3 -3
  172. package/src/dex/balancer-v1/balancer-v1-pool.ts +18 -9
  173. package/src/dex/balancer-v1/balancer-v1.ts +13 -8
  174. package/src/dex/balancer-v1/utils.ts +36 -7
  175. package/src/dex/balancer-v2/balancer-v2.ts +42 -25
  176. package/src/dex/camelot/camelot.ts +29 -10
  177. package/src/dex/curve-v1/curve-v1.ts +11 -11
  178. package/src/dex/curve-v1/pools/curve-metapool.ts +23 -7
  179. package/src/dex/curve-v1/pools/curve-pool.ts +29 -8
  180. package/src/dex/curve-v1/pools/getstate-multicall.ts +83 -56
  181. package/src/dex/curve-v1-factory/curve-v1-factory.ts +4 -4
  182. package/src/dex/curve-v1-factory/curve-v1-pool-manager.ts +1 -1
  183. package/src/dex/curve-v1-factory/state-polling-pools/custom-pool-polling.ts +1 -1
  184. package/src/dex/curve-v1-factory/state-polling-pools/factory-pool-polling.ts +1 -1
  185. package/src/dex/curve-v1-factory/state-polling-pools/polling-manager.ts +5 -16
  186. package/src/dex/curve-v1-factory/state-polling-pools/pool-polling-base.ts +1 -1
  187. package/src/dex/curve-v1-factory/types.ts +1 -1
  188. package/src/dex/generic-rfq/generic-rfq.ts +3 -1
  189. package/src/dex/generic-rfq/utils.ts +1 -1
  190. package/src/dex/gmx/gmx.ts +1 -1
  191. package/src/dex/gmx/pool.ts +9 -4
  192. package/src/dex/idex.ts +1 -1
  193. package/src/dex/jarvis-v6/jarvis-v6-events.ts +17 -6
  194. package/src/dex/jarvis-v6/jarvis-v6.ts +17 -15
  195. package/src/dex/jarvis-v6/utils.ts +21 -9
  196. package/src/dex/kyberdmm/kyberdmm.ts +4 -1
  197. package/src/dex/kyberdmm/pool.ts +32 -24
  198. package/src/dex/maker-psm/maker-psm.ts +69 -47
  199. package/src/dex/maverick-v1/maverick-v1-pool.ts +50 -38
  200. package/src/dex/maverick-v1/maverick-v1.ts +12 -8
  201. package/src/dex/nerve/nerve-pool.ts +42 -30
  202. package/src/dex/nerve/nerve.ts +9 -5
  203. package/src/dex/platypus/platypus.ts +11 -7
  204. package/src/dex/swaap-v1/config.ts +1 -1
  205. package/src/dex/swaap-v1/swaap-v1-pool.ts +23 -14
  206. package/src/dex/swaap-v1/swaap-v1.ts +21 -14
  207. package/src/dex/synthetix/synthetix-state.ts +3 -3
  208. package/src/dex/synthetix/synthetix.ts +5 -4
  209. package/src/dex/uniswap-v2/uniswap-v2.ts +27 -13
  210. package/src/dex/uniswap-v3/uniswap-v3-pool.ts +43 -39
  211. package/src/dex/uniswap-v3/uniswap-v3.ts +5 -4
  212. package/src/dex/woo-fi-v2/woo-fi-v2.ts +3 -1
  213. package/src/implementations/local-paraswap-sdk.ts +1 -2
  214. package/src/lib/generics-events-subscribers/erc20-event-subscriber.ts +29 -18
  215. package/src/lib/multi-wrapper.ts +41 -2
  216. package/src/lib/tokens/balancer-fetcher.ts +23 -19
  217. package/src/pricing-helper.ts +5 -2
  218. package/src/stateful-event-subscriber.ts +35 -28
  219. package/src/utils.ts +3 -4
  220. package/tests/utils.test.ts +44 -0
package/build/dex/gmx/pool.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/dex/gmx/pool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/dex/gmx/pool.ts"],"names":[],"mappings":";;;;;;AACA,qCAAwC;AAExC,+EAA0E;AAG1E,mDAA0D;AAC1D,uDAAkD;AAClD,yDAAoD;AACpD,mCAAgC;AAChC,iCAA8B;AAE9B,4EAAkD;AAElD,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE,CAAC;AAEvC,MAAa,YAAa,SAAQ,mDAAkC;IAQlE,YACE,UAAkB,EACR,OAAe,EACf,SAAqB,EAC/B,MAAc,EACd,MAAkB;QAElB,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAC1D,CACE,GAA0D,EAC1D,CAAC,GAAG,EAAE,KAAK,CAAC,EACZ,EAAE;YACF,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,+BAAmB,CAChC,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,UAAU,EAChB,IAAA,WAAI,GAA2B,CAAC,aAAa,CAAC,GAAG,CAAC,EAClD,SAAS,CAAC,SAAS,CAAC,GAAG,GAAG,kBAAkB,UAAU,IAAI,OAAO,EAAE,CAAC,CACrE,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAE,CACH,CAAC;QACF,MAAM,aAAa,GAAG,IAAI,+BAAa,CACrC,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,mBAAmB,EAC1B,IAAA,WAAI,GAA2B,CAAC,eAAe,EAC/C,SAAS,CAAC,SAAS,CAAC,GAAG,UAAU,IAAI,OAAO,gBAAgB,CAAC,CAC9D,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,iCAAc,CACvC,MAAM,CAAC,oBAAoB,EAC3B,YAAY,EACZ,aAAa,CACd,CAAC;QACF,MAAM,IAAI,GAAG,IAAI,WAAI,CACnB,MAAM,CAAC,WAAW,EAClB,IAAA,WAAI,GAA2B,CAAC,IAAI,EACpC,SAAS,CAAC,SAAS,CAAC,GAAG,UAAU,IAAI,OAAO,OAAO,CAAC,CACrD,CAAC;QACF,MAAM,KAAK,GAAG,IAAI,aAAK,CACrB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,WAAW,EAClB,cAAc,EACd,IAAI,EACJ,IAAA,WAAI,GAA2B,CAAC,KAAK,EACrC,SAAS,CAAC,SAAS,CAAC,GAAG,UAAU,IAAI,OAAO,QAAQ,CAAC,CACtD,CAAC;QACF,KAAK,CACH,UAAU,EACV,MAAM,EACN,SAAS,CAAC,SAAS,CAAC,GAAG,UAAU,IAAI,OAAO,EAAE,CAAC,EAC/C,SAAS,EACT,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,CAAC,EAC5D;YACE,aAAa,EAAE,EAAE;YACjB,eAAe,EAAE;gBACf,aAAa,EAAE,CAAC;gBAChB,MAAM,EAAE,EAAE;aACX;YACD,KAAK,EAAE;gBACL,WAAW,EAAE,EAAE;aAChB;YACD,IAAI,EAAE;gBACJ,WAAW,EAAE,EAAE;aAChB;SACF,CACF,CAAC;QAlEQ,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAY;QAVjC,oBAAe,GAAG,GAAG,IAAI,GAAG,CAAC;QAC7B,kBAAa,GAAG,EAAE,CAAC;QACnB,yBAAoB,GAAG,MAAM,CAAC;QA0E5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CACxD,qBAAgB,EAChB,MAAM,CAAC,aAAa,CACrB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,WAAmB;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7C,IAAI,SAAS,EAAE;YACb,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAEjE,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,KAAK,EAAE,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAExE,OAAO,kBAAkB,CAAC,KAAK,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,QAAiB,EAAE,SAAkB;QACxD,MAAM,QAAQ,GAAG,eAAe,QAAQ,IAAI,SAAS,EAAE,CAAC;QACxD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CACpD,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,OAAO,EACZ,QAAQ,CACT,CAAC;QACF,IAAI,eAAe;YAAE,OAAO,MAAM,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,SAAS,GAAW,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO;aAChD,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC;aAC5D,IAAI,EAAE,CAAC;QACV,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CACxB,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,OAAO,EACZ,QAAQ,EACR,uBAAuB,EACvB,SAAS,CACV,CAAC;QACF,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,2CAA2C;IAC3C,2FAA2F;IAC3F,KAAK,CAAC,YAAY,CAChB,QAAiB,EACjB,SAAkB,EAClB,UAAoB,EACpB,WAAmB;QAEnB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAE1D,MAAM,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC3D,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAE7D,MAAM,YAAY,GAChB,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC1E,MAAM,OAAO,GAAG,YAAY;YAC1B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,wBAAwB;YACrC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC;QAClC,MAAM,MAAM,GAAG,YAAY;YACzB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB;YACjC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;QAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,EAAE,IAAI,IAAI,CAAC,aAAa,CAAC,CAAC;QAClD,MAAM,WAAW,GAAG,MAAM,CAAC,EAAE,IAAI,eAAe,CAAC,CAAC;QAClD,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,IAAI,gBAAgB,CAAC,CAAC;QAEpD,OAAO,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAChC,IAAI,SAAS,GAAG,WAAW;gBAAE,OAAO,EAAE,CAAC;YACvC,IAAI,cAAc,CAAC;YACnB;gBACE,IAAI,UAAU,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;gBAC9D,UAAU,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,WAAW,CAAC;gBAEnD,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CACnD,KAAK,EACL,QAAQ,EACR,UAAU,EACV,OAAO,EACP,MAAM,EACN,IAAI,CACL,CAAC;gBACF,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CACnD,KAAK,EACL,SAAS,EACT,UAAU,EACV,OAAO,EACP,MAAM,EACN,KAAK,CACN,CAAC;gBACF,6CAA6C;gBAC7C,cAAc;oBACZ,gBAAgB,GAAG,gBAAgB;wBACjC,CAAC,CAAC,gBAAgB;wBAClB,CAAC,CAAC,gBAAgB,CAAC;aACxB;YAED,IAAI,SAAS,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,QAAQ,CAAC;YACjD,SAAS,GAAG,CAAC,SAAS,GAAG,YAAY,CAAC,GAAG,WAAW,CAAC;YAErD,MAAM,kBAAkB,GACtB,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,oBAAoB,GAAG,cAAc,CAAC,CAAC;gBAC1D,IAAI,CAAC,oBAAoB,CAAC;YAC5B,OAAO,kBAAkB,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAC/B,YAAqB,EACrB,WAA8B,EAC9B,aAAuB;QAEvB,mBAAmB;QACnB,MAAM,gBAAgB,GAAG,CACvB,MAAM,aAAa,CAAC,OAAO;aACxB,SAAS,CAAC;YACT;gBACE,QAAQ,EAAE,aAAK,CAAC,SAAS,CAAC,kBAAkB,CAC1C,4BAA4B,CAC7B;gBACD,MAAM,EAAE,YAAY;aACrB;SACF,CAAC;aACD,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,CACzB,CAAC,UAAU,CAAC;QACb,MAAM,WAAW,GAAG,QAAQ,CAC1B,aAAK,CAAC,SAAS;aACZ,oBAAoB,CAAC,4BAA4B,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;aACvE,QAAQ,EAAE,CACd,CAAC;QAEF,aAAa;QACb,MAAM,iBAAiB,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACpE,OAAO;gBACL,QAAQ,EAAE,aAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,sBAAsB,EAAE;oBACnE,CAAC;iBACF,CAAC;gBACF,MAAM,EAAE,YAAY;aACrB,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,CACnB,MAAM,aAAa,CAAC,OAAO;aACxB,SAAS,CAAC,iBAAiB,CAAC;aAC5B,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,CACzB,CAAC,UAAU,CAAC;QACb,MAAM,MAAM,GAAc,YAAY,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CACpD,aAAK,CAAC,SAAS;aACZ,oBAAoB,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aAClD,WAAW,EAAE,CACjB,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,SAAS,CACpB,SAAoB,EACpB,WAA8B,EAC9B,aAAuB;QAEvB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAC5C,SAAS,CAAC,KAAK,EACf,WAAW,EACX,aAAa,CACd,CAAC;QAEF,iCAAiC;QACjC,MAAM,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC1C,OAAO;gBACL,QAAQ,EAAE,iCAAc,CAAC,SAAS,CAAC,kBAAkB,CAAC,YAAY,EAAE;oBAClE,CAAC;iBACF,CAAC;gBACF,MAAM,EAAE,SAAS,CAAC,SAAS;aAC5B,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,CACtB,MAAM,aAAa,CAAC,OAAO;aACxB,SAAS,CAAC,oBAAoB,CAAC;aAC/B,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,CACzB,CAAC,UAAU,CAAC;QACb,MAAM,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAChD,iCAAc,CAAC,SAAS;aACrB,oBAAoB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;aACxC,QAAQ,EAAE;aACV,WAAW,EAAE,CACjB,CAAC;QAEF,qCAAqC;QACrC,IAAI,eAAe,GAAuB,EAAE,CAAC;QAC7C,IAAI,aAAa,GAAqB,EAAE,CAAC;QACzC,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,IAAI,SAAS,IAAI,UAAU,EAAE;YAChC,MAAM,uBAAuB,GAC3B,+BAAmB,CAAC,+BAA+B,CAAC,SAAS,CAAC,CAAC;YACjE,aAAa,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAC5C,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACjC,CAAC,IAAI,CAAC,CAAC;SACR;QAED,MAAM,2BAA2B,GAAG,+BAAa,CAAC,wBAAwB,CACxE,SAAS,CAAC,aAAa,EACvB,MAAM,CACP,CAAC;QACF,aAAa,CAAC,IAAI,CAAC,GAAG,2BAA2B,CAAC,CAAC;QACnD,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,2BAA2B,CAAC,MAAM,CAAC,CAAC,CAAC;QAClE,CAAC,IAAI,2BAA2B,CAAC,MAAM,CAAC;QAExC,MAAM,4BAA4B,GAChC,iCAAc,CAAC,wBAAwB,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACvE,aAAa,CAAC,IAAI,CAAC,GAAG,4BAA4B,CAAC,CAAC;QACpD,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,4BAA4B,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,CAAC,IAAI,4BAA4B,CAAC,MAAM,CAAC;QAEzC,MAAM,mBAAmB,GAAG,aAAK,CAAC,wBAAwB,CACxD,SAAS,CAAC,KAAK,EACf,MAAM,CACP,CAAC;QACF,aAAa,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,CAAC;QAC3C,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1D,CAAC,IAAI,mBAAmB,CAAC,MAAM,CAAC;QAEhC,MAAM,aAAa,GAAG,CACpB,MAAM,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,CAC3E,CAAC,UAAU,CAAC;QAEb,MAAM,SAAS,GAEX,EAAE,CAAC;QACP,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;YACxB,MAAM,UAAU,GAAG,+BAAmB,CAAC,cAAc,CACnD,aAAa,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,EAAG,CAAC,CAAC,CAAC,CAAC,CACpD,CAAC;YACF,SAAS,CAAC,KAAK,CAAC,GAAG;gBACjB,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE;gBACzB,UAAU;aACX,CAAC;SACH;QAED,MAAM,0BAA0B,GAAG,aAAa,CAAC,KAAK,CACpD,GAAG,eAAe,CAAC,KAAK,EAAG,CAC5B,CAAC;QACF,MAAM,mBAAmB,GAAG,+BAAa,CAAC,SAAS,CACjD,0BAA0B,EAC1B,MAAM,CACP,CAAC;QAEF,MAAM,2BAA2B,GAAG,aAAa,CAAC,KAAK,CACrD,GAAG,eAAe,CAAC,KAAK,EAAG,CAC5B,CAAC;QACF,MAAM,oBAAoB,GAAG,iCAAc,CAAC,SAAS,CACnD,2BAA2B,EAC3B,MAAM,CACP,CAAC;QAEF,MAAM,kBAAkB,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,eAAe,CAAC,KAAK,EAAG,CAAC,CAAC;QAC5E,MAAM,WAAW,GAAG,aAAK,CAAC,SAAS,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;QAEhE,OAAO;YACL,YAAY,EAAE,SAAS,CAAC,KAAK;YAC7B,aAAa,EAAE,SAAS,CAAC,MAAM;YAC/B,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,aAAa,EAAE,SAAS,CAAC,aAAa;YACtC,eAAe,EAAE,SAAS,CAAC,eAAe;YAC1C,WAAW,EAAE,SAAS,CAAC,IAAI;YAC3B,cAAc,EAAE,MAAM;YACtB,WAAW;YACX,oBAAoB;YACpB,mBAAmB;YACnB,SAAS;SACV,CAAC;IACJ,CAAC;CACF;AA5VD,oCA4VC"}
package/build/dex/idex.d.ts CHANGED
@@ -21,7 +21,7 @@ export interface IDexPricing<ExchangeData> {
21
21
  getPoolIdentifiers(srcToken: Token, destToken: Token, side: SwapSide, blockNumber: number): Promise<string[]>;
22
22
  getPricesVolume(srcToken: Token, destToken: Token, amounts: bigint[], side: SwapSide, blockNumber: number, limitPools?: string[], transferFees?: TransferFeeParams): Promise<ExchangePrices<ExchangeData> | null>;
23
23
  getCalldataGasCost(poolPrices: PoolPrices<ExchangeData>): number | number[];
24
- initializePricing?(blockNumber: number): AsyncOrSync<void>;
24
+ initializePricing?(blockNumber: number | 'latest'): AsyncOrSync<void>;
25
25
  getAdapters(side: SwapSide): {
26
26
  name: string;
27
27
  index: number;
package/build/dex/jarvis-v6/jarvis-v6-events.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { Logger } from '../../types';
2
+ import { StateWithBlock } from '../../stateful-event-subscriber';
2
3
  import { ComposedEventSubscriber } from '../../composed-event-subscriber';
3
4
  import { IDexHelper } from '../../dex-helper/idex-helper';
4
5
  import { PoolConfig, PoolState } from './types';
@@ -9,10 +10,10 @@ export declare class JarvisV6EventPool extends ComposedEventSubscriber<PoolState
9
10
  protected network: number;
10
11
  protected dexHelper: IDexHelper;
11
12
  poolConfig: PoolConfig;
12
- priceFeedAdress: Address;
13
+ priceFeedAddress: Address;
13
14
  poolInterface: Interface;
14
15
  priceFeedContract: Contract;
15
- constructor(parentName: string, network: number, dexHelper: IDexHelper, logger: Logger, poolConfig: PoolConfig, priceFeedAdress: Address, poolInterface: Interface, priceFeedContract: Contract);
16
+ constructor(parentName: string, network: number, dexHelper: IDexHelper, logger: Logger, poolConfig: PoolConfig, priceFeedAddress: Address, poolInterface: Interface, priceFeedContract: Contract);
16
17
  getIdentifier(): string;
17
18
  /**
18
19
  * The function generates state using on-chain calls. This
@@ -23,5 +24,5 @@ export declare class JarvisV6EventPool extends ComposedEventSubscriber<PoolState
23
24
  * should be generated
24
25
  * @returns state of the event subscriber at blocknumber
25
26
  */
26
- generateState(blockNumber: number): Promise<Readonly<PoolState>>;
27
+ generateState(blockNumber: number | 'latest'): Promise<StateWithBlock<PoolState>>;
27
28
  }
package/build/dex/jarvis-v6/jarvis-v6-events.js CHANGED
@@ -7,7 +7,7 @@ const utils_1 = require("./utils");
7
7
  const chainLinkpriceFeed_event_1 = require("./chainLinkpriceFeed-event");
8
8
  const syntheteumPool_event_1 = require("./syntheteumPool-event");
9
9
  class JarvisV6EventPool extends composed_event_subscriber_1.ComposedEventSubscriber {
10
- constructor(parentName, network, dexHelper, logger, poolConfig, priceFeedAdress, poolInterface, priceFeedContract) {
10
+ constructor(parentName, network, dexHelper, logger, poolConfig, priceFeedAddress, poolInterface, priceFeedContract) {
11
11
  const chainLinkEvent = new chainLinkpriceFeed_event_1.ChainLinkPriceFeed(poolConfig.chainLinkAggregatorAddress, (0, lens_1.lens)().priceFeed, logger);
12
12
  const poolEvent = new syntheteumPool_event_1.SynthereumPoolEvent(poolConfig.address, poolInterface, (0, lens_1.lens)().pool, logger);
13
13
  super(parentName, 'pool', logger, dexHelper, [chainLinkEvent, poolEvent], {
@@ -21,7 +21,7 @@ class JarvisV6EventPool extends composed_event_subscriber_1.ComposedEventSubscri
21
21
  this.network = network;
22
22
  this.dexHelper = dexHelper;
23
23
  this.poolConfig = poolConfig;
24
- this.priceFeedAdress = priceFeedAdress;
24
+ this.priceFeedAddress = priceFeedAddress;
25
25
  this.poolInterface = poolInterface;
26
26
  this.priceFeedContract = priceFeedContract;
27
27
  }
@@ -38,10 +38,14 @@ class JarvisV6EventPool extends composed_event_subscriber_1.ComposedEventSubscri
38
38
  * @returns state of the event subscriber at blocknumber
39
39
  */
40
40
  async generateState(blockNumber) {
41
- return (await (0, utils_1.getOnChainState)(this.dexHelper, [this.poolConfig], blockNumber, {
41
+ const { blockNumber: _blockNumber, state } = await (0, utils_1.getOnChainState)(this.dexHelper, [this.poolConfig], blockNumber, {
42
42
  poolInterface: this.poolInterface,
43
43
  priceFeedContract: this.priceFeedContract,
44
- }))[0];
44
+ });
45
+ return {
46
+ blockNumber: _blockNumber,
47
+ state: state[0],
48
+ };
45
49
  }
46
50
  }
47
51
  exports.JarvisV6EventPool = JarvisV6EventPool;
package/build/dex/jarvis-v6/jarvis-v6-events.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jarvis-v6-events.js","sourceRoot":"","sources":["../../../src/dex/jarvis-v6/jarvis-v6-events.ts"],"names":[],"mappings":";;;AAEA,+EAA0E;AAE1E,qCAAkC;AAElC,mCAA0C;AAE1C,yEAAgE;AAChE,iEAA6D;AAG7D,MAAa,iBAAkB,SAAQ,mDAAkC;IACvE,YACE,UAAkB,EACR,OAAe,EACf,SAAqB,EAC/B,MAAc,EACP,UAAsB,EACtB,eAAwB,EACxB,aAAwB,EACxB,iBAA2B;QAElC,MAAM,cAAc,GAAG,IAAI,6CAAkB,CAC3C,UAAU,CAAC,0BAA0B,EACrC,IAAA,WAAI,GAA2B,CAAC,SAAS,EACzC,MAAM,CACP,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,0CAAmB,CACvC,UAAU,CAAC,OAAO,EAClB,aAAa,EACb,IAAA,WAAI,GAA2B,CAAC,IAAI,EACpC,MAAM,CACP,CAAC;QACF,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,cAAc,EAAE,SAAS,CAAC,EAAE;YACxE,SAAS,EAAE;gBACT,SAAS,EAAE,EAAE;aACd;YACD,IAAI,EAAE;gBACJ,cAAc,EAAE,EAAE;aACnB;SACF,CAAC,CAAC;QA3BO,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAY;QAExB,eAAU,GAAV,UAAU,CAAY;QACtB,oBAAe,GAAf,eAAe,CAAS;QACxB,kBAAa,GAAb,aAAa,CAAW;QACxB,sBAAiB,GAAjB,iBAAiB,CAAU;IAsBpC,CAAC;IAED,aAAa;QACX,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC;IACvE,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,aAAa,CAAC,WAAmB;QACrC,OAAO,CACL,MAAM,IAAA,uBAAe,EAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE;YACpE,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;SAC1C,CAAC,CACH,CAAC,CAAC,CAAC,CAAC;IACP,CAAC;CACF;AAtDD,8CAsDC"}
1
+ {"version":3,"file":"jarvis-v6-events.js","sourceRoot":"","sources":["../../../src/dex/jarvis-v6/jarvis-v6-events.ts"],"names":[],"mappings":";;;AAGA,+EAA0E;AAE1E,qCAAkC;AAElC,mCAA0C;AAE1C,yEAAgE;AAChE,iEAA6D;AAG7D,MAAa,iBAAkB,SAAQ,mDAAkC;IACvE,YACE,UAAkB,EACR,OAAe,EACf,SAAqB,EAC/B,MAAc,EACP,UAAsB,EACtB,gBAAyB,EACzB,aAAwB,EACxB,iBAA2B;QAElC,MAAM,cAAc,GAAG,IAAI,6CAAkB,CAC3C,UAAU,CAAC,0BAA0B,EACrC,IAAA,WAAI,GAA2B,CAAC,SAAS,EACzC,MAAM,CACP,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,0CAAmB,CACvC,UAAU,CAAC,OAAO,EAClB,aAAa,EACb,IAAA,WAAI,GAA2B,CAAC,IAAI,EACpC,MAAM,CACP,CAAC;QACF,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,cAAc,EAAE,SAAS,CAAC,EAAE;YACxE,SAAS,EAAE;gBACT,SAAS,EAAE,EAAE;aACd;YACD,IAAI,EAAE;gBACJ,cAAc,EAAE,EAAE;aACnB;SACF,CAAC,CAAC;QA3BO,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAY;QAExB,eAAU,GAAV,UAAU,CAAY;QACtB,qBAAgB,GAAhB,gBAAgB,CAAS;QACzB,kBAAa,GAAb,aAAa,CAAW;QACxB,sBAAiB,GAAjB,iBAAiB,CAAU;IAsBpC,CAAC;IAED,aAAa;QACX,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC;IACvE,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,aAAa,CACjB,WAA8B;QAE9B,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,uBAAe,EAChE,IAAI,CAAC,SAAS,EACd,CAAC,IAAI,CAAC,UAAU,CAAC,EACjB,WAAW,EACX;YACE,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;SAC1C,CACF,CAAC;QAEF,OAAO;YACL,WAAW,EAAE,YAAY;YACzB,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;SAChB,CAAC;IACJ,CAAC;CACF;AAhED,8CAgEC"}
package/build/dex/jarvis-v6/jarvis-v6.d.ts CHANGED
@@ -26,7 +26,7 @@ export declare class JarvisV6 extends SimpleExchange implements IDex<JarvisV6Dat
26
26
  protected priceFeedContract: Contract;
27
27
  logger: Logger;
28
28
  constructor(network: Network, dexKey: string, dexHelper: IDexHelper, adapters?: import("../../types").AdapterMappings, poolConfigs?: PoolConfig[], priceFeedAddress?: Address);
29
- initializePricing(blockNumber: number): Promise<void>;
29
+ initializePricing(blockNumber?: number | 'latest'): Promise<void>;
30
30
  getAdapters(side: SwapSide): {
31
31
  name: string;
32
32
  index: number;
package/build/dex/jarvis-v6/jarvis-v6.js CHANGED
@@ -62,15 +62,18 @@ class JarvisV6 extends simple_exchange_1.SimpleExchange {
62
62
  // pricing service. It is intended to setup the integration
63
63
  // for pricing requests. It is optional for a DEX to
64
64
  // implement this function
65
- async initializePricing(blockNumber) {
66
- const poolStates = await (0, utils_2.getOnChainState)(this.dexHelper, this.poolConfigs, blockNumber, {
65
+ async initializePricing(blockNumber = 'latest') {
66
+ const { blockNumber: _blockNumber, state: poolStates } = await (0, utils_2.getOnChainState)(this.dexHelper, this.poolConfigs, blockNumber, {
67
67
  poolInterface: this.poolInterface,
68
68
  priceFeedContract: this.priceFeedContract,
69
69
  });
70
70
  await Promise.all(this.poolConfigs.map(async (pool, index) => {
71
71
  const eventPool = this.eventPools[pool.address.toLowerCase()];
72
- await eventPool.initialize(blockNumber, {
73
- state: poolStates[index],
72
+ await eventPool.initialize(_blockNumber, {
73
+ stateWithBn: {
74
+ state: poolStates[index],
75
+ blockNumber: _blockNumber,
76
+ },
74
77
  });
75
78
  }));
76
79
  }
@@ -95,11 +98,12 @@ class JarvisV6 extends simple_exchange_1.SimpleExchange {
95
98
  }
96
99
  async getPoolState(pool, blockNumber) {
97
100
  const eventState = pool.getState(blockNumber);
98
- if (eventState)
101
+ if (eventState) {
99
102
  return eventState;
100
- const onChainState = await pool.generateState(blockNumber);
101
- pool.setState(onChainState, blockNumber);
102
- return onChainState;
103
+ }
104
+ const onChainStateWithBn = await pool.generateState(blockNumber);
105
+ pool.setState(onChainStateWithBn.state, onChainStateWithBn.blockNumber);
106
+ return onChainStateWithBn.state;
103
107
  }
104
108
  // Returns pool prices for amounts.
105
109
  // If limitPools is defined only pools in limitPools
package/build/dex/jarvis-v6/jarvis-v6.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jarvis-v6.js","sourceRoot":"","sources":["../../../src/dex/jarvis-v6/jarvis-v6.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"jarvis-v6.js","sourceRoot":"","sources":["../../../src/dex/jarvis-v6/jarvis-v6.ts"],"names":[],"mappings":"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"}
package/build/dex/jarvis-v6/utils.d.ts CHANGED
@@ -3,11 +3,12 @@ import { Token } from '../../types';
3
3
  import { JarvisSwapFunctions, PoolConfig, PoolState } from './types';
4
4
  import { Interface } from '@ethersproject/abi';
5
5
  import { Contract } from 'web3-eth-contract';
6
+ import { StateWithBlock } from '../../stateful-event-subscriber';
6
7
  export declare const THIRTY_MINUTES: number;
7
8
  export declare function getOnChainState(dexHelper: IDexHelper, poolConfigs: PoolConfig[], blockNumber: number | 'latest', { priceFeedContract, poolInterface, }: {
8
9
  priceFeedContract: Contract;
9
10
  poolInterface: Interface;
10
- }): Promise<PoolState[]>;
11
+ }): Promise<StateWithBlock<PoolState[]>>;
11
12
  export declare function getJarvisPoolFromTokens(srcToken: Token, destToken: Token, poolConfigs: PoolConfig[]): PoolConfig | null;
12
13
  export declare function convertToNewDecimals(amount: bigint, currentDecimal: number, desireDecimal: number): bigint;
13
14
  export declare function getJarvisSwapFunction(srcToken: Token, pool: PoolConfig): JarvisSwapFunctions;
package/build/dex/jarvis-v6/utils.js CHANGED
@@ -8,14 +8,23 @@ const types_1 = require("./types");
8
8
  exports.THIRTY_MINUTES = 60 * 30;
9
9
  // Note: PriceFeed contract can only be called directly or from Jarvis's whitelisted contract hence why we can't group in same init multicall call
10
10
  async function getOnChainState(dexHelper, poolConfigs, blockNumber, { priceFeedContract, poolInterface, }) {
11
+ const _blockNumber = blockNumber === 'latest'
12
+ ? await dexHelper.web3Provider.eth.getBlockNumber()
13
+ : blockNumber;
14
+ // These two calls can not be packed into multicall because Jarvis contract
15
+ // is callable either from Jarvis or EOA. If you try to call from Multicall,
16
+ // it will fail
11
17
  const [pricesFeedValues, poolFeePercentages] = await Promise.all([
12
- _getPricesFeedValues(dexHelper, poolConfigs, blockNumber, priceFeedContract),
13
- _getPoolFeePercentages(dexHelper, poolConfigs, blockNumber, poolInterface),
18
+ _getPricesFeedValues(dexHelper, poolConfigs, _blockNumber, priceFeedContract),
19
+ _getPoolFeePercentages(dexHelper, poolConfigs, _blockNumber, poolInterface),
14
20
  ]);
15
- return poolConfigs.map((_, index) => ({
16
- priceFeed: pricesFeedValues[index],
17
- pool: poolFeePercentages[index],
18
- }));
21
+ return {
22
+ blockNumber: _blockNumber,
23
+ state: poolConfigs.map((_, index) => ({
24
+ priceFeed: pricesFeedValues[index],
25
+ pool: poolFeePercentages[index],
26
+ })),
27
+ };
19
28
  }
20
29
  exports.getOnChainState = getOnChainState;
21
30
  async function _getPoolFeePercentages(dexHelper, poolConfigs, blockNumber, poolInterface) {
package/build/dex/jarvis-v6/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/dex/jarvis-v6/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/dex/jarvis-v6/utils.ts"],"names":[],"mappings":"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"}
package/build/dex/kyberdmm/kyberdmm.js CHANGED
@@ -163,7 +163,10 @@ class KyberDmm extends simple_exchange_1.SimpleExchange {
163
163
  pair.pools[poolAddress] = pool;
164
164
  pool.addressesSubscribed.push(poolAddress);
165
165
  await pool.initialize(blockNumber, {
166
- state: poolData,
166
+ stateWithBn: {
167
+ state: poolData,
168
+ blockNumber,
169
+ },
167
170
  });
168
171
  }
169
172
  }
package/build/dex/kyberdmm/kyberdmm.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"kyberdmm.js","sourceRoot":"","sources":["../../../src/dex/kyberdmm/kyberdmm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"kyberdmm.js","sourceRoot":"","sources":["../../../src/dex/kyberdmm/kyberdmm.ts"],"names":[],"mappings":"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"}
package/build/dex/kyberdmm/pool.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { DeepReadonly } from 'ts-essentials';
2
2
  import { KyberDmmAbiEvents, TradeInfo } from './types';
3
- import { StatefulEventSubscriber } from '../../stateful-event-subscriber';
3
+ import { StatefulEventSubscriber, StateWithBlock } from '../../stateful-event-subscriber';
4
4
  import { Address, BlockHeader, Log, Logger, Token } from '../../types';
5
5
  import { IDexHelper } from '../../dex-helper/idex-helper';
6
6
  export declare type KyberDmmPools = {
@@ -45,6 +45,6 @@ export declare class KyberDmmPool extends StatefulEventSubscriber<KyberDmmPoolSt
45
45
  constructor(parentName: string, dexHelper: IDexHelper, poolAddress: Address, token0: Token, token1: Token, ampBps: bigint, logger: Logger);
46
46
  protected processLog(state: DeepReadonly<KyberDmmPoolState>, log: Readonly<Log>, blockHeader: BlockHeader): Promise<DeepReadonly<KyberDmmPoolState> | null>;
47
47
  isAmpPool(): boolean;
48
- generateState(blockNumber?: number | 'latest'): Promise<DeepReadonly<KyberDmmPoolState>>;
48
+ generateState(blockNumber?: number | 'latest'): Promise<StateWithBlock<KyberDmmPoolState>>;
49
49
  }
50
50
  export declare const getTradeInfo: (state: KyberDmmPoolState, blockNumber: number, isTokenOrdered: boolean) => TradeInfo;
package/build/dex/kyberdmm/pool.js CHANGED
@@ -8,6 +8,7 @@ const abi_1 = require("@ethersproject/abi");
8
8
  const kyber_dmm_pool_abi_json_1 = __importDefault(require("../../abi/kyberdmm/kyber-dmm-pool.abi.json"));
9
9
  const fee_formula_1 = require("./fee-formula");
10
10
  const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
11
+ const utils_1 = require("../../utils");
11
12
  const iface = new abi_1.Interface(kyber_dmm_pool_abi_json_1.default);
12
13
  const coder = new abi_1.AbiCoder();
13
14
  class KyberDmmPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
@@ -57,14 +58,12 @@ class KyberDmmPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
57
58
  },
58
59
  };
59
60
  }
60
- return null;
61
61
  }
62
62
  isAmpPool() {
63
63
  return this.ampBps != BPS;
64
64
  }
65
65
  async generateState(blockNumber = 'latest') {
66
- const data = await this.dexHelper.multiContract.methods
67
- .aggregate([
66
+ const { results: data, blockNumber: _blockNumber } = await (0, utils_1.blockAndTryAggregate)(true, this.dexHelper.multiContract, [
68
67
  {
69
68
  target: this.poolAddress,
70
69
  callData: iface.encodeFunctionData('getTradeInfo', []),
@@ -73,15 +72,14 @@ class KyberDmmPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
73
72
  target: this.poolAddress,
74
73
  callData: iface.encodeFunctionData('getVolumeTrendData', []),
75
74
  },
76
- ])
77
- .call({}, blockNumber);
75
+ ], blockNumber);
78
76
  const [reserves0, reserves1, vReserves0, vReserves1] = coder
79
- .decode(['uint256', 'uint256', 'uint256', 'uint256'], data.returnData[0])
77
+ .decode(['uint256', 'uint256', 'uint256', 'uint256'], data[0].returnData)
80
78
  .map(a => BigInt(a.toString()));
81
79
  const [shortEMA, longEMA, , lastTradeBlock] = coder
82
- .decode(['uint256', 'uint256', 'uint128', 'uint256'], data.returnData[1])
80
+ .decode(['uint256', 'uint256', 'uint128', 'uint256'], data[1].returnData)
83
81
  .map(a => BigInt(a.toString()));
84
- if (blockNumber == 'latest')
82
+ if (blockNumber === 'latest')
85
83
  blockNumber = await this.dexHelper.web3Provider.eth.getBlockNumber();
86
84
  const prevBlockData = await this.dexHelper.multiContract.methods
87
85
  .aggregate([
@@ -95,19 +93,22 @@ class KyberDmmPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
95
93
  .decode(['uint256', 'uint256', 'uint128', 'uint256'], prevBlockData.returnData[0])
96
94
  .map(a => BigInt(a.toString()));
97
95
  return {
98
- trendData: {
99
- shortEMA,
100
- longEMA,
101
- lastBlockVolume,
102
- lastTradeBlock,
103
- },
104
- reserves: {
105
- reserves0,
106
- reserves1,
107
- vReserves0,
108
- vReserves1,
96
+ blockNumber,
97
+ state: {
98
+ trendData: {
99
+ shortEMA,
100
+ longEMA,
101
+ lastBlockVolume,
102
+ lastTradeBlock,
103
+ },
104
+ reserves: {
105
+ reserves0,
106
+ reserves1,
107
+ vReserves0,
108
+ vReserves1,
109
+ },
110
+ ampBps: this.ampBps,
109
111
  },
110
- ampBps: this.ampBps,
111
112
  };
112
113
  }
113
114
  }
package/build/dex/kyberdmm/pool.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/dex/kyberdmm/pool.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/dex/kyberdmm/pool.ts"],"names":[],"mappings":"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"}
package/build/dex/maker-psm/maker-psm.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { DeepReadonly } from 'ts-essentials';
2
2
  import { Token, Address, ExchangePrices, PoolPrices, Log, AdapterExchangeParam, SimpleExchangeParam, PoolLiquidity, Logger } from '../../types';
3
3
  import { SwapSide, Network } from '../../constants';
4
- import { StatefulEventSubscriber } from '../../stateful-event-subscriber';
4
+ import { StatefulEventSubscriber, StateWithBlock } from '../../stateful-event-subscriber';
5
5
  import { IDex } from '../../dex/idex';
6
6
  import { IDexHelper } from '../../dex-helper/idex-helper';
7
7
  import { MakerPsmData, PoolState, PoolConfig } from './types';
@@ -42,7 +42,7 @@ export declare class MakerPsmEventPool extends StatefulEventSubscriber<PoolState
42
42
  * should be generated
43
43
  * @returns state of the event subscriber at blocknumber
44
44
  */
45
- generateState(blockNumber: number): Promise<Readonly<PoolState>>;
45
+ generateState(blockNumber: number | 'latest'): Promise<StateWithBlock<PoolState>>;
46
46
  }
47
47
  export declare class MakerPsm extends SimpleExchange implements IDex<MakerPsmData> {
48
48
  protected network: Network;
@@ -72,7 +72,7 @@ export declare class MakerPsm extends SimpleExchange implements IDex<MakerPsmDat
72
72
  index: number;
73
73
  }[] | null;
74
74
  }, dai?: Token, vatAddress?: Address, poolConfigs?: PoolConfig[]);
75
- initializePricing(blockNumber: number): Promise<void>;
75
+ initializePricing(blockNumber?: number | 'latest'): Promise<void>;
76
76
  getAdapters(side: SwapSide): {
77
77
  name: string;
78
78
  index: number;