@wildcatfi/wildcat-sdk 3.0.77-beta → 3.1.2-beta

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 (443) hide show
  1. package/README.md +2 -2
  2. package/dist/access/access-control.d.ts +23 -36
  3. package/dist/access/access-control.d.ts.map +1 -1
  4. package/dist/access/access-control.js +104 -142
  5. package/dist/access/access-control.js.map +1 -1
  6. package/dist/access/fixed-term.d.ts +23 -36
  7. package/dist/access/fixed-term.d.ts.map +1 -1
  8. package/dist/access/fixed-term.js +115 -154
  9. package/dist/access/fixed-term.js.map +1 -1
  10. package/dist/access/index.d.ts +9 -15
  11. package/dist/access/index.d.ts.map +1 -1
  12. package/dist/access/index.js +21 -59
  13. package/dist/access/index.js.map +1 -1
  14. package/dist/access/periodic-term.d.ts +84 -0
  15. package/dist/access/periodic-term.d.ts.map +1 -0
  16. package/dist/access/periodic-term.js +298 -0
  17. package/dist/access/periodic-term.js.map +1 -0
  18. package/dist/access/utils.d.ts +1 -11
  19. package/dist/access/utils.d.ts.map +1 -1
  20. package/dist/access/utils.js +11 -87
  21. package/dist/access/utils.js.map +1 -1
  22. package/dist/access/validation.d.ts +8 -32
  23. package/dist/access/validation.d.ts.map +1 -1
  24. package/dist/access/validation.js +1 -18
  25. package/dist/access/validation.js.map +1 -1
  26. package/dist/account/index.d.ts +39 -35
  27. package/dist/account/index.d.ts.map +1 -1
  28. package/dist/account/index.js +301 -315
  29. package/dist/account/index.js.map +1 -1
  30. package/dist/account/validation.d.ts +19 -3
  31. package/dist/account/validation.d.ts.map +1 -1
  32. package/dist/account/validation.js +16 -2
  33. package/dist/account/validation.js.map +1 -1
  34. package/dist/collateral/collateral-events.d.ts +10 -9
  35. package/dist/collateral/collateral-events.d.ts.map +1 -1
  36. package/dist/collateral/collateral-events.js +4 -4
  37. package/dist/collateral/collateral-events.js.map +1 -1
  38. package/dist/collateral/index.d.ts +10 -7
  39. package/dist/collateral/index.d.ts.map +1 -1
  40. package/dist/collateral/index.js +37 -36
  41. package/dist/collateral/index.js.map +1 -1
  42. package/dist/constants.d.ts +14 -99
  43. package/dist/constants.d.ts.map +1 -1
  44. package/dist/constants.js +21 -278
  45. package/dist/constants.js.map +1 -1
  46. package/dist/controller.d.ts +17 -10
  47. package/dist/controller.d.ts.map +1 -1
  48. package/dist/controller.js +67 -67
  49. package/dist/controller.js.map +1 -1
  50. package/dist/gql/getActiveLendersByMarket.d.ts +4 -5
  51. package/dist/gql/getActiveLendersByMarket.d.ts.map +1 -1
  52. package/dist/gql/getActiveLendersByMarket.js +10 -11
  53. package/dist/gql/getActiveLendersByMarket.js.map +1 -1
  54. package/dist/gql/getAllHooksDataForBorrower.d.ts.map +1 -1
  55. package/dist/gql/getAllHooksDataForBorrower.js +8 -11
  56. package/dist/gql/getAllHooksDataForBorrower.js.map +1 -1
  57. package/dist/gql/getAllHooksTemplates.d.ts.map +1 -1
  58. package/dist/gql/getAllHooksTemplates.js +4 -6
  59. package/dist/gql/getAllHooksTemplates.js.map +1 -1
  60. package/dist/gql/getLenderAccountsForAllMarkets.d.ts +1 -8
  61. package/dist/gql/getLenderAccountsForAllMarkets.d.ts.map +1 -1
  62. package/dist/gql/getLenderAccountsForAllMarkets.js +11 -26
  63. package/dist/gql/getLenderAccountsForAllMarkets.js.map +1 -1
  64. package/dist/gql/getMarketRecords.d.ts +2 -2
  65. package/dist/gql/getMarketRecords.d.ts.map +1 -1
  66. package/dist/gql/getMarketRecords.js +6 -2
  67. package/dist/gql/getMarketRecords.js.map +1 -1
  68. package/dist/gql/getMarketsForBorrower.d.ts.map +1 -1
  69. package/dist/gql/getMarketsForBorrower.js +2 -32
  70. package/dist/gql/getMarketsForBorrower.js.map +1 -1
  71. package/dist/gql/getMarketsWithEvents.d.ts.map +1 -1
  72. package/dist/gql/getMarketsWithEvents.js +0 -28
  73. package/dist/gql/getMarketsWithEvents.js.map +1 -1
  74. package/dist/gql/graphql.d.ts +699 -1459
  75. package/dist/gql/graphql.d.ts.map +1 -1
  76. package/dist/gql/graphql.js +243 -545
  77. package/dist/gql/graphql.js.map +1 -1
  78. package/dist/gql/index.d.ts +0 -1
  79. package/dist/gql/index.d.ts.map +1 -1
  80. package/dist/gql/index.js +0 -1
  81. package/dist/gql/index.js.map +1 -1
  82. package/dist/index.d.ts +4 -5
  83. package/dist/index.d.ts.map +1 -1
  84. package/dist/index.js +17 -7
  85. package/dist/index.js.map +1 -1
  86. package/dist/market.d.ts +22 -85
  87. package/dist/market.d.ts.map +1 -1
  88. package/dist/market.js +284 -596
  89. package/dist/market.js.map +1 -1
  90. package/dist/mockerc20factory.d.ts +11 -4
  91. package/dist/mockerc20factory.d.ts.map +1 -1
  92. package/dist/mockerc20factory.js +15 -20
  93. package/dist/mockerc20factory.js.map +1 -1
  94. package/dist/token.d.ts +12 -67
  95. package/dist/token.d.ts.map +1 -1
  96. package/dist/token.js +57 -167
  97. package/dist/token.js.map +1 -1
  98. package/dist/typechain/AccountQuery.d.ts +56 -0
  99. package/dist/typechain/AccountQuery.d.ts.map +1 -0
  100. package/dist/typechain/AccountQuery.js +3 -0
  101. package/dist/typechain/AccountQuery.js.map +1 -0
  102. package/dist/typechain/AccountsQuery.d.ts +56 -0
  103. package/dist/typechain/AccountsQuery.d.ts.map +1 -0
  104. package/dist/typechain/AccountsQuery.js +3 -0
  105. package/dist/typechain/AccountsQuery.js.map +1 -0
  106. package/dist/typechain/CheckBorrowersRegistered.d.ts +29 -0
  107. package/dist/typechain/CheckBorrowersRegistered.d.ts.map +1 -0
  108. package/dist/typechain/CheckBorrowersRegistered.js +3 -0
  109. package/dist/typechain/CheckBorrowersRegistered.js.map +1 -0
  110. package/dist/typechain/CheckSafeSignature.d.ts +29 -0
  111. package/dist/typechain/CheckSafeSignature.d.ts.map +1 -0
  112. package/dist/typechain/CheckSafeSignature.js +3 -0
  113. package/dist/typechain/CheckSafeSignature.js.map +1 -0
  114. package/dist/typechain/CollateralLens.d.ts +220 -0
  115. package/dist/typechain/CollateralLens.d.ts.map +1 -0
  116. package/dist/typechain/CollateralLens.js +3 -0
  117. package/dist/typechain/CollateralLens.js.map +1 -0
  118. package/dist/typechain/DescribeSignature.d.ts +102 -0
  119. package/dist/typechain/DescribeSignature.d.ts.map +1 -0
  120. package/dist/typechain/DescribeSignature.js +3 -0
  121. package/dist/typechain/DescribeSignature.js.map +1 -0
  122. package/dist/typechain/HooksFactory.d.ts +591 -16
  123. package/dist/typechain/HooksFactory.d.ts.map +1 -1
  124. package/dist/typechain/IERC20.d.ts +232 -0
  125. package/dist/typechain/IERC20.d.ts.map +1 -0
  126. package/dist/{lens-types.js → typechain/IERC20.js} +1 -1
  127. package/dist/typechain/IERC20.js.map +1 -0
  128. package/dist/typechain/IFixedTermHooks.d.ts +1032 -0
  129. package/dist/typechain/IFixedTermHooks.d.ts.map +1 -0
  130. package/dist/typechain/IFixedTermHooks.js +3 -0
  131. package/dist/typechain/IFixedTermHooks.js.map +1 -0
  132. package/dist/typechain/IOpenTermHooks.d.ts +987 -0
  133. package/dist/typechain/IOpenTermHooks.d.ts.map +1 -0
  134. package/dist/typechain/IOpenTermHooks.js +3 -0
  135. package/dist/typechain/IOpenTermHooks.js.map +1 -0
  136. package/dist/typechain/IPeriodicTermHooks.d.ts +663 -0
  137. package/dist/typechain/IPeriodicTermHooks.d.ts.map +1 -0
  138. package/dist/typechain/IPeriodicTermHooks.js +3 -0
  139. package/dist/typechain/IPeriodicTermHooks.js.map +1 -0
  140. package/dist/typechain/ISafe.d.ts +124 -0
  141. package/dist/typechain/ISafe.d.ts.map +1 -0
  142. package/dist/typechain/ISafe.js +3 -0
  143. package/dist/typechain/ISafe.js.map +1 -0
  144. package/dist/typechain/MarketLens.d.ts +611 -0
  145. package/dist/typechain/MarketLens.d.ts.map +1 -0
  146. package/dist/typechain/MarketLens.js +3 -0
  147. package/dist/typechain/MarketLens.js.map +1 -0
  148. package/dist/typechain/MarketLensV2.d.ts +710 -0
  149. package/dist/typechain/MarketLensV2.d.ts.map +1 -0
  150. package/dist/typechain/MarketLensV2.js +3 -0
  151. package/dist/typechain/MarketLensV2.js.map +1 -0
  152. package/dist/typechain/MockArchControllerOwner.d.ts +130 -0
  153. package/dist/typechain/MockArchControllerOwner.d.ts.map +1 -0
  154. package/dist/typechain/MockArchControllerOwner.js +3 -0
  155. package/dist/typechain/MockArchControllerOwner.js.map +1 -0
  156. package/dist/typechain/MockERC20Factory.d.ts +122 -0
  157. package/dist/typechain/MockERC20Factory.d.ts.map +1 -0
  158. package/dist/typechain/MockERC20Factory.js +3 -0
  159. package/dist/typechain/MockERC20Factory.js.map +1 -0
  160. package/dist/typechain/SimpleMarketCollateral.d.ts +270 -0
  161. package/dist/typechain/SimpleMarketCollateral.d.ts.map +1 -0
  162. package/dist/typechain/SimpleMarketCollateral.js +3 -0
  163. package/dist/typechain/SimpleMarketCollateral.js.map +1 -0
  164. package/dist/typechain/Wildcat4626Wrapper.sol/IWildcatMarketToken.d.ts +176 -0
  165. package/dist/typechain/Wildcat4626Wrapper.sol/IWildcatMarketToken.d.ts.map +1 -0
  166. package/dist/typechain/Wildcat4626Wrapper.sol/IWildcatMarketToken.js +3 -0
  167. package/dist/typechain/Wildcat4626Wrapper.sol/IWildcatMarketToken.js.map +1 -0
  168. package/dist/typechain/Wildcat4626Wrapper.sol/IWildcatSanctionsSentinel.d.ts +44 -0
  169. package/dist/typechain/Wildcat4626Wrapper.sol/IWildcatSanctionsSentinel.d.ts.map +1 -0
  170. package/dist/typechain/Wildcat4626Wrapper.sol/IWildcatSanctionsSentinel.js +3 -0
  171. package/dist/typechain/Wildcat4626Wrapper.sol/IWildcatSanctionsSentinel.js.map +1 -0
  172. package/dist/typechain/Wildcat4626Wrapper.sol/Wildcat4626Wrapper.d.ts +501 -0
  173. package/dist/typechain/Wildcat4626Wrapper.sol/Wildcat4626Wrapper.d.ts.map +1 -0
  174. package/dist/typechain/Wildcat4626Wrapper.sol/Wildcat4626Wrapper.js +3 -0
  175. package/dist/typechain/Wildcat4626Wrapper.sol/Wildcat4626Wrapper.js.map +1 -0
  176. package/dist/typechain/Wildcat4626Wrapper.sol/index.d.ts +4 -0
  177. package/dist/typechain/Wildcat4626Wrapper.sol/index.d.ts.map +1 -0
  178. package/dist/typechain/Wildcat4626Wrapper.sol/index.js +3 -0
  179. package/dist/typechain/Wildcat4626Wrapper.sol/index.js.map +1 -0
  180. package/dist/typechain/Wildcat4626WrapperFactory.d.ts +83 -0
  181. package/dist/typechain/Wildcat4626WrapperFactory.d.ts.map +1 -0
  182. package/dist/typechain/Wildcat4626WrapperFactory.js +3 -0
  183. package/dist/typechain/Wildcat4626WrapperFactory.js.map +1 -0
  184. package/dist/typechain/WildcatArchController.d.ts +545 -0
  185. package/dist/typechain/WildcatArchController.d.ts.map +1 -0
  186. package/dist/typechain/WildcatArchController.js +3 -0
  187. package/dist/typechain/WildcatArchController.js.map +1 -0
  188. package/dist/typechain/WildcatCollateralFactory.d.ts +164 -0
  189. package/dist/typechain/WildcatCollateralFactory.d.ts.map +1 -0
  190. package/dist/typechain/WildcatCollateralFactory.js +3 -0
  191. package/dist/typechain/WildcatCollateralFactory.js.map +1 -0
  192. package/dist/typechain/WildcatMarket.d.ts +1062 -0
  193. package/dist/typechain/WildcatMarket.d.ts.map +1 -0
  194. package/dist/typechain/WildcatMarket.js +3 -0
  195. package/dist/typechain/WildcatMarket.js.map +1 -0
  196. package/dist/typechain/WildcatMarketController.d.ts +553 -0
  197. package/dist/typechain/WildcatMarketController.d.ts.map +1 -0
  198. package/dist/typechain/WildcatMarketController.js +3 -0
  199. package/dist/typechain/WildcatMarketController.js.map +1 -0
  200. package/dist/typechain/WildcatMarketControllerFactory.d.ts +344 -0
  201. package/dist/typechain/WildcatMarketControllerFactory.d.ts.map +1 -0
  202. package/dist/typechain/WildcatMarketControllerFactory.js +3 -0
  203. package/dist/typechain/WildcatMarketControllerFactory.js.map +1 -0
  204. package/dist/typechain/WildcatMarketV2.d.ts +1086 -0
  205. package/dist/typechain/WildcatMarketV2.d.ts.map +1 -0
  206. package/dist/typechain/WildcatMarketV2.js +3 -0
  207. package/dist/typechain/WildcatMarketV2.js.map +1 -0
  208. package/dist/typechain/common.d.ts +23 -0
  209. package/dist/typechain/common.d.ts.map +1 -0
  210. package/dist/typechain/common.js +3 -0
  211. package/dist/typechain/common.js.map +1 -0
  212. package/dist/typechain/factories/AccountQuery__factory.d.ts +63 -0
  213. package/dist/typechain/factories/AccountQuery__factory.d.ts.map +1 -0
  214. package/dist/typechain/factories/AccountQuery__factory.js +96 -0
  215. package/dist/typechain/factories/AccountQuery__factory.js.map +1 -0
  216. package/dist/typechain/factories/AccountsQuery__factory.d.ts +63 -0
  217. package/dist/typechain/factories/AccountsQuery__factory.d.ts.map +1 -0
  218. package/dist/typechain/factories/AccountsQuery__factory.js +96 -0
  219. package/dist/typechain/factories/AccountsQuery__factory.js.map +1 -0
  220. package/dist/typechain/factories/CheckBorrowersRegistered__factory.d.ts +36 -0
  221. package/dist/typechain/factories/CheckBorrowersRegistered__factory.d.ts.map +1 -0
  222. package/dist/typechain/factories/CheckBorrowersRegistered__factory.js +60 -0
  223. package/dist/typechain/factories/CheckBorrowersRegistered__factory.js.map +1 -0
  224. package/dist/typechain/factories/CheckSafeSignature__factory.d.ts +40 -0
  225. package/dist/typechain/factories/CheckSafeSignature__factory.d.ts.map +1 -0
  226. package/dist/typechain/factories/CheckSafeSignature__factory.js +65 -0
  227. package/dist/typechain/factories/CheckSafeSignature__factory.js.map +1 -0
  228. package/dist/typechain/factories/CollateralLens__factory.d.ts +854 -0
  229. package/dist/typechain/factories/CollateralLens__factory.d.ts.map +1 -0
  230. package/dist/typechain/factories/CollateralLens__factory.js +1101 -0
  231. package/dist/typechain/factories/CollateralLens__factory.js.map +1 -0
  232. package/dist/typechain/factories/DescribeSignature__factory.d.ts +145 -0
  233. package/dist/typechain/factories/DescribeSignature__factory.d.ts.map +1 -0
  234. package/dist/typechain/factories/DescribeSignature__factory.js +203 -0
  235. package/dist/typechain/factories/DescribeSignature__factory.js.map +1 -0
  236. package/dist/typechain/factories/HooksFactory__factory.d.ts +902 -0
  237. package/dist/typechain/factories/HooksFactory__factory.d.ts.map +1 -0
  238. package/dist/typechain/factories/HooksFactory__factory.js +1168 -0
  239. package/dist/typechain/factories/HooksFactory__factory.js.map +1 -0
  240. package/dist/typechain/factories/IERC20__factory.d.ts +235 -0
  241. package/dist/typechain/factories/IERC20__factory.d.ts.map +1 -0
  242. package/dist/typechain/factories/IERC20__factory.js +315 -0
  243. package/dist/typechain/factories/IERC20__factory.js.map +1 -0
  244. package/dist/typechain/factories/IFixedTermHooks__factory.d.ts +1894 -0
  245. package/dist/typechain/factories/IFixedTermHooks__factory.d.ts.map +1 -0
  246. package/dist/typechain/factories/IFixedTermHooks__factory.js +2423 -0
  247. package/dist/typechain/factories/IFixedTermHooks__factory.js.map +1 -0
  248. package/dist/typechain/factories/IOpenTermHooks__factory.d.ts +1791 -0
  249. package/dist/typechain/factories/IOpenTermHooks__factory.d.ts.map +1 -0
  250. package/dist/typechain/factories/IOpenTermHooks__factory.js +2293 -0
  251. package/dist/typechain/factories/IOpenTermHooks__factory.js.map +1 -0
  252. package/dist/typechain/factories/IPeriodicTermHooks__factory.d.ts +750 -0
  253. package/dist/typechain/factories/IPeriodicTermHooks__factory.d.ts.map +1 -0
  254. package/dist/typechain/factories/IPeriodicTermHooks__factory.js +975 -0
  255. package/dist/typechain/factories/IPeriodicTermHooks__factory.js.map +1 -0
  256. package/dist/typechain/factories/ISafe__factory.d.ts +163 -0
  257. package/dist/typechain/factories/ISafe__factory.d.ts.map +1 -0
  258. package/dist/typechain/factories/ISafe__factory.js +225 -0
  259. package/dist/typechain/factories/ISafe__factory.js.map +1 -0
  260. package/dist/typechain/factories/MarketLensV2__factory.d.ts +6708 -0
  261. package/dist/typechain/factories/MarketLensV2__factory.d.ts.map +1 -0
  262. package/dist/typechain/factories/MarketLensV2__factory.js +8574 -0
  263. package/dist/typechain/factories/MarketLensV2__factory.js.map +1 -0
  264. package/dist/typechain/factories/MarketLens__factory.d.ts +3572 -0
  265. package/dist/typechain/factories/MarketLens__factory.d.ts.map +1 -0
  266. package/dist/typechain/factories/MarketLens__factory.js +4569 -0
  267. package/dist/typechain/factories/MarketLens__factory.js.map +1 -0
  268. package/dist/typechain/factories/MockArchControllerOwner__factory.d.ts +85 -0
  269. package/dist/typechain/factories/MockArchControllerOwner__factory.d.ts.map +1 -0
  270. package/dist/typechain/factories/MockArchControllerOwner__factory.js +118 -0
  271. package/dist/typechain/factories/MockArchControllerOwner__factory.js.map +1 -0
  272. package/dist/typechain/factories/MockERC20Factory__factory.d.ts +114 -0
  273. package/dist/typechain/factories/MockERC20Factory__factory.d.ts.map +1 -0
  274. package/dist/typechain/factories/MockERC20Factory__factory.js +157 -0
  275. package/dist/typechain/factories/MockERC20Factory__factory.js.map +1 -0
  276. package/dist/typechain/factories/SimpleMarketCollateral__factory.d.ts +264 -0
  277. package/dist/typechain/factories/SimpleMarketCollateral__factory.d.ts.map +1 -0
  278. package/dist/typechain/factories/SimpleMarketCollateral__factory.js +354 -0
  279. package/dist/typechain/factories/SimpleMarketCollateral__factory.js.map +1 -0
  280. package/dist/typechain/factories/Wildcat4626Wrapper.sol/IWildcatMarketToken__factory.d.ts +193 -0
  281. package/dist/typechain/factories/Wildcat4626Wrapper.sol/IWildcatMarketToken__factory.d.ts.map +1 -0
  282. package/dist/typechain/factories/Wildcat4626Wrapper.sol/IWildcatMarketToken__factory.js +263 -0
  283. package/dist/typechain/factories/Wildcat4626Wrapper.sol/IWildcatMarketToken__factory.js.map +1 -0
  284. package/dist/typechain/factories/Wildcat4626Wrapper.sol/IWildcatSanctionsSentinel__factory.d.ts +27 -0
  285. package/dist/typechain/factories/Wildcat4626Wrapper.sol/IWildcatSanctionsSentinel__factory.d.ts.map +1 -0
  286. package/dist/typechain/factories/Wildcat4626Wrapper.sol/IWildcatSanctionsSentinel__factory.js +44 -0
  287. package/dist/typechain/factories/Wildcat4626Wrapper.sol/IWildcatSanctionsSentinel__factory.js.map +1 -0
  288. package/dist/typechain/factories/Wildcat4626Wrapper.sol/Wildcat4626Wrapper__factory.d.ts +718 -0
  289. package/dist/typechain/factories/Wildcat4626Wrapper.sol/Wildcat4626Wrapper__factory.d.ts.map +1 -0
  290. package/dist/typechain/factories/Wildcat4626Wrapper.sol/Wildcat4626Wrapper__factory.js +946 -0
  291. package/dist/typechain/factories/Wildcat4626Wrapper.sol/Wildcat4626Wrapper__factory.js.map +1 -0
  292. package/dist/typechain/factories/Wildcat4626Wrapper.sol/index.d.ts +4 -0
  293. package/dist/typechain/factories/Wildcat4626Wrapper.sol/index.d.ts.map +1 -0
  294. package/dist/typechain/factories/Wildcat4626Wrapper.sol/index.js +13 -0
  295. package/dist/typechain/factories/Wildcat4626Wrapper.sol/index.js.map +1 -0
  296. package/dist/typechain/factories/Wildcat4626WrapperFactory__factory.d.ts +82 -0
  297. package/dist/typechain/factories/Wildcat4626WrapperFactory__factory.d.ts.map +1 -0
  298. package/dist/typechain/factories/Wildcat4626WrapperFactory__factory.js +117 -0
  299. package/dist/typechain/factories/Wildcat4626WrapperFactory__factory.js.map +1 -0
  300. package/dist/typechain/factories/WildcatArchController__factory.d.ts +554 -0
  301. package/dist/typechain/factories/WildcatArchController__factory.d.ts.map +1 -0
  302. package/dist/typechain/factories/WildcatArchController__factory.js +728 -0
  303. package/dist/typechain/factories/WildcatArchController__factory.js.map +1 -0
  304. package/dist/typechain/factories/WildcatCollateralFactory__factory.d.ts +160 -0
  305. package/dist/typechain/factories/WildcatCollateralFactory__factory.d.ts.map +1 -0
  306. package/dist/typechain/factories/WildcatCollateralFactory__factory.js +223 -0
  307. package/dist/typechain/factories/WildcatCollateralFactory__factory.js.map +1 -0
  308. package/dist/typechain/factories/WildcatMarketControllerFactory__factory.d.ts +421 -0
  309. package/dist/typechain/factories/WildcatMarketControllerFactory__factory.d.ts.map +1 -0
  310. package/dist/typechain/factories/WildcatMarketControllerFactory__factory.js +549 -0
  311. package/dist/typechain/factories/WildcatMarketControllerFactory__factory.js.map +1 -0
  312. package/dist/typechain/factories/WildcatMarketController__factory.d.ts +671 -0
  313. package/dist/typechain/factories/WildcatMarketController__factory.d.ts.map +1 -0
  314. package/dist/typechain/factories/WildcatMarketController__factory.js +870 -0
  315. package/dist/typechain/factories/WildcatMarketController__factory.js.map +1 -0
  316. package/dist/typechain/factories/WildcatMarketV2__factory.d.ts +1304 -0
  317. package/dist/typechain/factories/WildcatMarketV2__factory.d.ts.map +1 -0
  318. package/dist/typechain/factories/WildcatMarketV2__factory.js +1680 -0
  319. package/dist/typechain/factories/WildcatMarketV2__factory.js.map +1 -0
  320. package/dist/typechain/factories/WildcatMarket__factory.d.ts +1326 -0
  321. package/dist/typechain/factories/WildcatMarket__factory.d.ts.map +1 -0
  322. package/dist/typechain/factories/WildcatMarket__factory.js +1712 -0
  323. package/dist/typechain/factories/WildcatMarket__factory.js.map +1 -0
  324. package/dist/typechain/factories/index.d.ts +26 -0
  325. package/dist/typechain/factories/index.d.ts.map +1 -0
  326. package/dist/typechain/factories/index.js +79 -0
  327. package/dist/typechain/factories/index.js.map +1 -0
  328. package/dist/typechain/index.d.ts +70 -84
  329. package/dist/typechain/index.d.ts.map +1 -1
  330. package/dist/typechain/index.js +79 -120
  331. package/dist/typechain/index.js.map +1 -1
  332. package/dist/types.d.ts +34 -75
  333. package/dist/types.d.ts.map +1 -1
  334. package/dist/types.js +16 -21
  335. package/dist/types.js.map +1 -1
  336. package/dist/utils/check-registered-borrowers.d.ts.map +1 -1
  337. package/dist/utils/check-registered-borrowers.js +6 -7
  338. package/dist/utils/check-registered-borrowers.js.map +1 -1
  339. package/dist/utils/describe-account.d.ts.map +1 -1
  340. package/dist/utils/describe-account.js +4 -33
  341. package/dist/utils/describe-account.js.map +1 -1
  342. package/dist/utils/describe-signature.d.ts.map +1 -1
  343. package/dist/utils/describe-signature.js +14 -66
  344. package/dist/utils/describe-signature.js.map +1 -1
  345. package/dist/utils/index.d.ts +0 -2
  346. package/dist/utils/index.d.ts.map +1 -1
  347. package/dist/utils/index.js +0 -2
  348. package/dist/utils/index.js.map +1 -1
  349. package/dist/utils/logger.d.ts.map +1 -1
  350. package/dist/utils/logger.js +1 -0
  351. package/dist/utils/logger.js.map +1 -1
  352. package/dist/utils/math.d.ts +13 -1
  353. package/dist/utils/math.d.ts.map +1 -1
  354. package/dist/utils/math.js +50 -14
  355. package/dist/utils/math.js.map +1 -1
  356. package/dist/utils/misc.d.ts +4 -5
  357. package/dist/utils/misc.d.ts.map +1 -1
  358. package/dist/utils/misc.js +6 -6
  359. package/dist/utils/misc.js.map +1 -1
  360. package/dist/utils/record-types.d.ts +10 -7
  361. package/dist/utils/record-types.d.ts.map +1 -1
  362. package/dist/utils/record-types.js +2 -2
  363. package/dist/utils/record-types.js.map +1 -1
  364. package/dist/utils/type-parsers.d.ts +3 -9
  365. package/dist/utils/type-parsers.d.ts.map +1 -1
  366. package/dist/utils/type-parsers.js +13 -12
  367. package/dist/utils/type-parsers.js.map +1 -1
  368. package/dist/withdrawal-batch.d.ts +9 -10
  369. package/dist/withdrawal-batch.d.ts.map +1 -1
  370. package/dist/withdrawal-batch.js +31 -30
  371. package/dist/withdrawal-batch.js.map +1 -1
  372. package/dist/withdrawal-status.d.ts +7 -10
  373. package/dist/withdrawal-status.d.ts.map +1 -1
  374. package/dist/withdrawal-status.js +13 -16
  375. package/dist/withdrawal-status.js.map +1 -1
  376. package/dist/wrapper/index.d.ts +25 -43
  377. package/dist/wrapper/index.d.ts.map +1 -1
  378. package/dist/wrapper/index.js +73 -161
  379. package/dist/wrapper/index.js.map +1 -1
  380. package/package.json +12 -20
  381. package/dist/abi/generated.d.ts +0 -34504
  382. package/dist/abi/generated.d.ts.map +0 -1
  383. package/dist/abi/generated.js +0 -44192
  384. package/dist/abi/generated.js.map +0 -1
  385. package/dist/abi/index.d.ts +0 -3
  386. package/dist/abi/index.d.ts.map +0 -1
  387. package/dist/abi/index.js +0 -19
  388. package/dist/abi/index.js.map +0 -1
  389. package/dist/abi/manual.d.ts +0 -354
  390. package/dist/abi/manual.d.ts.map +0 -1
  391. package/dist/abi/manual.js +0 -202
  392. package/dist/abi/manual.js.map +0 -1
  393. package/dist/access/revolving.d.ts +0 -8
  394. package/dist/access/revolving.d.ts.map +0 -1
  395. package/dist/access/revolving.js +0 -15
  396. package/dist/access/revolving.js.map +0 -1
  397. package/dist/access/subgraph-template.d.ts +0 -14
  398. package/dist/access/subgraph-template.d.ts.map +0 -1
  399. package/dist/access/subgraph-template.js +0 -20
  400. package/dist/access/subgraph-template.js.map +0 -1
  401. package/dist/client.d.ts +0 -22
  402. package/dist/client.d.ts.map +0 -1
  403. package/dist/client.js +0 -51
  404. package/dist/client.js.map +0 -1
  405. package/dist/gql/getMarketList.d.ts +0 -16
  406. package/dist/gql/getMarketList.d.ts.map +0 -1
  407. package/dist/gql/getMarketList.js +0 -23
  408. package/dist/gql/getMarketList.js.map +0 -1
  409. package/dist/internal/arch-controller.d.ts +0 -6
  410. package/dist/internal/arch-controller.d.ts.map +0 -1
  411. package/dist/internal/arch-controller.js +0 -36
  412. package/dist/internal/arch-controller.js.map +0 -1
  413. package/dist/internal/ethers-signer.d.ts +0 -4
  414. package/dist/internal/ethers-signer.d.ts.map +0 -1
  415. package/dist/internal/ethers-signer.js +0 -12
  416. package/dist/internal/ethers-signer.js.map +0 -1
  417. package/dist/internal/ethers-viem.d.ts +0 -4
  418. package/dist/internal/ethers-viem.d.ts.map +0 -1
  419. package/dist/internal/ethers-viem.js +0 -43
  420. package/dist/internal/ethers-viem.js.map +0 -1
  421. package/dist/internal/market-lens.d.ts +0 -28
  422. package/dist/internal/market-lens.d.ts.map +0 -1
  423. package/dist/internal/market-lens.js +0 -125
  424. package/dist/internal/market-lens.js.map +0 -1
  425. package/dist/internal/viem-read.d.ts +0 -3
  426. package/dist/internal/viem-read.d.ts.map +0 -1
  427. package/dist/internal/viem-read.js +0 -13
  428. package/dist/internal/viem-read.js.map +0 -1
  429. package/dist/internal/viem-write.d.ts +0 -10
  430. package/dist/internal/viem-write.d.ts.map +0 -1
  431. package/dist/internal/viem-write.js +0 -51
  432. package/dist/internal/viem-write.js.map +0 -1
  433. package/dist/lens-types.d.ts +0 -309
  434. package/dist/lens-types.d.ts.map +0 -1
  435. package/dist/lens-types.js.map +0 -1
  436. package/dist/utils/bigint.d.ts +0 -22
  437. package/dist/utils/bigint.d.ts.map +0 -1
  438. package/dist/utils/bigint.js +0 -111
  439. package/dist/utils/bigint.js.map +0 -1
  440. package/dist/utils/viem-encoding.d.ts +0 -15
  441. package/dist/utils/viem-encoding.d.ts.map +0 -1
  442. package/dist/utils/viem-encoding.js +0 -33
  443. package/dist/utils/viem-encoding.js.map +0 -1
@@ -1,22 +1,21 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.parseSubgraphLenderHooksAccess = exports.parseSubgraphLenderStatus = exports.decodeHooksConfig = exports.encodeHooksConfig = exports.parseMarketRecord = exports.removeUnusedTxFields = exports.parseWithdrawalRecord = exports.parseFeeConfigurationV2 = exports.parseFeeConfiguration = exports.parseMarketParameterConstraints = void 0;
4
- const viem_1 = require("viem");
4
+ const ethers_1 = require("ethers");
5
5
  const token_1 = require("../token");
6
- const bigint_1 = require("./bigint");
7
6
  const record_types_1 = require("./record-types");
8
7
  const assert_1 = require("./assert");
9
8
  const account_1 = require("../account");
10
- const parseMarketParameterConstraints = (constraints) => Object.fromEntries(Object.entries(constraints).map(([k, v]) => [k, (0, bigint_1.toNumber)(v)]));
9
+ const parseMarketParameterConstraints = (constraints) => Object.fromEntries(Object.entries(constraints).map(([k, v]) => [k, ethers_1.BigNumber.from(v).toNumber()]));
11
10
  exports.parseMarketParameterConstraints = parseMarketParameterConstraints;
12
11
  const parseFeeConfiguration = (chainId, provider, feeConfiguration) => {
13
- const originationFeeToken = feeConfiguration.originationFeeToken.token === viem_1.zeroAddress
12
+ const originationFeeToken = feeConfiguration.originationFeeToken.token === ethers_1.constants.AddressZero
14
13
  ? undefined
15
14
  : token_1.Token.fromTokenMetadata(chainId, feeConfiguration.originationFeeToken, provider);
16
15
  const originationFeeAmount = originationFeeToken && originationFeeToken.getAmount(feeConfiguration.originationFeeAmount);
17
16
  return {
18
17
  feeRecipient: feeConfiguration.feeRecipient,
19
- protocolFeeBips: (0, bigint_1.toNumber)(feeConfiguration.protocolFeeBips),
18
+ protocolFeeBips: feeConfiguration.protocolFeeBips,
20
19
  originationFeeToken,
21
20
  originationFeeAmount
22
21
  };
@@ -25,9 +24,9 @@ exports.parseFeeConfiguration = parseFeeConfiguration;
25
24
  const parseFeeConfigurationV2 = (chainId, provider, { originationFeeToken, originationFeeAmount, borrowerOriginationFeeBalance, borrowerOriginationFeeApproval, protocolFeeBips, feeRecipient }) => {
26
25
  const fees = {
27
26
  feeRecipient: feeRecipient,
28
- protocolFeeBips: (0, bigint_1.toNumber)(protocolFeeBips)
27
+ protocolFeeBips: protocolFeeBips
29
28
  };
30
- if (originationFeeToken.token === viem_1.zeroAddress)
29
+ if (originationFeeToken.token === ethers_1.constants.AddressZero)
31
30
  return fees;
32
31
  const token = token_1.Token.fromTokenMetadata(chainId, originationFeeToken, provider);
33
32
  return {
@@ -67,17 +66,18 @@ const getTypeName: ParseFn = function <K extends WithdrawalRecordKind>(
67
66
  const test = (batch, records) => {
68
67
  const x = records.map((r) => parseWithdrawalRecord(batch, r));
69
68
  };
70
- const removeUnusedTxFields = ({ to, data, value = 0n }) => {
69
+ const removeUnusedTxFields = ({ to, data, value = ethers_1.BigNumber.from(0) }) => {
71
70
  (0, assert_1.assert)(to !== undefined, "to is undefined");
72
71
  (0, assert_1.assert)(data !== undefined, "data is undefined");
73
72
  return {
74
73
  to,
75
74
  data,
76
- value: (0, token_1.toRawAmount)(value).toString()
75
+ value: value.toHexString()
77
76
  };
78
77
  };
79
78
  exports.removeUnusedTxFields = removeUnusedTxFields;
80
79
  const marketRecordParsers = {
80
+ AnnualInterestBipsReductionProposed: (_, log) => ({ ...log }),
81
81
  AnnualInterestBipsUpdated: (_, log) => log,
82
82
  Borrow: (token, { assetAmount, ...rest }) => ({
83
83
  amount: token.getAmount(assetAmount),
@@ -106,7 +106,7 @@ const marketRecordParsers = {
106
106
  }),
107
107
  FixedTermUpdated: (_, log) => ({ ...log }),
108
108
  ForceBuyBack: (token, { scaledAmount, normalizedAmount, ...rest }) => ({
109
- scaledAmount: (0, token_1.toRawAmount)(scaledAmount),
109
+ scaledAmount: ethers_1.BigNumber.from(scaledAmount),
110
110
  normalizedAmount: token.getAmount(normalizedAmount),
111
111
  ...rest
112
112
  }),
@@ -121,10 +121,11 @@ const marketRecordParsers = {
121
121
  newMinimumDeposit: token.getAmount(newMinimumDeposit),
122
122
  ...rest
123
123
  }),
124
+ PeriodicTermClosed: (_, log) => ({ ...log }),
124
125
  ProtocolFeeBipsUpdated: (_, log) => ({ ...log }),
125
126
  WithdrawalRequest: (token, { scaledAmount, normalizedAmount, account, ...rest }) => ({
126
127
  address: account.address,
127
- scaledAmount: (0, token_1.toRawAmount)(scaledAmount),
128
+ scaledAmount: ethers_1.BigNumber.from(scaledAmount),
128
129
  normalizedAmount: token.getAmount(normalizedAmount),
129
130
  ...rest
130
131
  })
@@ -145,7 +146,7 @@ const Bit_Enabled_NukeFromOrbit = 88n;
145
146
  const Bit_Enabled_SetMaxTotalSupply = 87n;
146
147
  const Bit_Enabled_SetAnnualInterestAndReserveRatioBips = 86n;
147
148
  const Bit_Enabled_SetProtocolFeeBips = 85n;
148
- function encodeHooksConfig({ hooksAddress = viem_1.zeroAddress, useOnDeposit = false, useOnQueueWithdrawal = false, useOnExecuteWithdrawal = false, useOnTransfer = false, useOnBorrow = false, useOnRepay = false, useOnCloseMarket = false, useOnNukeFromOrbit = false, useOnSetMaxTotalSupply = false, useOnSetAnnualInterestAndReserveRatioBips = false, useOnSetProtocolFeeBips = false }) {
149
+ function encodeHooksConfig({ hooksAddress = ethers_1.constants.AddressZero, useOnDeposit = false, useOnQueueWithdrawal = false, useOnExecuteWithdrawal = false, useOnTransfer = false, useOnBorrow = false, useOnRepay = false, useOnCloseMarket = false, useOnNukeFromOrbit = false, useOnSetMaxTotalSupply = false, useOnSetAnnualInterestAndReserveRatioBips = false, useOnSetProtocolFeeBips = false }) {
149
150
  let hooks = BigInt(hooksAddress) << 96n;
150
151
  hooks |= BigInt(useOnDeposit) << Bit_Enabled_Deposit;
151
152
  hooks |= BigInt(useOnQueueWithdrawal) << Bit_Enabled_QueueWithdrawal;
@@ -1 +1 @@
1
- {"version":3,"file":"type-parsers.js","sourceRoot":"","sources":["../../src/utils/type-parsers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"type-parsers.js","sourceRoot":"","sources":["../../src/utils/type-parsers.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
+ import { BigNumber } from "ethers";
1
2
  import { Market } from "./market";
2
3
  import { TokenAmount } from "./token";
3
- import type { WithdrawalBatchDataStructOutput, WithdrawalBatchDataV2_5StructOutput } from "./lens-types";
4
+ import { WithdrawalBatchDataStructOutput } from "./typechain";
4
5
  import { LenderWithdrawalStatus } from "./withdrawal-status";
5
6
  import { MakeOptional, SubgraphLenderWithdrawalPropertiesFragment, SubgraphWithdrawalBatchPaymentPropertiesFragment, SubgraphWithdrawalBatchPropertiesWithEventsFragment, SubgraphWithdrawalExecutionPropertiesFragment, SubgraphWithdrawalRequestPropertiesFragment } from "./gql/graphql";
6
7
  import { WithdrawalExecutionRecord, WithdrawalPaymentRecord, WithdrawalRequestRecord } from "./utils";
@@ -10,16 +11,15 @@ export declare enum BatchStatus {
10
11
  Unpaid = 2,
11
12
  Complete = 3
12
13
  }
13
- type WithdrawalBatchDataOutput = WithdrawalBatchDataStructOutput | WithdrawalBatchDataV2_5StructOutput;
14
14
  export declare class WithdrawalBatch {
15
15
  market: Market;
16
16
  expiry: number;
17
17
  status: BatchStatus;
18
- scaledTotalAmount: bigint;
19
- scaledAmountBurned: bigint;
18
+ scaledTotalAmount: BigNumber;
19
+ scaledAmountBurned: BigNumber;
20
20
  normalizedAmountPaid: TokenAmount;
21
21
  normalizedTotalAmount: TokenAmount;
22
- lastScaleFactor?: bigint | undefined;
22
+ lastScaleFactor?: BigNumber | undefined;
23
23
  paymentsCount?: number | undefined;
24
24
  lastUpdatedTimestamp?: number | undefined;
25
25
  totalInterestEarned?: TokenAmount | undefined;
@@ -28,7 +28,7 @@ export declare class WithdrawalBatch {
28
28
  payments: WithdrawalPaymentRecord[];
29
29
  executions: WithdrawalExecutionRecord[];
30
30
  requests: WithdrawalRequestRecord[];
31
- constructor(market: Market, expiry: number, status: BatchStatus, scaledTotalAmount: bigint, scaledAmountBurned: bigint, normalizedAmountPaid: TokenAmount, normalizedTotalAmount: TokenAmount, lastScaleFactor?: bigint | undefined, paymentsCount?: number | undefined, lastUpdatedTimestamp?: number | undefined, totalInterestEarned?: TokenAmount | undefined, isCompleted?: boolean | undefined, payments?: SubgraphWithdrawalBatchPaymentPropertiesFragment[], withdrawals?: SubgraphLenderWithdrawalPropertiesFragment[], executions?: SubgraphWithdrawalExecutionPropertiesFragment[], requests?: SubgraphWithdrawalRequestPropertiesFragment[]);
31
+ constructor(market: Market, expiry: number, status: BatchStatus, scaledTotalAmount: BigNumber, scaledAmountBurned: BigNumber, normalizedAmountPaid: TokenAmount, normalizedTotalAmount: TokenAmount, lastScaleFactor?: BigNumber | undefined, paymentsCount?: number | undefined, lastUpdatedTimestamp?: number | undefined, totalInterestEarned?: TokenAmount | undefined, isCompleted?: boolean | undefined, payments?: SubgraphWithdrawalBatchPaymentPropertiesFragment[], withdrawals?: SubgraphLenderWithdrawalPropertiesFragment[], executions?: SubgraphWithdrawalExecutionPropertiesFragment[], requests?: SubgraphWithdrawalRequestPropertiesFragment[]);
32
32
  private calculateBatchInterestEarned;
33
33
  processWithdrawalBatchInterestAccrued(): void;
34
34
  /**
@@ -44,12 +44,11 @@ export declare class WithdrawalBatch {
44
44
  get isConcluded(): boolean;
45
45
  get effectiveStatus(): BatchStatus;
46
46
  get normalizedAmountOwed(): TokenAmount;
47
- get scaledAmountOwed(): bigint;
47
+ get scaledAmountOwed(): BigNumber;
48
48
  get availableLiquidityToProcess(): TokenAmount;
49
- applyLensUpdate(data: WithdrawalBatchDataOutput): void;
50
- static fromWithdrawalBatchData(market: Market, data: WithdrawalBatchDataOutput): WithdrawalBatch;
49
+ applyLensUpdate(data: WithdrawalBatchDataStructOutput): void;
50
+ static fromWithdrawalBatchData(market: Market, data: WithdrawalBatchDataStructOutput): WithdrawalBatch;
51
51
  static fromSubgraphWithdrawalBatch(market: Market, batch: MakeOptional<SubgraphWithdrawalBatchPropertiesWithEventsFragment, "requests" | "executions" | "withdrawals">): WithdrawalBatch;
52
52
  static getWithdrawalBatch(market: Market, expiry: number): Promise<WithdrawalBatch>;
53
53
  }
54
- export {};
55
54
  //# sourceMappingURL=withdrawal-batch.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"withdrawal-batch.d.ts","sourceRoot":"","sources":["../src/withdrawal-batch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAA+B,MAAM,SAAS,CAAC;AACnE,OAAO,KAAK,EACV,+BAA+B,EAC/B,mCAAmC,EACpC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,0CAA0C,EAC1C,gDAAgD,EAChD,mDAAmD,EACnD,6CAA6C,EAC7C,2CAA2C,EAC5C,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,uBAAuB,EAIxB,MAAM,SAAS,CAAC;AAGjB,oBAAY,WAAW;IACrB,OAAO,IAAI;IACX,OAAO,IAAI;IACX,MAAM,IAAI;IACV,QAAQ,IAAI;CACb;AAED,KAAK,yBAAyB,GAC1B,+BAA+B,GAC/B,mCAAmC,CAAC;AAExC,qBAAa,eAAe;IAOjB,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,WAAW;IACnB,iBAAiB,EAAE,MAAM;IACzB,kBAAkB,EAAE,MAAM;IAC1B,oBAAoB,EAAE,WAAW;IACjC,qBAAqB,EAAE,WAAW;IAClC,eAAe,CAAC;IAChB,aAAa,CAAC;IACd,oBAAoB,CAAC;IACrB,mBAAmB,CAAC;IACpB,WAAW,CAAC;IAjBd,WAAW,EAAE,sBAAsB,EAAE,CAAM;IAC3C,QAAQ,EAAE,uBAAuB,EAAE,CAAM;IACzC,UAAU,EAAE,yBAAyB,EAAE,CAAM;IAC7C,QAAQ,EAAE,uBAAuB,EAAE,CAAM;gBAGvC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EACnB,iBAAiB,EAAE,MAAM,EACzB,kBAAkB,EAAE,MAAM,EAC1B,oBAAoB,EAAE,WAAW,EACjC,qBAAqB,EAAE,WAAW,EAClC,eAAe,CAAC,oBAAQ,EACxB,aAAa,CAAC,oBAAQ,EACtB,oBAAoB,CAAC,oBAAQ,EAC7B,mBAAmB,CAAC,yBAAa,EACjC,WAAW,CAAC,qBAAS,EAC5B,QAAQ,GAAE,gDAAgD,EAAO,EACjE,WAAW,GAAE,0CAA0C,EAAO,EAC9D,UAAU,GAAE,6CAA6C,EAAO,EAChE,QAAQ,GAAE,2CAA2C,EAAO;IAU9D,OAAO,CAAC,4BAA4B;IAWpC,qCAAqC,IAAI,IAAI;IAY7C;;;;OAIG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;OAEG;IACH,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,WAAW,IAAI,OAAO,CAGzB;IAMD,IAAI,eAAe,IAAI,WAAW,CAOjC;IAED,IAAI,oBAAoB,IAAI,WAAW,CAEtC;IAED,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED,IAAI,2BAA2B,IAAI,WAAW,CAsB7C;IAED,eAAe,CAAC,IAAI,EAAE,yBAAyB,GAAG,IAAI;IA8BtD,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB,GAAG,eAAe;IAYhG,MAAM,CAAC,2BAA2B,CAChC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,CACjB,mDAAmD,EACnD,UAAU,GAAG,YAAY,GAAG,aAAa,CAC1C,GACA,eAAe;WA6CL,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;CAQ1F"}
1
+ {"version":3,"file":"withdrawal-batch.d.ts","sourceRoot":"","sources":["../src/withdrawal-batch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAkB,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EACL,YAAY,EACZ,0CAA0C,EAC1C,gDAAgD,EAChD,mDAAmD,EACnD,6CAA6C,EAC7C,2CAA2C,EAC5C,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,uBAAuB,EAGxB,MAAM,SAAS,CAAC;AAGjB,oBAAY,WAAW;IACrB,OAAO,IAAI;IACX,OAAO,IAAI;IACX,MAAM,IAAI;IACV,QAAQ,IAAI;CACb;AAED,qBAAa,eAAe;IAOjB,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,WAAW;IACnB,iBAAiB,EAAE,SAAS;IAC5B,kBAAkB,EAAE,SAAS;IAC7B,oBAAoB,EAAE,WAAW;IACjC,qBAAqB,EAAE,WAAW;IAClC,eAAe,CAAC;IAChB,aAAa,CAAC;IACd,oBAAoB,CAAC;IACrB,mBAAmB,CAAC;IACpB,WAAW,CAAC;IAjBd,WAAW,EAAE,sBAAsB,EAAE,CAAM;IAC3C,QAAQ,EAAE,uBAAuB,EAAE,CAAM;IACzC,UAAU,EAAE,yBAAyB,EAAE,CAAM;IAC7C,QAAQ,EAAE,uBAAuB,EAAE,CAAM;gBAGvC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EACnB,iBAAiB,EAAE,SAAS,EAC5B,kBAAkB,EAAE,SAAS,EAC7B,oBAAoB,EAAE,WAAW,EACjC,qBAAqB,EAAE,WAAW,EAClC,eAAe,CAAC,uBAAW,EAC3B,aAAa,CAAC,oBAAQ,EACtB,oBAAoB,CAAC,oBAAQ,EAC7B,mBAAmB,CAAC,yBAAa,EACjC,WAAW,CAAC,qBAAS,EAC5B,QAAQ,GAAE,gDAAgD,EAAO,EACjE,WAAW,GAAE,0CAA0C,EAAO,EAC9D,UAAU,GAAE,6CAA6C,EAAO,EAChE,QAAQ,GAAE,2CAA2C,EAAO;IAU9D,OAAO,CAAC,4BAA4B;IAWpC,qCAAqC,IAAI,IAAI;IAY7C;;;;OAIG;IACH,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;OAEG;IACH,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,WAAW,IAAI,OAAO,CAGzB;IAMD,IAAI,eAAe,IAAI,WAAW,CAOjC;IAED,IAAI,oBAAoB,IAAI,WAAW,CAEtC;IAED,IAAI,gBAAgB,IAAI,SAAS,CAEhC;IAED,IAAI,2BAA2B,IAAI,WAAW,CAwB7C;IAED,eAAe,CAAC,IAAI,EAAE,+BAA+B,GAAG,IAAI;IA8B5D,MAAM,CAAC,uBAAuB,CAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,+BAA+B,GACpC,eAAe;IAYlB,MAAM,CAAC,2BAA2B,CAChC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,CACjB,mDAAmD,EACnD,UAAU,GAAG,YAAY,GAAG,aAAa,CAC1C,GACA,eAAe;WA6CL,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;CAS1F"}
@@ -1,9 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.WithdrawalBatch = exports.BatchStatus = void 0;
4
+ const ethers_1 = require("ethers");
4
5
  const token_1 = require("./token");
5
6
  const constants_1 = require("./constants");
6
- const market_lens_1 = require("./internal/market-lens");
7
7
  const withdrawal_status_1 = require("./withdrawal-status");
8
8
  const utils_1 = require("./utils");
9
9
  const types_1 = require("./types");
@@ -39,19 +39,19 @@ class WithdrawalBatch {
39
39
  }
40
40
  calculateBatchInterestEarned() {
41
41
  if (!this.lastScaleFactor)
42
- return 0n;
43
- const scaledAmountOwed = this.scaledTotalAmount - this.scaledAmountBurned;
44
- if (scaledAmountOwed === 0n || this.lastScaleFactor === this.market.scaleFactor) {
45
- return 0n;
42
+ return ethers_1.BigNumber.from(0);
43
+ const scaledAmountOwed = this.scaledTotalAmount.sub(this.scaledAmountBurned);
44
+ if (scaledAmountOwed.eq(0) || this.lastScaleFactor?.eq(this.market.scaleFactor)) {
45
+ return ethers_1.BigNumber.from(0);
46
46
  }
47
- const lastBalance = (0, utils_1.rayMulBigint)(scaledAmountOwed, this.lastScaleFactor);
48
- const currentBalance = (0, utils_1.rayMulBigint)(scaledAmountOwed, this.market.scaleFactor);
49
- return currentBalance - lastBalance;
47
+ const lastBalance = (0, utils_1.rayMul)(scaledAmountOwed, this.lastScaleFactor);
48
+ const currentBalance = (0, utils_1.rayMul)(scaledAmountOwed, this.market.scaleFactor);
49
+ return currentBalance.sub(lastBalance);
50
50
  }
51
51
  processWithdrawalBatchInterestAccrued() {
52
52
  if (!this.lastScaleFactor || !this.totalInterestEarned)
53
53
  return;
54
- if (this.lastScaleFactor !== this.market.scaleFactor) {
54
+ if (!this.lastScaleFactor.eq(this.market.scaleFactor)) {
55
55
  const interestEarned = this.calculateBatchInterestEarned();
56
56
  this.lastScaleFactor = this.market.scaleFactor;
57
57
  this.totalInterestEarned = this.totalInterestEarned.add(interestEarned);
@@ -87,7 +87,7 @@ class WithdrawalBatch {
87
87
  if (!this.isConcluded) {
88
88
  return BatchStatus.Pending;
89
89
  }
90
- return this.scaledAmountBurned === this.scaledTotalAmount
90
+ return this.scaledAmountBurned.eq(this.scaledTotalAmount)
91
91
  ? BatchStatus.Complete
92
92
  : BatchStatus.Unpaid;
93
93
  }
@@ -95,13 +95,13 @@ class WithdrawalBatch {
95
95
  return this.normalizedTotalAmount.sub(this.normalizedAmountPaid);
96
96
  }
97
97
  get scaledAmountOwed() {
98
- return this.scaledTotalAmount - this.scaledAmountBurned;
98
+ return this.scaledTotalAmount.sub(this.scaledAmountBurned);
99
99
  }
100
100
  get availableLiquidityToProcess() {
101
101
  if (this.isClosed)
102
102
  return this.market.underlyingToken.getAmount(0);
103
103
  if (this.expiry === this.market.pendingWithdrawalExpiry) {
104
- const priorScaledAmountPending = this.market.scaledPendingWithdrawals - this.scaledAmountOwed;
104
+ const priorScaledAmountPending = this.market.scaledPendingWithdrawals.sub(this.scaledAmountOwed);
105
105
  const unavailableAssets = this.market.normalizedUnclaimedWithdrawals
106
106
  .add(this.market.normalizeAmount(priorScaledAmountPending))
107
107
  .add(this.market.lastAccruedProtocolFees);
@@ -116,19 +116,19 @@ class WithdrawalBatch {
116
116
  }
117
117
  }
118
118
  applyLensUpdate(data) {
119
- this.scaledTotalAmount = (0, token_1.toRawAmount)(data.scaledTotalAmount);
120
- this.scaledAmountBurned = (0, token_1.toRawAmount)(data.scaledAmountBurned);
119
+ this.scaledTotalAmount = data.scaledTotalAmount;
120
+ this.scaledAmountBurned = data.scaledAmountBurned;
121
121
  this.normalizedAmountPaid = this.market.underlyingToken.getAmount(data.normalizedAmountPaid);
122
122
  this.normalizedTotalAmount = this.market.underlyingToken.getAmount(data.normalizedTotalAmount);
123
123
  this.status =
124
124
  this.expiry > Math.floor(Date.now() / 1000)
125
125
  ? BatchStatus.Pending
126
- : this.scaledAmountBurned === this.scaledTotalAmount
126
+ : this.scaledAmountBurned.eq(this.scaledTotalAmount)
127
127
  ? BatchStatus.Complete
128
128
  : BatchStatus.Unpaid;
129
129
  if (this.status === BatchStatus.Complete) {
130
- const scaledTotalFromRecords = this.withdrawals.reduce((total, w) => total + w.scaledAmount, 0n);
131
- if (scaledTotalFromRecords === this.scaledTotalAmount &&
130
+ const scaledTotalFromRecords = this.withdrawals.reduce((total, w) => total.add(w.scaledAmount), ethers_1.BigNumber.from(0));
131
+ if (scaledTotalFromRecords.eq(this.scaledTotalAmount) &&
132
132
  this.withdrawals.every((w) => w.isCompleted)) {
133
133
  this.isCompleted = true;
134
134
  }
@@ -139,38 +139,39 @@ class WithdrawalBatch {
139
139
  /* Builders / Getters */
140
140
  /* -------------------------------------------------------------------------- */
141
141
  static fromWithdrawalBatchData(market, data) {
142
- return new WithdrawalBatch(market, (0, utils_1.toNumber)(data.expiry), (0, utils_1.toNumber)(data.status), (0, token_1.toRawAmount)(data.scaledTotalAmount), (0, token_1.toRawAmount)(data.scaledAmountBurned), market.underlyingToken.getAmount(data.normalizedAmountPaid), market.underlyingToken.getAmount(data.normalizedTotalAmount));
142
+ return new WithdrawalBatch(market, data.expiry, data.status, data.scaledTotalAmount, data.scaledAmountBurned, market.underlyingToken.getAmount(data.normalizedAmountPaid), market.underlyingToken.getAmount(data.normalizedTotalAmount));
143
143
  }
144
144
  static fromSubgraphWithdrawalBatch(market, batch) {
145
- const scaledTotalAmount = (0, token_1.toRawAmount)(batch.scaledTotalAmount);
146
- const scaledAmountBurned = (0, token_1.toRawAmount)(batch.scaledAmountBurned);
145
+ const scaledTotalAmount = ethers_1.BigNumber.from(batch.scaledTotalAmount);
146
+ const scaledAmountBurned = ethers_1.BigNumber.from(batch.scaledAmountBurned);
147
147
  const normalizedAmountPaid = market.underlyingToken.getAmount(batch.normalizedAmountPaid);
148
148
  const expiry = +batch.expiry;
149
149
  const status = expiry > Math.floor(Date.now() / 1000)
150
150
  ? BatchStatus.Pending
151
- : scaledAmountBurned === scaledTotalAmount
151
+ : scaledAmountBurned.eq(scaledTotalAmount)
152
152
  ? BatchStatus.Complete
153
153
  : BatchStatus.Unpaid;
154
154
  let scaledAmountOwed;
155
155
  let normalizedAmountOwed;
156
156
  let normalizedTotalAmount;
157
- if (scaledAmountBurned !== scaledTotalAmount) {
158
- scaledAmountOwed = scaledTotalAmount - scaledAmountBurned;
159
- normalizedAmountOwed = market.underlyingToken.getAmount((0, utils_1.rayMulBigint)(scaledAmountOwed, market.scaleFactor));
157
+ if (!scaledAmountBurned.eq(scaledTotalAmount)) {
158
+ scaledAmountOwed = scaledTotalAmount.sub(scaledAmountBurned);
159
+ normalizedAmountOwed = market.underlyingToken.getAmount((0, utils_1.rayMul)(scaledAmountOwed, market.scaleFactor));
160
160
  normalizedTotalAmount = normalizedAmountPaid.add(normalizedAmountOwed);
161
161
  }
162
162
  else {
163
- scaledAmountOwed = 0n;
163
+ scaledAmountOwed = ethers_1.BigNumber.from(0);
164
164
  normalizedAmountOwed = market.underlyingToken.getAmount(0);
165
165
  normalizedTotalAmount = normalizedAmountPaid;
166
166
  }
167
- return new WithdrawalBatch(market, expiry, status, scaledTotalAmount, scaledAmountBurned, normalizedAmountPaid, normalizedTotalAmount, (0, token_1.toRawAmount)(batch.lastScaleFactor), batch.paymentsCount, batch.lastUpdatedTimestamp, market.underlyingToken.getAmount(batch.totalInterestEarned), batch.isCompleted, batch.payments || undefined, batch.withdrawals || undefined, batch.executions || undefined, batch.requests || undefined);
167
+ return new WithdrawalBatch(market, expiry, status, scaledTotalAmount, scaledAmountBurned, normalizedAmountPaid, normalizedTotalAmount, ethers_1.BigNumber.from(batch.lastScaleFactor), batch.paymentsCount, batch.lastUpdatedTimestamp, market.underlyingToken.getAmount(batch.totalInterestEarned), batch.isCompleted, batch.payments || undefined, batch.withdrawals || undefined, batch.executions || undefined, batch.requests || undefined);
168
168
  }
169
169
  static async getWithdrawalBatch(market, expiry) {
170
- const useLatestLens = market.version === types_1.MarketVersion.V2 || !(0, constants_1.hasDeploymentAddress)(market.chainId, "MarketLens");
171
- const data = useLatestLens
172
- ? await (0, market_lens_1.getLatestWithdrawalBatchData)(market.chainId, market.provider, market.address, expiry)
173
- : await (0, market_lens_1.getLegacyWithdrawalBatchData)(market.chainId, market.provider, market.address, expiry);
170
+ const useLensV2 = market.version === types_1.MarketVersion.V2 || !(0, constants_1.hasDeploymentAddress)(market.chainId, "MarketLens");
171
+ const lens = useLensV2
172
+ ? (0, constants_1.getLensV2Contract)(market.chainId, market.provider)
173
+ : (0, constants_1.getLensContract)(market.chainId, market.provider);
174
+ const data = await lens.getWithdrawalBatchData(market.address, expiry);
174
175
  return WithdrawalBatch.fromWithdrawalBatchData(market, data);
175
176
  }
176
177
  }
@@ -1 +1 @@
1
- {"version":3,"file":"withdrawal-batch.js","sourceRoot":"","sources":["../src/withdrawal-batch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"withdrawal-batch.js","sourceRoot":"","sources":["../src/withdrawal-batch.ts"],"names":[],"mappings":"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"}
@@ -1,26 +1,24 @@
1
+ import { BigNumber, ContractTransaction } from "ethers";
1
2
  import { Market } from "./market";
2
3
  import { TokenAmount } from "./token";
3
- import { WithdrawalBatchLenderStatusStructOutput, WithdrawalBatchDataWithLenderStatusStructOutput, WithdrawalBatchLenderStatusV2_5StructOutput, WithdrawalBatchDataWithLenderStatusV2_5StructOutput } from "./lens-types";
4
+ import { WithdrawalBatchLenderStatusStructOutput, WithdrawalBatchDataWithLenderStatusStructOutput } from "./typechain";
4
5
  import { SupportedChainId } from "./constants";
5
6
  import { WithdrawalExecutionRecord, WithdrawalRequestRecord } from "./utils";
6
7
  import { WithdrawalBatch, BatchStatus } from "./withdrawal-batch";
7
- import { TransactionHash } from "./types";
8
8
  import { SubgraphLenderWithdrawalPropertiesFragment, SubgraphWithdrawalExecution, SubgraphWithdrawalExecutionPropertiesFragment, SubgraphWithdrawalRequest, SubgraphWithdrawalRequestPropertiesFragment } from "./gql/graphql";
9
- type WithdrawalBatchLenderStatusOutput = WithdrawalBatchLenderStatusStructOutput | WithdrawalBatchLenderStatusV2_5StructOutput;
10
- type WithdrawalBatchDataWithLenderStatusOutput = WithdrawalBatchDataWithLenderStatusStructOutput | WithdrawalBatchDataWithLenderStatusV2_5StructOutput;
11
9
  export declare class LenderWithdrawalStatus {
12
10
  batch: WithdrawalBatch;
13
11
  lender: string;
14
- scaledAmount: bigint;
12
+ scaledAmount: BigNumber;
15
13
  normalizedAmountWithdrawn: TokenAmount;
16
14
  normalizedAmountOwed: TokenAmount;
17
15
  isCompleted: boolean;
18
16
  executions: WithdrawalExecutionRecord[];
19
17
  requests: WithdrawalRequestRecord[];
20
- constructor(batch: WithdrawalBatch, lender: string, scaledAmount: bigint, normalizedAmountWithdrawn: TokenAmount, normalizedAmountOwed: TokenAmount, isCompleted: boolean, requests?: SubgraphWithdrawalRequestPropertiesFragment[], executions?: SubgraphWithdrawalExecutionPropertiesFragment[]);
18
+ constructor(batch: WithdrawalBatch, lender: string, scaledAmount: BigNumber, normalizedAmountWithdrawn: TokenAmount, normalizedAmountOwed: TokenAmount, isCompleted: boolean, requests?: SubgraphWithdrawalRequestPropertiesFragment[], executions?: SubgraphWithdrawalExecutionPropertiesFragment[]);
21
19
  get availableWithdrawalAmount(): TokenAmount;
22
20
  get chainId(): SupportedChainId;
23
- execute(): Promise<TransactionHash>;
21
+ execute(): Promise<ContractTransaction>;
24
22
  get expiry(): number;
25
23
  get market(): Market;
26
24
  get status(): BatchStatus;
@@ -34,8 +32,7 @@ export declare class LenderWithdrawalStatus {
34
32
  executions?: SubgraphWithdrawalExecution[];
35
33
  }, address?: string): LenderWithdrawalStatus;
36
34
  static getWithdrawalForLender(market: Market, expiry: number, lender: string): Promise<LenderWithdrawalStatus>;
37
- static fromWithdrawalBatchLenderStatus(market: Market, batch: WithdrawalBatch, data: WithdrawalBatchLenderStatusOutput): LenderWithdrawalStatus;
38
- static fromWithdrawalBatchDataWithLenderStatus(market: Market, data: WithdrawalBatchDataWithLenderStatusOutput): LenderWithdrawalStatus;
35
+ static fromWithdrawalBatchLenderStatus(market: Market, batch: WithdrawalBatch, data: WithdrawalBatchLenderStatusStructOutput): LenderWithdrawalStatus;
36
+ static fromWithdrawalBatchDataWithLenderStatus(market: Market, data: WithdrawalBatchDataWithLenderStatusStructOutput): LenderWithdrawalStatus;
39
37
  }
40
- export {};
41
38
  //# sourceMappingURL=withdrawal-status.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"withdrawal-status.d.ts","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AACnD,OAAO,EACL,uCAAuC,EACvC,+CAA+C,EAC/C,2CAA2C,EAC3C,mDAAmD,EACpD,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAwB,MAAM,aAAa,CAAC;AAKrE,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EAGxB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAiB,eAAe,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EACL,0CAA0C,EAC1C,2BAA2B,EAC3B,6CAA6C,EAC7C,yBAAyB,EACzB,2CAA2C,EAC5C,MAAM,eAAe,CAAC;AAEvB,KAAK,iCAAiC,GAClC,uCAAuC,GACvC,2CAA2C,CAAC;AAEhD,KAAK,yCAAyC,GAC1C,+CAA+C,GAC/C,mDAAmD,CAAC;AAExD,qBAAa,sBAAsB;IAIxB,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,MAAM;IACd,YAAY,EAAE,MAAM;IACpB,yBAAyB,EAAE,WAAW;IACtC,oBAAoB,EAAE,WAAW;IACjC,WAAW,EAAE,OAAO;IARtB,UAAU,EAAE,yBAAyB,EAAE,CAAM;IAC7C,QAAQ,EAAE,uBAAuB,EAAE,CAAM;gBAEvC,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,yBAAyB,EAAE,WAAW,EACtC,oBAAoB,EAAE,WAAW,EACjC,WAAW,EAAE,OAAO,EAC3B,QAAQ,GAAE,2CAA2C,EAAO,EAC5D,UAAU,GAAE,6CAA6C,EAAO;IAMlE,IAAI,yBAAyB,IAAI,WAAW,CAI3C;IAED,IAAI,OAAO,IAAI,gBAAgB,CAE9B;IAEK,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAKzC,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,eAAe,IAAI,WAAW,CAEjC;IAED,IAAI,qBAAqB,IAAI,WAAW,CAEvC;IAED,UAAU,CAAC,IAAI,EAAE,uCAAuC,GAAG,IAAI;IAiB/D,IAAI,sBAAsB,IAAI,WAAW,CAExC;IAED,MAAM,CAAC,kCAAkC,CACvC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,0CAA0C,GAAG;QACnD,QAAQ,CAAC,EAAE,yBAAyB,EAAE,CAAC;QACvC,UAAU,CAAC,EAAE,2BAA2B,EAAE,CAAC;KAC5C,EACD,OAAO,CAAC,EAAE,MAAM,GACf,sBAAsB;WAqBZ,sBAAsB,CACjC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,sBAAsB,CAAC;IA0BlC,MAAM,CAAC,+BAA+B,CACpC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,iCAAiC,GACtC,sBAAsB;IAkBzB,MAAM,CAAC,uCAAuC,CAC5C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,yCAAyC,GAC9C,sBAAsB;CAO1B"}
1
+ {"version":3,"file":"withdrawal-status.d.ts","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EACL,uCAAuC,EACvC,+CAA+C,EAChD,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,gBAAgB,EAIjB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EAIxB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,EACL,0CAA0C,EAC1C,2BAA2B,EAC3B,6CAA6C,EAC7C,yBAAyB,EACzB,2CAA2C,EAC5C,MAAM,eAAe,CAAC;AAEvB,qBAAa,sBAAsB;IAIxB,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,MAAM;IACd,YAAY,EAAE,SAAS;IACvB,yBAAyB,EAAE,WAAW;IACtC,oBAAoB,EAAE,WAAW;IACjC,WAAW,EAAE,OAAO;IARtB,UAAU,EAAE,yBAAyB,EAAE,CAAM;IAC7C,QAAQ,EAAE,uBAAuB,EAAE,CAAM;gBAEvC,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,yBAAyB,EAAE,WAAW,EACtC,oBAAoB,EAAE,WAAW,EACjC,WAAW,EAAE,OAAO,EAC3B,QAAQ,GAAE,2CAA2C,EAAO,EAC5D,UAAU,GAAE,6CAA6C,EAAO;IAMlE,IAAI,yBAAyB,IAAI,WAAW,CAI3C;IAED,IAAI,OAAO,IAAI,gBAAgB,CAE9B;IAEK,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK7C,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,eAAe,IAAI,WAAW,CAEjC;IAED,IAAI,qBAAqB,IAAI,WAAW,CAEvC;IAED,UAAU,CAAC,IAAI,EAAE,uCAAuC,GAAG,IAAI;IAiB/D,IAAI,sBAAsB,IAAI,WAAW,CAExC;IAED,MAAM,CAAC,kCAAkC,CACvC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,0CAA0C,GAAG;QACnD,QAAQ,CAAC,EAAE,yBAAyB,EAAE,CAAC;QACvC,UAAU,CAAC,EAAE,2BAA2B,EAAE,CAAC;KAC5C,EACD,OAAO,CAAC,EAAE,MAAM,GACf,sBAAsB;WAuBZ,sBAAsB,CACjC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,sBAAsB,CAAC;IAmBlC,MAAM,CAAC,+BAA+B,CACpC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,uCAAuC,GAC5C,sBAAsB;IAiBzB,MAAM,CAAC,uCAAuC,CAC5C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,+CAA+C,GACpD,sBAAsB;CAO1B"}
@@ -1,9 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.LenderWithdrawalStatus = void 0;
4
- const token_1 = require("./token");
4
+ const ethers_1 = require("ethers");
5
5
  const constants_1 = require("./constants");
6
- const market_lens_1 = require("./internal/market-lens");
7
6
  const utils_1 = require("./utils");
8
7
  const withdrawal_batch_1 = require("./withdrawal-batch");
9
8
  const types_1 = require("./types");
@@ -30,7 +29,7 @@ class LenderWithdrawalStatus {
30
29
  }
31
30
  async execute() {
32
31
  (0, utils_1.assert)(this.availableWithdrawalAmount.gt(0), "No funds available to withdraw");
33
- return this.market.executeWithdrawal(this);
32
+ return this.market.contract.executeWithdrawal(this.lender, this.expiry);
34
33
  }
35
34
  get expiry() {
36
35
  return this.batch.expiry;
@@ -51,7 +50,7 @@ class LenderWithdrawalStatus {
51
50
  return this.normalizedAmountOwed.add(this.normalizedAmountWithdrawn);
52
51
  }
53
52
  updateWith(data) {
54
- this.scaledAmount = (0, token_1.toRawAmount)(data.scaledAmount);
53
+ this.scaledAmount = data.scaledAmount;
55
54
  this.normalizedAmountWithdrawn = this.market.underlyingToken.getAmount(data.normalizedAmountWithdrawn);
56
55
  this.normalizedAmountOwed = this.market.underlyingToken.getAmount(data.normalizedAmountOwed);
57
56
  // recompute isCompleted based on updated values after a wd that
@@ -60,36 +59,34 @@ class LenderWithdrawalStatus {
60
59
  this.batch.status === withdrawal_batch_1.BatchStatus.Complete &&
61
60
  this.batch.expiry < Math.floor(Date.now() / 1000) &&
62
61
  this.batch.normalizedAmountPaid
63
- .mulDiv(this.scaledAmount, this.batch.scaledTotalAmount)
62
+ .mulDiv(data.scaledAmount, this.batch.scaledTotalAmount)
64
63
  .eq(data.normalizedAmountWithdrawn);
65
64
  }
66
65
  get normalizedUnpaidAmount() {
67
66
  return this.batch.normalizedAmountOwed.mulDiv(this.scaledAmount, this.batch.scaledTotalAmount);
68
67
  }
69
68
  static fromSubgraphLenderWithdrawalStatus(market, batch, status, address) {
70
- const scaledAmount = (0, token_1.toRawAmount)(status.scaledAmount);
69
+ const scaledAmount = ethers_1.BigNumber.from(status.scaledAmount);
71
70
  const normalizedAmountWithdrawn = market.underlyingToken.getAmount(status.normalizedAmountWithdrawn);
72
- const normalizedAmountOwed = batch.normalizedTotalAmount
73
- .mulDiv(scaledAmount, batch.scaledTotalAmount)
74
- .sub(normalizedAmountWithdrawn);
71
+ const normalizedAmountOwed = market.underlyingToken.getAmount((0, utils_1.mulDiv)(batch.normalizedTotalAmount.raw, scaledAmount, batch.scaledTotalAmount).sub(normalizedAmountWithdrawn.raw));
75
72
  return new LenderWithdrawalStatus(batch, address ?? status.account.address, scaledAmount, normalizedAmountWithdrawn, normalizedAmountOwed, status.isCompleted, status.requests || undefined, status.executions || undefined);
76
73
  }
77
74
  static async getWithdrawalForLender(market, expiry, lender) {
78
- const useLatestLens = market.version === types_1.MarketVersion.V2 || !(0, constants_1.hasDeploymentAddress)(market.chainId, "MarketLens");
79
- const batchData = useLatestLens
80
- ? await (0, market_lens_1.getLatestWithdrawalBatchDataWithLenderStatus)(market.chainId, market.provider, market.address, expiry, lender)
81
- : await (0, market_lens_1.getLegacyWithdrawalBatchDataWithLenderStatus)(market.chainId, market.provider, market.address, expiry, lender);
75
+ const useLensV2 = market.version === types_1.MarketVersion.V2 || !(0, constants_1.hasDeploymentAddress)(market.chainId, "MarketLens");
76
+ const lens = useLensV2
77
+ ? (0, constants_1.getLensV2Contract)(market.chainId, market.provider)
78
+ : (0, constants_1.getLensContract)(market.chainId, market.provider);
79
+ const batchData = await lens.getWithdrawalBatchDataWithLenderStatus(market.address, expiry, lender);
82
80
  const batch = withdrawal_batch_1.WithdrawalBatch.fromWithdrawalBatchData(market, batchData.batch);
83
81
  return LenderWithdrawalStatus.fromWithdrawalBatchLenderStatus(market, batch, batchData.lenderStatus);
84
82
  }
85
83
  static fromWithdrawalBatchLenderStatus(market, batch, data) {
86
- const scaledAmount = (0, token_1.toRawAmount)(data.scaledAmount);
87
84
  const isCompleted = batch.status === withdrawal_batch_1.BatchStatus.Complete &&
88
85
  batch.expiry < Math.floor(Date.now() / 1000) &&
89
86
  batch.normalizedAmountPaid
90
- .mulDiv(scaledAmount, batch.scaledTotalAmount)
87
+ .mulDiv(data.scaledAmount, batch.scaledTotalAmount)
91
88
  .eq(data.normalizedAmountWithdrawn);
92
- return new LenderWithdrawalStatus(batch, data.lender, scaledAmount, market.underlyingToken.getAmount(data.normalizedAmountWithdrawn), market.underlyingToken.getAmount(data.normalizedAmountOwed), isCompleted);
89
+ return new LenderWithdrawalStatus(batch, data.lender, data.scaledAmount, market.underlyingToken.getAmount(data.normalizedAmountWithdrawn), market.underlyingToken.getAmount(data.normalizedAmountOwed), isCompleted);
93
90
  }
94
91
  static fromWithdrawalBatchDataWithLenderStatus(market, data) {
95
92
  return LenderWithdrawalStatus.fromWithdrawalBatchLenderStatus(market, withdrawal_batch_1.WithdrawalBatch.fromWithdrawalBatchData(market, data.batch), data.lenderStatus);
@@ -1 +1 @@
1
- {"version":3,"file":"withdrawal-status.js","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"withdrawal-status.js","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":";;;AAAA,mCAAwD;AAOxD,2CAKqB;AACrB,mCAMiB;AACjB,yDAAkE;AAClE,mCAAwC;AASxC,MAAa,sBAAsB;IAGjC,YACS,KAAsB,EACtB,MAAc,EACd,YAAuB,EACvB,yBAAsC,EACtC,oBAAiC,EACjC,WAAoB,EAC3B,WAA0D,EAAE,EAC5D,aAA8D,EAAE;QAPzD,UAAK,GAAL,KAAK,CAAiB;QACtB,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAW;QACvB,8BAAyB,GAAzB,yBAAyB,CAAa;QACtC,yBAAoB,GAApB,oBAAoB,CAAa;QACjC,gBAAW,GAAX,WAAW,CAAS;QARtB,eAAU,GAAgC,EAAE,CAAC;QAC7C,aAAQ,GAA8B,EAAE,CAAC;QAW9C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,6BAAqB,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9E,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,6BAAqB,EAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,yBAAyB;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,oBAAoB;aACnC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC;aACvD,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAA,cAAM,EAAC,IAAI,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gCAAgC,CAAC,CAAC;QAC/E,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC;IAChC,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC;IACpC,CAAC;IAED,IAAI,qBAAqB;QACvB,OAAO,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACvE,CAAC;IAED,UAAU,CAAC,IAA6C;QACtD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,CACpE,IAAI,CAAC,yBAAyB,CAC/B,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAE7F,gEAAgE;QAChE,oCAAoC;QACpC,IAAI,CAAC,WAAW;YACd,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,8BAAW,CAAC,QAAQ;gBAC1C,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;gBACjD,IAAI,CAAC,KAAK,CAAC,oBAAoB;qBAC5B,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC;qBACvD,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,sBAAsB;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACjG,CAAC;IAED,MAAM,CAAC,kCAAkC,CACvC,MAAc,EACd,KAAsB,EACtB,MAGC,EACD,OAAgB;QAEhB,MAAM,YAAY,GAAG,kBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACzD,MAAM,yBAAyB,GAAG,MAAM,CAAC,eAAe,CAAC,SAAS,CAChE,MAAM,CAAC,yBAAyB,CACjC,CAAC;QACF,MAAM,oBAAoB,GAAG,MAAM,CAAC,eAAe,CAAC,SAAS,CAC3D,IAAA,cAAM,EAAC,KAAK,CAAC,qBAAqB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAChF,yBAAyB,CAAC,GAAG,CAC9B,CACF,CAAC;QAEF,OAAO,IAAI,sBAAsB,CAC/B,KAAK,EACL,OAAO,IAAI,MAAM,CAAC,OAAQ,CAAC,OAAO,EAClC,YAAY,EACZ,yBAAyB,EACzB,oBAAoB,EACpB,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,QAAQ,IAAI,SAAS,EAC5B,MAAM,CAAC,UAAU,IAAI,SAAS,CAC/B,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,sBAAsB,CACjC,MAAc,EACd,MAAc,EACd,MAAc;QAEd,MAAM,SAAS,GACb,MAAM,CAAC,OAAO,KAAK,qBAAa,CAAC,EAAE,IAAI,CAAC,IAAA,gCAAoB,EAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAC7F,MAAM,IAAI,GAAG,SAAS;YACpB,CAAC,CAAC,IAAA,6BAAiB,EAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC;YACpD,CAAC,CAAC,IAAA,2BAAe,EAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,sCAAsC,CACjE,MAAM,CAAC,OAAO,EACd,MAAM,EACN,MAAM,CACP,CAAC;QACF,MAAM,KAAK,GAAG,kCAAe,CAAC,uBAAuB,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/E,OAAO,sBAAsB,CAAC,+BAA+B,CAC3D,MAAM,EACN,KAAK,EACL,SAAS,CAAC,YAAY,CACvB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,+BAA+B,CACpC,MAAc,EACd,KAAsB,EACtB,IAA6C;QAE7C,MAAM,WAAW,GACf,KAAK,CAAC,MAAM,KAAK,8BAAW,CAAC,QAAQ;YACrC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YAC5C,KAAK,CAAC,oBAAoB;iBACvB,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,iBAAiB,CAAC;iBAClD,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACxC,OAAO,IAAI,sBAAsB,CAC/B,KAAK,EACL,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,YAAY,EACjB,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,yBAAyB,CAAC,EAChE,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAC3D,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,uCAAuC,CAC5C,MAAc,EACd,IAAqD;QAErD,OAAO,sBAAsB,CAAC,+BAA+B,CAC3D,MAAM,EACN,kCAAe,CAAC,uBAAuB,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,EAC3D,IAAI,CAAC,YAAY,CAClB,CAAC;IACJ,CAAC;CACF;AAlKD,wDAkKC"}