@haven-fi/solauto-sdk 1.0.193 → 1.0.194

Sign up to get free protection for your applications and to get access to all the features.
Files changed (332) hide show
  1. package/dist/clients/solautoClient.d.ts +2 -1
  2. package/dist/clients/solautoClient.d.ts.map +1 -1
  3. package/dist/clients/solautoMarginfiClient.d.ts +2 -1
  4. package/dist/clients/solautoMarginfiClient.d.ts.map +1 -1
  5. package/dist/clients/solautoMarginfiClient.js +12 -6
  6. package/dist/generated/types/lendingPlatform.d.ts +1 -2
  7. package/dist/generated/types/lendingPlatform.d.ts.map +1 -1
  8. package/dist/generated/types/lendingPlatform.js +0 -1
  9. package/dist/jupiter-sdk/index.d.ts +0 -4
  10. package/dist/jupiter-sdk/index.d.ts.map +1 -1
  11. package/dist/jupiter-sdk/index.js +0 -4
  12. package/dist/transactions/transactionUtils.d.ts.map +1 -1
  13. package/dist/transactions/transactionUtils.js +6 -6
  14. package/dist/types/accounts.d.ts +1 -0
  15. package/dist/types/accounts.d.ts.map +1 -1
  16. package/dist/utils/marginfiUtils.d.ts.map +1 -1
  17. package/dist/utils/marginfiUtils.js +4 -0
  18. package/dist/utils/solauto/generalUtils.d.ts.map +1 -1
  19. package/dist/utils/solauto/generalUtils.js +0 -1
  20. package/package.json +1 -1
  21. package/src/clients/solautoClient.ts +2 -0
  22. package/src/clients/solautoMarginfiClient.ts +17 -7
  23. package/src/generated/types/lendingPlatform.ts +0 -1
  24. package/src/jupiter-sdk/index.ts +0 -4
  25. package/src/transactions/transactionUtils.ts +6 -2
  26. package/src/types/accounts.ts +1 -0
  27. package/src/utils/marginfiUtils.ts +6 -1
  28. package/src/utils/solauto/generalUtils.ts +0 -1
  29. package/dist/jupiter-sdk/accounts/index.d.ts +0 -9
  30. package/dist/jupiter-sdk/accounts/index.d.ts.map +0 -1
  31. package/dist/jupiter-sdk/accounts/index.js +0 -24
  32. package/dist/jupiter-sdk/accounts/tokenLedger.d.ts +0 -32
  33. package/dist/jupiter-sdk/accounts/tokenLedger.d.ts.map +0 -1
  34. package/dist/jupiter-sdk/accounts/tokenLedger.js +0 -68
  35. package/dist/jupiter-sdk/instructions/aldrinSwap.d.ts +0 -29
  36. package/dist/jupiter-sdk/instructions/aldrinSwap.d.ts.map +0 -1
  37. package/dist/jupiter-sdk/instructions/aldrinSwap.js +0 -95
  38. package/dist/jupiter-sdk/instructions/aldrinV2Swap.d.ts +0 -30
  39. package/dist/jupiter-sdk/instructions/aldrinV2Swap.d.ts.map +0 -1
  40. package/dist/jupiter-sdk/instructions/aldrinV2Swap.js +0 -100
  41. package/dist/jupiter-sdk/instructions/balansolSwap.d.ts +0 -34
  42. package/dist/jupiter-sdk/instructions/balansolSwap.d.ts.map +0 -1
  43. package/dist/jupiter-sdk/instructions/balansolSwap.js +0 -130
  44. package/dist/jupiter-sdk/instructions/claim.d.ts +0 -25
  45. package/dist/jupiter-sdk/instructions/claim.d.ts.map +0 -1
  46. package/dist/jupiter-sdk/instructions/claim.js +0 -64
  47. package/dist/jupiter-sdk/instructions/claimToken.d.ts +0 -31
  48. package/dist/jupiter-sdk/instructions/claimToken.d.ts.map +0 -1
  49. package/dist/jupiter-sdk/instructions/claimToken.js +0 -93
  50. package/dist/jupiter-sdk/instructions/cloneSwap.d.ts +0 -34
  51. package/dist/jupiter-sdk/instructions/cloneSwap.d.ts.map +0 -1
  52. package/dist/jupiter-sdk/instructions/cloneSwap.js +0 -120
  53. package/dist/jupiter-sdk/instructions/createOpenOrders.d.ts +0 -24
  54. package/dist/jupiter-sdk/instructions/createOpenOrders.d.ts.map +0 -1
  55. package/dist/jupiter-sdk/instructions/createOpenOrders.js +0 -76
  56. package/dist/jupiter-sdk/instructions/createProgramOpenOrders.d.ts +0 -29
  57. package/dist/jupiter-sdk/instructions/createProgramOpenOrders.d.ts.map +0 -1
  58. package/dist/jupiter-sdk/instructions/createProgramOpenOrders.js +0 -86
  59. package/dist/jupiter-sdk/instructions/createTokenAccount.d.ts +0 -27
  60. package/dist/jupiter-sdk/instructions/createTokenAccount.d.ts.map +0 -1
  61. package/dist/jupiter-sdk/instructions/createTokenAccount.js +0 -70
  62. package/dist/jupiter-sdk/instructions/createTokenLedger.d.ts +0 -21
  63. package/dist/jupiter-sdk/instructions/createTokenLedger.d.ts.map +0 -1
  64. package/dist/jupiter-sdk/instructions/createTokenLedger.js +0 -62
  65. package/dist/jupiter-sdk/instructions/cremaSwap.d.ts +0 -33
  66. package/dist/jupiter-sdk/instructions/cremaSwap.d.ts.map +0 -1
  67. package/dist/jupiter-sdk/instructions/cremaSwap.js +0 -119
  68. package/dist/jupiter-sdk/instructions/cropperSwap.d.ts +0 -30
  69. package/dist/jupiter-sdk/instructions/cropperSwap.d.ts.map +0 -1
  70. package/dist/jupiter-sdk/instructions/cropperSwap.js +0 -103
  71. package/dist/jupiter-sdk/instructions/cykuraSwap.d.ts +0 -29
  72. package/dist/jupiter-sdk/instructions/cykuraSwap.d.ts.map +0 -1
  73. package/dist/jupiter-sdk/instructions/cykuraSwap.js +0 -99
  74. package/dist/jupiter-sdk/instructions/deltafiSwap.d.ts +0 -31
  75. package/dist/jupiter-sdk/instructions/deltafiSwap.d.ts.map +0 -1
  76. package/dist/jupiter-sdk/instructions/deltafiSwap.js +0 -109
  77. package/dist/jupiter-sdk/instructions/dradexSwap.d.ts +0 -35
  78. package/dist/jupiter-sdk/instructions/dradexSwap.d.ts.map +0 -1
  79. package/dist/jupiter-sdk/instructions/dradexSwap.js +0 -121
  80. package/dist/jupiter-sdk/instructions/exactOutRoute.d.ts +0 -42
  81. package/dist/jupiter-sdk/instructions/exactOutRoute.d.ts.map +0 -1
  82. package/dist/jupiter-sdk/instructions/exactOutRoute.js +0 -109
  83. package/dist/jupiter-sdk/instructions/goosefxSwap.d.ts +0 -33
  84. package/dist/jupiter-sdk/instructions/goosefxSwap.d.ts.map +0 -1
  85. package/dist/jupiter-sdk/instructions/goosefxSwap.js +0 -115
  86. package/dist/jupiter-sdk/instructions/goosefxV2Swap.d.ts +0 -38
  87. package/dist/jupiter-sdk/instructions/goosefxV2Swap.d.ts.map +0 -1
  88. package/dist/jupiter-sdk/instructions/goosefxV2Swap.js +0 -140
  89. package/dist/jupiter-sdk/instructions/heliumTreasuryManagementRedeemV0.d.ts +0 -29
  90. package/dist/jupiter-sdk/instructions/heliumTreasuryManagementRedeemV0.d.ts.map +0 -1
  91. package/dist/jupiter-sdk/instructions/heliumTreasuryManagementRedeemV0.js +0 -91
  92. package/dist/jupiter-sdk/instructions/index.d.ts +0 -72
  93. package/dist/jupiter-sdk/instructions/index.d.ts.map +0 -1
  94. package/dist/jupiter-sdk/instructions/index.js +0 -87
  95. package/dist/jupiter-sdk/instructions/invariantSwap.d.ts +0 -29
  96. package/dist/jupiter-sdk/instructions/invariantSwap.d.ts.map +0 -1
  97. package/dist/jupiter-sdk/instructions/invariantSwap.js +0 -95
  98. package/dist/jupiter-sdk/instructions/lifinitySwap.d.ts +0 -32
  99. package/dist/jupiter-sdk/instructions/lifinitySwap.d.ts.map +0 -1
  100. package/dist/jupiter-sdk/instructions/lifinitySwap.js +0 -113
  101. package/dist/jupiter-sdk/instructions/lifinityV2Swap.d.ts +0 -32
  102. package/dist/jupiter-sdk/instructions/lifinityV2Swap.d.ts.map +0 -1
  103. package/dist/jupiter-sdk/instructions/lifinityV2Swap.js +0 -113
  104. package/dist/jupiter-sdk/instructions/marcoPoloSwap.d.ts +0 -36
  105. package/dist/jupiter-sdk/instructions/marcoPoloSwap.d.ts.map +0 -1
  106. package/dist/jupiter-sdk/instructions/marcoPoloSwap.js +0 -137
  107. package/dist/jupiter-sdk/instructions/marinadeDeposit.d.ts +0 -36
  108. package/dist/jupiter-sdk/instructions/marinadeDeposit.d.ts.map +0 -1
  109. package/dist/jupiter-sdk/instructions/marinadeDeposit.js +0 -144
  110. package/dist/jupiter-sdk/instructions/marinadeUnstake.d.ts +0 -30
  111. package/dist/jupiter-sdk/instructions/marinadeUnstake.d.ts.map +0 -1
  112. package/dist/jupiter-sdk/instructions/marinadeUnstake.js +0 -105
  113. package/dist/jupiter-sdk/instructions/mercurialSwap.d.ts +0 -25
  114. package/dist/jupiter-sdk/instructions/mercurialSwap.d.ts.map +0 -1
  115. package/dist/jupiter-sdk/instructions/mercurialSwap.js +0 -76
  116. package/dist/jupiter-sdk/instructions/meteoraDlmmSwap.d.ts +0 -34
  117. package/dist/jupiter-sdk/instructions/meteoraDlmmSwap.d.ts.map +0 -1
  118. package/dist/jupiter-sdk/instructions/meteoraDlmmSwap.js +0 -119
  119. package/dist/jupiter-sdk/instructions/meteoraSwap.d.ts +0 -34
  120. package/dist/jupiter-sdk/instructions/meteoraSwap.d.ts.map +0 -1
  121. package/dist/jupiter-sdk/instructions/meteoraSwap.js +0 -120
  122. package/dist/jupiter-sdk/instructions/moonshotWrappedBuy.d.ts +0 -33
  123. package/dist/jupiter-sdk/instructions/moonshotWrappedBuy.d.ts.map +0 -1
  124. package/dist/jupiter-sdk/instructions/moonshotWrappedBuy.js +0 -119
  125. package/dist/jupiter-sdk/instructions/moonshotWrappedSell.d.ts +0 -31
  126. package/dist/jupiter-sdk/instructions/moonshotWrappedSell.d.ts.map +0 -1
  127. package/dist/jupiter-sdk/instructions/moonshotWrappedSell.js +0 -106
  128. package/dist/jupiter-sdk/instructions/obricSwap.d.ts +0 -31
  129. package/dist/jupiter-sdk/instructions/obricSwap.d.ts.map +0 -1
  130. package/dist/jupiter-sdk/instructions/obricSwap.js +0 -106
  131. package/dist/jupiter-sdk/instructions/oneIntroSwap.d.ts +0 -30
  132. package/dist/jupiter-sdk/instructions/oneIntroSwap.d.ts.map +0 -1
  133. package/dist/jupiter-sdk/instructions/oneIntroSwap.js +0 -100
  134. package/dist/jupiter-sdk/instructions/openBookV2Swap.d.ts +0 -35
  135. package/dist/jupiter-sdk/instructions/openBookV2Swap.d.ts.map +0 -1
  136. package/dist/jupiter-sdk/instructions/openBookV2Swap.js +0 -125
  137. package/dist/jupiter-sdk/instructions/perpsAddLiquidity.d.ts +0 -32
  138. package/dist/jupiter-sdk/instructions/perpsAddLiquidity.d.ts.map +0 -1
  139. package/dist/jupiter-sdk/instructions/perpsAddLiquidity.js +0 -110
  140. package/dist/jupiter-sdk/instructions/perpsRemoveLiquidity.d.ts +0 -32
  141. package/dist/jupiter-sdk/instructions/perpsRemoveLiquidity.d.ts.map +0 -1
  142. package/dist/jupiter-sdk/instructions/perpsRemoveLiquidity.js +0 -110
  143. package/dist/jupiter-sdk/instructions/perpsSwap.d.ts +0 -34
  144. package/dist/jupiter-sdk/instructions/perpsSwap.d.ts.map +0 -1
  145. package/dist/jupiter-sdk/instructions/perpsSwap.js +0 -120
  146. package/dist/jupiter-sdk/instructions/perpsV2AddLiquidity.d.ts +0 -33
  147. package/dist/jupiter-sdk/instructions/perpsV2AddLiquidity.d.ts.map +0 -1
  148. package/dist/jupiter-sdk/instructions/perpsV2AddLiquidity.js +0 -115
  149. package/dist/jupiter-sdk/instructions/perpsV2RemoveLiquidity.d.ts +0 -33
  150. package/dist/jupiter-sdk/instructions/perpsV2RemoveLiquidity.d.ts.map +0 -1
  151. package/dist/jupiter-sdk/instructions/perpsV2RemoveLiquidity.js +0 -112
  152. package/dist/jupiter-sdk/instructions/perpsV2Swap.d.ts +0 -36
  153. package/dist/jupiter-sdk/instructions/perpsV2Swap.d.ts.map +0 -1
  154. package/dist/jupiter-sdk/instructions/perpsV2Swap.js +0 -130
  155. package/dist/jupiter-sdk/instructions/phoenixSwap.d.ts +0 -27
  156. package/dist/jupiter-sdk/instructions/phoenixSwap.d.ts.map +0 -1
  157. package/dist/jupiter-sdk/instructions/phoenixSwap.js +0 -89
  158. package/dist/jupiter-sdk/instructions/pumpdotfunWrappedBuy.d.ts +0 -34
  159. package/dist/jupiter-sdk/instructions/pumpdotfunWrappedBuy.d.ts.map +0 -1
  160. package/dist/jupiter-sdk/instructions/pumpdotfunWrappedBuy.js +0 -123
  161. package/dist/jupiter-sdk/instructions/pumpdotfunWrappedSell.d.ts +0 -32
  162. package/dist/jupiter-sdk/instructions/pumpdotfunWrappedSell.d.ts.map +0 -1
  163. package/dist/jupiter-sdk/instructions/pumpdotfunWrappedSell.js +0 -107
  164. package/dist/jupiter-sdk/instructions/raydiumClmmSwap.d.ts +0 -29
  165. package/dist/jupiter-sdk/instructions/raydiumClmmSwap.d.ts.map +0 -1
  166. package/dist/jupiter-sdk/instructions/raydiumClmmSwap.js +0 -102
  167. package/dist/jupiter-sdk/instructions/raydiumClmmSwapV2.d.ts +0 -32
  168. package/dist/jupiter-sdk/instructions/raydiumClmmSwapV2.d.ts.map +0 -1
  169. package/dist/jupiter-sdk/instructions/raydiumClmmSwapV2.js +0 -117
  170. package/dist/jupiter-sdk/instructions/raydiumCpSwap.d.ts +0 -32
  171. package/dist/jupiter-sdk/instructions/raydiumCpSwap.d.ts.map +0 -1
  172. package/dist/jupiter-sdk/instructions/raydiumCpSwap.js +0 -116
  173. package/dist/jupiter-sdk/instructions/raydiumSwap.d.ts +0 -36
  174. package/dist/jupiter-sdk/instructions/raydiumSwap.d.ts.map +0 -1
  175. package/dist/jupiter-sdk/instructions/raydiumSwap.js +0 -134
  176. package/dist/jupiter-sdk/instructions/route.d.ts +0 -40
  177. package/dist/jupiter-sdk/instructions/route.d.ts.map +0 -1
  178. package/dist/jupiter-sdk/instructions/route.js +0 -99
  179. package/dist/jupiter-sdk/instructions/routeWithTokenLedger.d.ts +0 -39
  180. package/dist/jupiter-sdk/instructions/routeWithTokenLedger.d.ts.map +0 -1
  181. package/dist/jupiter-sdk/instructions/routeWithTokenLedger.js +0 -103
  182. package/dist/jupiter-sdk/instructions/saberAddDecimals.d.ts +0 -26
  183. package/dist/jupiter-sdk/instructions/saberAddDecimals.d.ts.map +0 -1
  184. package/dist/jupiter-sdk/instructions/saberAddDecimals.js +0 -81
  185. package/dist/jupiter-sdk/instructions/saberSwap.d.ts +0 -28
  186. package/dist/jupiter-sdk/instructions/saberSwap.d.ts.map +0 -1
  187. package/dist/jupiter-sdk/instructions/saberSwap.js +0 -87
  188. package/dist/jupiter-sdk/instructions/senchaSwap.d.ts +0 -28
  189. package/dist/jupiter-sdk/instructions/senchaSwap.d.ts.map +0 -1
  190. package/dist/jupiter-sdk/instructions/senchaSwap.js +0 -90
  191. package/dist/jupiter-sdk/instructions/serumSwap.d.ts +0 -34
  192. package/dist/jupiter-sdk/instructions/serumSwap.d.ts.map +0 -1
  193. package/dist/jupiter-sdk/instructions/serumSwap.js +0 -122
  194. package/dist/jupiter-sdk/instructions/setTokenLedger.d.ts +0 -20
  195. package/dist/jupiter-sdk/instructions/setTokenLedger.d.ts.map +0 -1
  196. package/dist/jupiter-sdk/instructions/setTokenLedger.js +0 -46
  197. package/dist/jupiter-sdk/instructions/sharedAccountsExactOutRoute.d.ts +0 -46
  198. package/dist/jupiter-sdk/instructions/sharedAccountsExactOutRoute.d.ts.map +0 -1
  199. package/dist/jupiter-sdk/instructions/sharedAccountsExactOutRoute.js +0 -120
  200. package/dist/jupiter-sdk/instructions/sharedAccountsRoute.d.ts +0 -46
  201. package/dist/jupiter-sdk/instructions/sharedAccountsRoute.d.ts.map +0 -1
  202. package/dist/jupiter-sdk/instructions/sharedAccountsRoute.js +0 -120
  203. package/dist/jupiter-sdk/instructions/sharedAccountsRouteWithTokenLedger.d.ts +0 -45
  204. package/dist/jupiter-sdk/instructions/sharedAccountsRouteWithTokenLedger.d.ts.map +0 -1
  205. package/dist/jupiter-sdk/instructions/sharedAccountsRouteWithTokenLedger.js +0 -126
  206. package/dist/jupiter-sdk/instructions/stabbleStableSwap.d.ts +0 -31
  207. package/dist/jupiter-sdk/instructions/stabbleStableSwap.d.ts.map +0 -1
  208. package/dist/jupiter-sdk/instructions/stabbleStableSwap.js +0 -101
  209. package/dist/jupiter-sdk/instructions/stabbleWeightedSwap.d.ts +0 -31
  210. package/dist/jupiter-sdk/instructions/stabbleWeightedSwap.d.ts.map +0 -1
  211. package/dist/jupiter-sdk/instructions/stabbleWeightedSwap.js +0 -101
  212. package/dist/jupiter-sdk/instructions/stepSwap.d.ts +0 -29
  213. package/dist/jupiter-sdk/instructions/stepSwap.d.ts.map +0 -1
  214. package/dist/jupiter-sdk/instructions/stepSwap.js +0 -98
  215. package/dist/jupiter-sdk/instructions/symmetrySwap.d.ts +0 -32
  216. package/dist/jupiter-sdk/instructions/symmetrySwap.d.ts.map +0 -1
  217. package/dist/jupiter-sdk/instructions/symmetrySwap.js +0 -114
  218. package/dist/jupiter-sdk/instructions/tokenSwap.d.ts +0 -29
  219. package/dist/jupiter-sdk/instructions/tokenSwap.d.ts.map +0 -1
  220. package/dist/jupiter-sdk/instructions/tokenSwap.js +0 -98
  221. package/dist/jupiter-sdk/instructions/tokenSwapV2.d.ts +0 -33
  222. package/dist/jupiter-sdk/instructions/tokenSwapV2.d.ts.map +0 -1
  223. package/dist/jupiter-sdk/instructions/tokenSwapV2.js +0 -114
  224. package/dist/jupiter-sdk/instructions/whirlpoolSwap.d.ts +0 -31
  225. package/dist/jupiter-sdk/instructions/whirlpoolSwap.d.ts.map +0 -1
  226. package/dist/jupiter-sdk/instructions/whirlpoolSwap.js +0 -104
  227. package/dist/jupiter-sdk/instructions/whirlpoolSwapV2.d.ts +0 -35
  228. package/dist/jupiter-sdk/instructions/whirlpoolSwapV2.d.ts.map +0 -1
  229. package/dist/jupiter-sdk/instructions/whirlpoolSwapV2.js +0 -119
  230. package/dist/jupiter-sdk/shared/index.d.ts +0 -54
  231. package/dist/jupiter-sdk/shared/index.d.ts.map +0 -1
  232. package/dist/jupiter-sdk/shared/index.js +0 -69
  233. package/dist/jupiter-sdk/types/accountsType.d.ts +0 -15
  234. package/dist/jupiter-sdk/types/accountsType.d.ts.map +0 -1
  235. package/dist/jupiter-sdk/types/accountsType.js +0 -22
  236. package/dist/jupiter-sdk/types/amountWithSlippage.d.ts +0 -18
  237. package/dist/jupiter-sdk/types/amountWithSlippage.d.ts.map +0 -1
  238. package/dist/jupiter-sdk/types/amountWithSlippage.js +0 -17
  239. package/dist/jupiter-sdk/types/index.d.ts +0 -15
  240. package/dist/jupiter-sdk/types/index.d.ts.map +0 -1
  241. package/dist/jupiter-sdk/types/index.js +0 -30
  242. package/dist/jupiter-sdk/types/remainingAccountsInfo.d.ts +0 -17
  243. package/dist/jupiter-sdk/types/remainingAccountsInfo.d.ts.map +0 -1
  244. package/dist/jupiter-sdk/types/remainingAccountsInfo.js +0 -15
  245. package/dist/jupiter-sdk/types/remainingAccountsSlice.d.ts +0 -19
  246. package/dist/jupiter-sdk/types/remainingAccountsSlice.d.ts.map +0 -1
  247. package/dist/jupiter-sdk/types/remainingAccountsSlice.js +0 -18
  248. package/dist/jupiter-sdk/types/routePlanStep.d.ts +0 -23
  249. package/dist/jupiter-sdk/types/routePlanStep.d.ts.map +0 -1
  250. package/dist/jupiter-sdk/types/routePlanStep.js +0 -20
  251. package/dist/jupiter-sdk/types/side.d.ts +0 -15
  252. package/dist/jupiter-sdk/types/side.d.ts.map +0 -1
  253. package/dist/jupiter-sdk/types/side.js +0 -20
  254. package/dist/jupiter-sdk/types/swap.d.ts +0 -372
  255. package/dist/jupiter-sdk/types/swap.d.ts.map +0 -1
  256. package/dist/jupiter-sdk/types/swap.js +0 -188
  257. package/src/jupiter-sdk/accounts/index.ts +0 -9
  258. package/src/jupiter-sdk/accounts/tokenLedger.ts +0 -146
  259. package/src/jupiter-sdk/instructions/aldrinSwap.ts +0 -165
  260. package/src/jupiter-sdk/instructions/aldrinV2Swap.ts +0 -171
  261. package/src/jupiter-sdk/instructions/balansolSwap.ts +0 -211
  262. package/src/jupiter-sdk/instructions/claim.ts +0 -128
  263. package/src/jupiter-sdk/instructions/claimToken.ts +0 -171
  264. package/src/jupiter-sdk/instructions/cloneSwap.ts +0 -195
  265. package/src/jupiter-sdk/instructions/createOpenOrders.ts +0 -148
  266. package/src/jupiter-sdk/instructions/createProgramOpenOrders.ts +0 -170
  267. package/src/jupiter-sdk/instructions/createTokenAccount.ts +0 -152
  268. package/src/jupiter-sdk/instructions/createTokenLedger.ts +0 -128
  269. package/src/jupiter-sdk/instructions/cremaSwap.ts +0 -193
  270. package/src/jupiter-sdk/instructions/cropperSwap.ts +0 -174
  271. package/src/jupiter-sdk/instructions/cykuraSwap.ts +0 -169
  272. package/src/jupiter-sdk/instructions/deltafiSwap.ts +0 -181
  273. package/src/jupiter-sdk/instructions/dradexSwap.ts +0 -200
  274. package/src/jupiter-sdk/instructions/exactOutRoute.ts +0 -208
  275. package/src/jupiter-sdk/instructions/goosefxSwap.ts +0 -189
  276. package/src/jupiter-sdk/instructions/goosefxV2Swap.ts +0 -222
  277. package/src/jupiter-sdk/instructions/heliumTreasuryManagementRedeemV0.ts +0 -169
  278. package/src/jupiter-sdk/instructions/index.ts +0 -72
  279. package/src/jupiter-sdk/instructions/invariantSwap.ts +0 -168
  280. package/src/jupiter-sdk/instructions/lifinitySwap.ts +0 -186
  281. package/src/jupiter-sdk/instructions/lifinityV2Swap.ts +0 -189
  282. package/src/jupiter-sdk/instructions/marcoPoloSwap.ts +0 -223
  283. package/src/jupiter-sdk/instructions/marinadeDeposit.ts +0 -230
  284. package/src/jupiter-sdk/instructions/marinadeUnstake.ts +0 -182
  285. package/src/jupiter-sdk/instructions/mercurialSwap.ts +0 -145
  286. package/src/jupiter-sdk/instructions/meteoraDlmmSwap.ts +0 -193
  287. package/src/jupiter-sdk/instructions/meteoraSwap.ts +0 -195
  288. package/src/jupiter-sdk/instructions/moonshotWrappedBuy.ts +0 -201
  289. package/src/jupiter-sdk/instructions/moonshotWrappedSell.ts +0 -186
  290. package/src/jupiter-sdk/instructions/obricSwap.ts +0 -178
  291. package/src/jupiter-sdk/instructions/oneIntroSwap.ts +0 -171
  292. package/src/jupiter-sdk/instructions/openBookV2Swap.ts +0 -207
  293. package/src/jupiter-sdk/instructions/perpsAddLiquidity.ts +0 -186
  294. package/src/jupiter-sdk/instructions/perpsRemoveLiquidity.ts +0 -188
  295. package/src/jupiter-sdk/instructions/perpsSwap.ts +0 -195
  296. package/src/jupiter-sdk/instructions/perpsV2AddLiquidity.ts +0 -194
  297. package/src/jupiter-sdk/instructions/perpsV2RemoveLiquidity.ts +0 -193
  298. package/src/jupiter-sdk/instructions/perpsV2Swap.ts +0 -207
  299. package/src/jupiter-sdk/instructions/phoenixSwap.ts +0 -157
  300. package/src/jupiter-sdk/instructions/pumpdotfunWrappedBuy.ts +0 -209
  301. package/src/jupiter-sdk/instructions/pumpdotfunWrappedSell.ts +0 -190
  302. package/src/jupiter-sdk/instructions/raydiumClmmSwap.ts +0 -175
  303. package/src/jupiter-sdk/instructions/raydiumClmmSwapV2.ts +0 -193
  304. package/src/jupiter-sdk/instructions/raydiumCpSwap.ts +0 -189
  305. package/src/jupiter-sdk/instructions/raydiumSwap.ts +0 -211
  306. package/src/jupiter-sdk/instructions/route.ts +0 -189
  307. package/src/jupiter-sdk/instructions/routeWithTokenLedger.ts +0 -201
  308. package/src/jupiter-sdk/instructions/saberAddDecimals.ts +0 -151
  309. package/src/jupiter-sdk/instructions/saberSwap.ts +0 -156
  310. package/src/jupiter-sdk/instructions/senchaSwap.ts +0 -159
  311. package/src/jupiter-sdk/instructions/serumSwap.ts +0 -200
  312. package/src/jupiter-sdk/instructions/setTokenLedger.ts +0 -106
  313. package/src/jupiter-sdk/instructions/sharedAccountsExactOutRoute.ts +0 -226
  314. package/src/jupiter-sdk/instructions/sharedAccountsRoute.ts +0 -225
  315. package/src/jupiter-sdk/instructions/sharedAccountsRouteWithTokenLedger.ts +0 -231
  316. package/src/jupiter-sdk/instructions/stabbleStableSwap.ts +0 -176
  317. package/src/jupiter-sdk/instructions/stabbleWeightedSwap.ts +0 -178
  318. package/src/jupiter-sdk/instructions/stepSwap.ts +0 -168
  319. package/src/jupiter-sdk/instructions/symmetrySwap.ts +0 -187
  320. package/src/jupiter-sdk/instructions/tokenSwap.ts +0 -168
  321. package/src/jupiter-sdk/instructions/tokenSwapV2.ts +0 -185
  322. package/src/jupiter-sdk/instructions/whirlpoolSwap.ts +0 -179
  323. package/src/jupiter-sdk/instructions/whirlpoolSwapV2.ts +0 -194
  324. package/src/jupiter-sdk/shared/index.ts +0 -117
  325. package/src/jupiter-sdk/types/accountsType.ts +0 -25
  326. package/src/jupiter-sdk/types/amountWithSlippage.ts +0 -34
  327. package/src/jupiter-sdk/types/index.ts +0 -15
  328. package/src/jupiter-sdk/types/remainingAccountsInfo.ts +0 -34
  329. package/src/jupiter-sdk/types/remainingAccountsSlice.ts +0 -33
  330. package/src/jupiter-sdk/types/routePlanStep.ts +0 -39
  331. package/src/jupiter-sdk/types/side.ts +0 -23
  332. package/src/jupiter-sdk/types/swap.ts +0 -566
@@ -8,6 +8,7 @@ import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
8
8
  import { LivePositionUpdates } from "../utils/solauto/generalUtils";
9
9
  import { ReferralStateManager } from "./referralStateManager";
10
10
  import { TxHandler } from "./txHandler";
11
+ import { QuoteResponse } from "@jup-ag/api";
11
12
  export interface SolautoClientArgs {
12
13
  authority?: PublicKey;
13
14
  positionId?: number;
@@ -64,7 +65,7 @@ export declare abstract class SolautoClient extends TxHandler {
64
65
  protocolInteraction(args: SolautoActionArgs): TransactionBuilder;
65
66
  abstract flashBorrow(flashLoanDetails: FlashLoanDetails, destinationTokenAccount: PublicKey): TransactionBuilder;
66
67
  abstract flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder;
67
- abstract rebalance(rebalanceStep: "A" | "B", swapDetails: JupSwapDetails, rebalanceType: SolautoRebalanceTypeArgs, flashLoan?: FlashLoanDetails, targetLiqUtilizationRateBps?: number): TransactionBuilder;
68
+ abstract rebalance(rebalanceStep: "A" | "B", swapDetails: JupSwapDetails, jupQuote: QuoteResponse, rebalanceType: SolautoRebalanceTypeArgs, flashLoan?: FlashLoanDetails, targetLiqUtilizationRateBps?: number): TransactionBuilder;
68
69
  getFreshPositionState(): Promise<PositionState | undefined>;
69
70
  }
70
71
  //# sourceMappingURL=solautoClient.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoClient.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ import { DCASettingsInpArgs, PositionState, SolautoActionArgs, SolautoRebalanceT
6
6
  import { MarginfiAccount } from "../marginfi-sdk";
7
7
  import { JupSwapDetails } from "../utils/jupiterUtils";
8
8
  import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
9
+ import { QuoteResponse } from "@jup-ag/api";
9
10
  export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
10
11
  marginfiAccount?: PublicKey | Signer;
11
12
  marginfiAccountSeedIdx?: bigint;
@@ -38,7 +39,7 @@ export declare class SolautoMarginfiClient extends SolautoClient {
38
39
  protocolInteraction(args: SolautoActionArgs): TransactionBuilder;
39
40
  private marginfiProtocolInteractionIx;
40
41
  private marginfiSolautoProtocolInteractionIx;
41
- rebalance(rebalanceStep: "A" | "B", swapDetails: JupSwapDetails, rebalanceType: SolautoRebalanceTypeArgs, flashLoan?: FlashLoanDetails, targetLiqUtilizationRateBps?: number): TransactionBuilder;
42
+ rebalance(rebalanceStep: "A" | "B", swapDetails: JupSwapDetails, jupQuote: QuoteResponse, rebalanceType: SolautoRebalanceTypeArgs, flashLoan?: FlashLoanDetails, targetLiqUtilizationRateBps?: number): TransactionBuilder;
42
43
  flashBorrow(flashLoanDetails: FlashLoanDetails, destinationTokenAccount: PublicKey): TransactionBuilder;
43
44
  flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder;
44
45
  createIntermediaryMarginfiAccount(): TransactionBuilder;
@@ -1 +1 @@
1
- {"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAEb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAUnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA+D1C,8BAA8B;IA0CpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAyBvE,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA+C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IAgErB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAwClE"}
1
+ {"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAEb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AASnE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAmE1C,8BAA8B;IA0CpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAyBvE,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA+C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IAgErB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA4ClE"}
@@ -37,9 +37,11 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
37
37
  ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.marginfiAccount.publicKey)
38
38
  : this.marginfiAccount;
39
39
  const marginfiAccountData = await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(this.umi, (0, umi_1.publicKey)(this.marginfiAccountPk), { commitment: "confirmed" });
40
- this.marginfiGroup = marginfiAccountData
41
- ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(marginfiAccountData.group)
42
- : args.marginfiGroup ?? new web3_js_1.PublicKey(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP);
40
+ this.marginfiGroup = new web3_js_1.PublicKey(marginfiAccountData
41
+ ? marginfiAccountData.group.toString()
42
+ : args.marginfiGroup ??
43
+ marginfiAccounts_1.MARGINFI_ACCOUNTS[this.supplyMint.toString()].marginfiGroup ??
44
+ marginfiAccounts_1.DEFAULT_MARGINFI_GROUP);
43
45
  this.marginfiSupplyAccounts =
44
46
  marginfiAccounts_1.MARGINFI_ACCOUNTS[this.supplyMint.toString()];
45
47
  this.marginfiDebtAccounts = marginfiAccounts_1.MARGINFI_ACCOUNTS[this.debtMint.toString()];
@@ -289,7 +291,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
289
291
  solautoAction: args,
290
292
  });
291
293
  }
292
- rebalance(rebalanceStep, swapDetails, rebalanceType, flashLoan, targetLiqUtilizationRateBps) {
294
+ rebalance(rebalanceStep, swapDetails, jupQuote, rebalanceType, flashLoan, targetLiqUtilizationRateBps) {
293
295
  const inputIsSupply = swapDetails.inputMint.equals(this.supplyMint);
294
296
  const outputIsSupply = swapDetails.outputMint.equals(this.supplyMint);
295
297
  const needSupplyAccounts = (inputIsSupply && rebalanceStep === "A") ||
@@ -334,7 +336,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
334
336
  : undefined,
335
337
  rebalanceType,
336
338
  targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
337
- targetInAmountBaseUnit: rebalanceStep === "A" ? swapDetails.amount : null,
339
+ targetInAmountBaseUnit: rebalanceStep === "A" ? parseInt(jupQuote.inAmount) : null,
338
340
  });
339
341
  }
340
342
  flashBorrow(flashLoanDetails, destinationTokenAccount) {
@@ -433,7 +435,11 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
433
435
  if (state) {
434
436
  return state;
435
437
  }
436
- const freshState = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, this.marginfiAccountPk, !this.selfManaged && this.solautoPositionData === null ? this.supplyMint : undefined, !this.selfManaged && this.solautoPositionData === null ? this.debtMint : undefined, this.livePositionUpdates);
438
+ const freshState = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, this.marginfiAccountPk, !this.selfManaged && this.solautoPositionData === null
439
+ ? this.supplyMint
440
+ : undefined, !this.selfManaged && this.solautoPositionData === null
441
+ ? this.debtMint
442
+ : undefined, this.livePositionUpdates);
437
443
  if (freshState) {
438
444
  this.log("Fresh state", freshState);
439
445
  const supplyPrice = (0, generalUtils_1.safeGetPrice)(freshState?.supply.mint);
@@ -7,8 +7,7 @@
7
7
  */
8
8
  import { Serializer } from '@metaplex-foundation/umi/serializers';
9
9
  export declare enum LendingPlatform {
10
- Marginfi = 0,
11
- Kamino = 1
10
+ Marginfi = 0
12
11
  }
13
12
  export type LendingPlatformArgs = LendingPlatform;
14
13
  export declare function getLendingPlatformSerializer(): Serializer<LendingPlatformArgs, LendingPlatform>;
@@ -1 +1 @@
1
- {"version":3,"file":"lendingPlatform.d.ts","sourceRoot":"","sources":["../../../src/generated/types/lendingPlatform.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,eAAe;IACzB,QAAQ,IAAA;IACR,MAAM,IAAA;CACP;AAED,MAAM,MAAM,mBAAmB,GAAG,eAAe,CAAC;AAElD,wBAAgB,4BAA4B,IAAI,UAAU,CACxD,mBAAmB,EACnB,eAAe,CAChB,CAIA"}
1
+ {"version":3,"file":"lendingPlatform.d.ts","sourceRoot":"","sources":["../../../src/generated/types/lendingPlatform.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,eAAe;IACzB,QAAQ,IAAA;CACT;AAED,MAAM,MAAM,mBAAmB,GAAG,eAAe,CAAC;AAElD,wBAAgB,4BAA4B,IAAI,UAAU,CACxD,mBAAmB,EACnB,eAAe,CAChB,CAIA"}
@@ -13,7 +13,6 @@ const serializers_1 = require("@metaplex-foundation/umi/serializers");
13
13
  var LendingPlatform;
14
14
  (function (LendingPlatform) {
15
15
  LendingPlatform[LendingPlatform["Marginfi"] = 0] = "Marginfi";
16
- LendingPlatform[LendingPlatform["Kamino"] = 1] = "Kamino";
17
16
  })(LendingPlatform || (exports.LendingPlatform = LendingPlatform = {}));
18
17
  function getLendingPlatformSerializer() {
19
18
  return (0, serializers_1.scalarEnum)(LendingPlatform, {
@@ -5,10 +5,6 @@
5
5
  *
6
6
  * @see https://github.com/metaplex-foundation/kinobi
7
7
  */
8
- export * from './accounts';
9
8
  export * from './errors';
10
- export * from './instructions';
11
9
  export * from './programs';
12
- export * from './shared';
13
- export * from './types';
14
10
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/jupiter-sdk/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/jupiter-sdk/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC"}
@@ -21,9 +21,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
21
21
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
22
22
  };
23
23
  Object.defineProperty(exports, "__esModule", { value: true });
24
- __exportStar(require("./accounts"), exports);
25
24
  __exportStar(require("./errors"), exports);
26
- __exportStar(require("./instructions"), exports);
27
25
  __exportStar(require("./programs"), exports);
28
- __exportStar(require("./shared"), exports);
29
- __exportStar(require("./types"), exports);
@@ -1 +1 @@
1
- {"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAGL,aAAa,EAYd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAiOzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,aAAa,WAwCnE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAkHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EAwC9D"}
1
+ {"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAGL,aAAa,EAYd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAiOzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA+G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,aAAa,WAwCnE;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAsHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG;;;;EAwC9D"}
@@ -67,7 +67,7 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
67
67
  !(await (0, generalUtils_1.getSolanaAccountCreated)(client.umi, client.marginfiAccountPk))) {
68
68
  chores = chores.add(client.marginfiAccountInitialize());
69
69
  }
70
- // TODO: support other platforms
70
+ // TODO: PF
71
71
  }
72
72
  const wSolUsage = getWSolUsage(client, solautoActions, initiatingDcaIn, undefined);
73
73
  if (wSolUsage !== undefined) {
@@ -308,7 +308,7 @@ function getSolautoActions(tx) {
308
308
  }
309
309
  catch { }
310
310
  }
311
- // TODO support other platforms
311
+ // TODO: PF
312
312
  });
313
313
  return solautoActions;
314
314
  }
@@ -378,11 +378,11 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
378
378
  client.flashBorrow(flashLoan, (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), swapDetails.inputMint)),
379
379
  ...(addFirstRebalance
380
380
  ? [
381
- client.rebalance("A", swapDetails, rebalanceType, flashLoan, targetLiqUtilizationRateBps),
381
+ client.rebalance("A", swapDetails, jupQuote, rebalanceType, flashLoan, targetLiqUtilizationRateBps),
382
382
  ]
383
383
  : []),
384
384
  swapIx,
385
- client.rebalance("B", swapDetails, rebalanceType, flashLoan, targetLiqUtilizationRateBps),
385
+ client.rebalance("B", swapDetails, jupQuote, rebalanceType, flashLoan, targetLiqUtilizationRateBps),
386
386
  client.flashRepay(flashLoan),
387
387
  ]);
388
388
  }
@@ -391,9 +391,9 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
391
391
  tx = tx.add([
392
392
  setupInstructions,
393
393
  tokenLedgerIx,
394
- client.rebalance("A", swapDetails, rebalanceType, undefined, targetLiqUtilizationRateBps),
394
+ client.rebalance("A", swapDetails, jupQuote, rebalanceType, undefined, targetLiqUtilizationRateBps),
395
395
  swapIx,
396
- client.rebalance("B", swapDetails, rebalanceType, undefined, targetLiqUtilizationRateBps),
396
+ client.rebalance("B", swapDetails, jupQuote, rebalanceType, undefined, targetLiqUtilizationRateBps),
397
397
  ]);
398
398
  }
399
399
  return {
@@ -3,5 +3,6 @@ export interface MarginfiAssetAccounts {
3
3
  liquidityVault: string;
4
4
  vaultAuthority: string;
5
5
  priceOracle: string;
6
+ marginfiGroup?: string;
6
7
  }
7
8
  //# sourceMappingURL=accounts.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/types/accounts.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB"}
1
+ {"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/types/accounts.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB"}
@@ -1 +1 @@
1
- {"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAU3E;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA+D3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAwDA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA6JpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyB3B"}
1
+ {"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAU3E;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA+D3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAwDA;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAkKpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyB3B"}
@@ -180,6 +180,10 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMin
180
180
  if (supplyBank === null) {
181
181
  return undefined;
182
182
  }
183
+ if (!(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.group).equals(new web3_js_1.PublicKey(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP))) {
184
+ // Temporarily disabled for now
185
+ return undefined;
186
+ }
183
187
  if (!supplyUsage) {
184
188
  supplyUsage = await getTokenUsage(umi, supplyBank, true, 0, livePositionUpdates?.supplyAdjustment);
185
189
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAA+B,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAElB,aAAa,EACb,YAAY,EAEZ,yBAAyB,EACzB,gCAAgC,EAChC,SAAS,EAIV,MAAM,iBAAiB,CAAC;AAezB,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAgB9E,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,kBAAkB,GAC7B,MAAM,CAKR;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,kBAAkB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAET;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,kBAAkB,EAC9B,oBAAoB,EAAE,MAAM,UAY7B;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,EACnC,eAAe,EAAE,MAAM,GACtB,yBAAyB,CAgB3B;AAED,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,EAC3C,WAAW,EAAE,WAAW,GAAG,SAAS,EACpC,eAAe,EAAE,MAAM,EACvB,oBAAoB,SAAI,GACvB,eAAe,GAAG,SAAS,CAiC7B;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,EAC3C,eAAe,EAAE,MAAM,GACtB,OAAO,CAYT;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,SAAS,EACrB,kBAAkB,CAAC,EAAE,YAAY,GAChC,OAAO,CAAC,sBAAsB,EAAE,CAAC,CAoEnC;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAezE;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,SAAS,EAAE,CAAC,CA2BtB;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,EACf,kBAAkB,CAAC,EAAE,YAAY,GAChC,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA4CnC;AAED,wBAAsB,6BAA6B,CACjD,KAAK,EAAE,aAAa,EACpB,WAAW,CAAC,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,aAAa,CAAC,CA2CxB;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,aAAa,CA8Df;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gCAAgC,GACzC,yBAAyB,CA8B3B;AAED,KAAK,kBAAkB,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,gCAAgC,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAA;CAAE,GAC1C;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,KAAK,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;KAAE,CAAA;CAAE,GAC1E;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,SAAS,CAAC;CAAE,CAAC;AAEjD,qBAAa,mBAAmB;IACvB,gBAAgB,SAAa;IAC7B,cAAc,SAAa;IAC3B,QAAQ,EAAE,yBAAyB,GAAG,SAAS,CAAa;IAC5D,SAAS,EAAE,WAAW,GAAG,SAAS,CAAa;IAC/C,YAAY,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,SAAS,CAAC;KAAE,CAAa;IACrE,aAAa,EAAE,SAAS,GAAG,SAAS,CAAa;IAExD,GAAG,CAAC,MAAM,EAAE,kBAAkB;IA6B9B,KAAK;IASL,UAAU,IAAI,OAAO;CAStB"}
@@ -221,7 +221,6 @@ async function getAllPositionsByAuthority(umi, user, positionTypeFilter) {
221
221
  debtMint: x.debtMint,
222
222
  }));
223
223
  })(),
224
- // TODO support other platforms
225
224
  ]);
226
225
  return solautoCompatiblePositions.flat();
227
226
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haven-fi/solauto-sdk",
3
- "version": "1.0.193",
3
+ "version": "1.0.194",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/index.d.ts",
6
6
  "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -53,6 +53,7 @@ import { currentUnixSeconds } from "../utils/generalUtils";
53
53
  import { LivePositionUpdates } from "../utils/solauto/generalUtils";
54
54
  import { ReferralStateManager } from "./referralStateManager";
55
55
  import { TxHandler } from "./txHandler";
56
+ import { QuoteResponse } from "@jup-ag/api";
56
57
 
57
58
  export interface SolautoClientArgs {
58
59
  authority?: PublicKey;
@@ -596,6 +597,7 @@ export abstract class SolautoClient extends TxHandler {
596
597
  abstract rebalance(
597
598
  rebalanceStep: "A" | "B",
598
599
  swapDetails: JupSwapDetails,
600
+ jupQuote: QuoteResponse,
599
601
  rebalanceType: SolautoRebalanceTypeArgs,
600
602
  flashLoan?: FlashLoanDetails,
601
603
  targetLiqUtilizationRateBps?: number,
@@ -57,6 +57,7 @@ import {
57
57
  } from "../utils/marginfiUtils";
58
58
  import { bytesToI80F48, fromBaseUnit, toBps } from "../utils/numberUtils";
59
59
  import { createFakePositionState } from "../utils";
60
+ import { QuoteResponse } from "@jup-ag/api";
60
61
 
61
62
  export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
62
63
  marginfiAccount?: PublicKey | Signer;
@@ -111,9 +112,13 @@ export class SolautoMarginfiClient extends SolautoClient {
111
112
  publicKey(this.marginfiAccountPk),
112
113
  { commitment: "confirmed" }
113
114
  );
114
- this.marginfiGroup = marginfiAccountData
115
- ? toWeb3JsPublicKey(marginfiAccountData.group)
116
- : args.marginfiGroup ?? new PublicKey(DEFAULT_MARGINFI_GROUP);
115
+ this.marginfiGroup = new PublicKey(
116
+ marginfiAccountData
117
+ ? marginfiAccountData.group.toString()
118
+ : args.marginfiGroup ??
119
+ MARGINFI_ACCOUNTS[this.supplyMint.toString()].marginfiGroup ??
120
+ DEFAULT_MARGINFI_GROUP
121
+ );
117
122
 
118
123
  this.marginfiSupplyAccounts =
119
124
  MARGINFI_ACCOUNTS[this.supplyMint.toString()]!;
@@ -450,9 +455,10 @@ export class SolautoMarginfiClient extends SolautoClient {
450
455
  rebalance(
451
456
  rebalanceStep: "A" | "B",
452
457
  swapDetails: JupSwapDetails,
458
+ jupQuote: QuoteResponse,
453
459
  rebalanceType: SolautoRebalanceTypeArgs,
454
460
  flashLoan?: FlashLoanDetails,
455
- targetLiqUtilizationRateBps?: number,
461
+ targetLiqUtilizationRateBps?: number
456
462
  ): TransactionBuilder {
457
463
  const inputIsSupply = swapDetails.inputMint.equals(this.supplyMint);
458
464
  const outputIsSupply = swapDetails.outputMint.equals(this.supplyMint);
@@ -513,7 +519,7 @@ export class SolautoMarginfiClient extends SolautoClient {
513
519
  : undefined,
514
520
  rebalanceType,
515
521
  targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
516
- targetInAmountBaseUnit: rebalanceStep === "A" ? swapDetails.amount : null,
522
+ targetInAmountBaseUnit: rebalanceStep === "A" ? parseInt(jupQuote.inAmount) : null,
517
523
  });
518
524
  }
519
525
 
@@ -649,8 +655,12 @@ export class SolautoMarginfiClient extends SolautoClient {
649
655
  const freshState = await getMarginfiAccountPositionState(
650
656
  this.umi,
651
657
  this.marginfiAccountPk,
652
- !this.selfManaged && this.solautoPositionData === null ? this.supplyMint : undefined,
653
- !this.selfManaged && this.solautoPositionData === null ? this.debtMint : undefined,
658
+ !this.selfManaged && this.solautoPositionData === null
659
+ ? this.supplyMint
660
+ : undefined,
661
+ !this.selfManaged && this.solautoPositionData === null
662
+ ? this.debtMint
663
+ : undefined,
654
664
  this.livePositionUpdates
655
665
  );
656
666
 
@@ -10,7 +10,6 @@ import { Serializer, scalarEnum } from '@metaplex-foundation/umi/serializers';
10
10
 
11
11
  export enum LendingPlatform {
12
12
  Marginfi,
13
- Kamino,
14
13
  }
15
14
 
16
15
  export type LendingPlatformArgs = LendingPlatform;
@@ -6,9 +6,5 @@
6
6
  * @see https://github.com/metaplex-foundation/kinobi
7
7
  */
8
8
 
9
- export * from './accounts';
10
9
  export * from './errors';
11
- export * from './instructions';
12
10
  export * from './programs';
13
- export * from './shared';
14
- export * from './types';
@@ -163,7 +163,7 @@ async function transactionChoresBefore(
163
163
  (client as SolautoMarginfiClient).marginfiAccountInitialize()
164
164
  );
165
165
  }
166
- // TODO: support other platforms
166
+ // TODO: PF
167
167
  }
168
168
 
169
169
  const wSolUsage = getWSolUsage(
@@ -540,7 +540,7 @@ function getSolautoActions(tx: TransactionBuilder): SolautoAction[] {
540
540
  } catch {}
541
541
  }
542
542
 
543
- // TODO support other platforms
543
+ // TODO: PF
544
544
  });
545
545
 
546
546
  return solautoActions;
@@ -700,6 +700,7 @@ export async function buildSolautoRebalanceTransaction(
700
700
  client.rebalance(
701
701
  "A",
702
702
  swapDetails,
703
+ jupQuote,
703
704
  rebalanceType,
704
705
  flashLoan,
705
706
  targetLiqUtilizationRateBps
@@ -710,6 +711,7 @@ export async function buildSolautoRebalanceTransaction(
710
711
  client.rebalance(
711
712
  "B",
712
713
  swapDetails,
714
+ jupQuote,
713
715
  rebalanceType,
714
716
  flashLoan,
715
717
  targetLiqUtilizationRateBps
@@ -724,6 +726,7 @@ export async function buildSolautoRebalanceTransaction(
724
726
  client.rebalance(
725
727
  "A",
726
728
  swapDetails,
729
+ jupQuote,
727
730
  rebalanceType,
728
731
  undefined,
729
732
  targetLiqUtilizationRateBps
@@ -732,6 +735,7 @@ export async function buildSolautoRebalanceTransaction(
732
735
  client.rebalance(
733
736
  "B",
734
737
  swapDetails,
738
+ jupQuote,
735
739
  rebalanceType,
736
740
  undefined,
737
741
  targetLiqUtilizationRateBps
@@ -3,4 +3,5 @@ export interface MarginfiAssetAccounts {
3
3
  liquidityVault: string;
4
4
  vaultAuthority: string;
5
5
  priceOracle: string;
6
+ marginfiGroup?: string;
6
7
  }
@@ -20,7 +20,7 @@ import {
20
20
  toBaseUnit,
21
21
  toBps,
22
22
  } from "./numberUtils";
23
- import { MARGINFI_ACCOUNTS } from "../constants/marginfiAccounts";
23
+ import { DEFAULT_MARGINFI_GROUP, MARGINFI_ACCOUNTS } from "../constants/marginfiAccounts";
24
24
  import { MarginfiAssetAccounts } from "../types/accounts";
25
25
  import { PositionState, PositionTokenUsage } from "../generated";
26
26
  import { USD_DECIMALS } from "../constants/generalAccounts";
@@ -333,6 +333,11 @@ export async function getMarginfiAccountPositionState(
333
333
  return undefined;
334
334
  }
335
335
 
336
+ if (!toWeb3JsPublicKey(supplyBank.group).equals(new PublicKey(DEFAULT_MARGINFI_GROUP))) {
337
+ // Temporarily disabled for now
338
+ return undefined;
339
+ }
340
+
336
341
  if (!supplyUsage) {
337
342
  supplyUsage = await getTokenUsage(
338
343
  umi,
@@ -327,7 +327,6 @@ export async function getAllPositionsByAuthority(
327
327
  debtMint: x.debtMint,
328
328
  }));
329
329
  })(),
330
- // TODO support other platforms
331
330
  ]);
332
331
 
333
332
  return solautoCompatiblePositions.flat();
@@ -1,9 +0,0 @@
1
- /**
2
- * This code was AUTOGENERATED using the kinobi library.
3
- * Please DO NOT EDIT THIS FILE, instead use visitors
4
- * to add features, then rerun kinobi to update it.
5
- *
6
- * @see https://github.com/metaplex-foundation/kinobi
7
- */
8
- export * from './tokenLedger';
9
- //# sourceMappingURL=index.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/jupiter-sdk/accounts/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,eAAe,CAAC"}
@@ -1,24 +0,0 @@
1
- "use strict";
2
- /**
3
- * This code was AUTOGENERATED using the kinobi library.
4
- * Please DO NOT EDIT THIS FILE, instead use visitors
5
- * to add features, then rerun kinobi to update it.
6
- *
7
- * @see https://github.com/metaplex-foundation/kinobi
8
- */
9
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- var desc = Object.getOwnPropertyDescriptor(m, k);
12
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
13
- desc = { enumerable: true, get: function() { return m[k]; } };
14
- }
15
- Object.defineProperty(o, k2, desc);
16
- }) : (function(o, m, k, k2) {
17
- if (k2 === undefined) k2 = k;
18
- o[k2] = m[k];
19
- }));
20
- var __exportStar = (this && this.__exportStar) || function(m, exports) {
21
- for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
22
- };
23
- Object.defineProperty(exports, "__esModule", { value: true });
24
- __exportStar(require("./tokenLedger"), exports);
@@ -1,32 +0,0 @@
1
- /**
2
- * This code was AUTOGENERATED using the kinobi library.
3
- * Please DO NOT EDIT THIS FILE, instead use visitors
4
- * to add features, then rerun kinobi to update it.
5
- *
6
- * @see https://github.com/metaplex-foundation/kinobi
7
- */
8
- import { Account, Context, Pda, PublicKey, RpcAccount, RpcGetAccountOptions, RpcGetAccountsOptions } from '@metaplex-foundation/umi';
9
- import { Serializer } from '@metaplex-foundation/umi/serializers';
10
- export type TokenLedger = Account<TokenLedgerAccountData>;
11
- export type TokenLedgerAccountData = {
12
- discriminator: Array<number>;
13
- tokenAccount: PublicKey;
14
- amount: bigint;
15
- };
16
- export type TokenLedgerAccountDataArgs = {
17
- tokenAccount: PublicKey;
18
- amount: number | bigint;
19
- };
20
- export declare function getTokenLedgerAccountDataSerializer(): Serializer<TokenLedgerAccountDataArgs, TokenLedgerAccountData>;
21
- export declare function deserializeTokenLedger(rawAccount: RpcAccount): TokenLedger;
22
- export declare function fetchTokenLedger(context: Pick<Context, 'rpc'>, publicKey: PublicKey | Pda, options?: RpcGetAccountOptions): Promise<TokenLedger>;
23
- export declare function safeFetchTokenLedger(context: Pick<Context, 'rpc'>, publicKey: PublicKey | Pda, options?: RpcGetAccountOptions): Promise<TokenLedger | null>;
24
- export declare function fetchAllTokenLedger(context: Pick<Context, 'rpc'>, publicKeys: Array<PublicKey | Pda>, options?: RpcGetAccountsOptions): Promise<TokenLedger[]>;
25
- export declare function safeFetchAllTokenLedger(context: Pick<Context, 'rpc'>, publicKeys: Array<PublicKey | Pda>, options?: RpcGetAccountsOptions): Promise<TokenLedger[]>;
26
- export declare function getTokenLedgerGpaBuilder(context: Pick<Context, 'rpc' | 'programs'>): import("@metaplex-foundation/umi").GpaBuilder<TokenLedger, {
27
- discriminator: Array<number>;
28
- tokenAccount: PublicKey;
29
- amount: number | bigint;
30
- }>;
31
- export declare function getTokenLedgerSize(): number;
32
- //# sourceMappingURL=tokenLedger.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"tokenLedger.d.ts","sourceRoot":"","sources":["../../../src/jupiter-sdk/accounts/tokenLedger.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,OAAO,EACP,GAAG,EACH,SAAS,EACT,UAAU,EACV,oBAAoB,EACpB,qBAAqB,EAKtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAOX,MAAM,sCAAsC,CAAC;AAE9C,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAE1D,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,YAAY,EAAE,SAAS,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,YAAY,EAAE,SAAS,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB,CAAC;AAEF,wBAAgB,mCAAmC,IAAI,UAAU,CAC/D,0BAA0B,EAC1B,sBAAsB,CACvB,CAeA;AAED,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAE1E;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAC7B,SAAS,EAAE,SAAS,GAAG,GAAG,EAC1B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,WAAW,CAAC,CAOtB;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAC7B,SAAS,EAAE,SAAS,GAAG,GAAG,EAC1B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAM7B;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAC7B,UAAU,EAAE,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,EAClC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,WAAW,EAAE,CAAC,CASxB;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAC7B,UAAU,EAAE,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,EAClC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,WAAW,EAAE,CAAC,CAQxB;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,UAAU,CAAC;mBAQvB,KAAK,CAAC,MAAM,CAAC;kBACd,SAAS;YACf,MAAM,GAAG,MAAM;GAQ5B;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C"}
@@ -1,68 +0,0 @@
1
- "use strict";
2
- /**
3
- * This code was AUTOGENERATED using the kinobi library.
4
- * Please DO NOT EDIT THIS FILE, instead use visitors
5
- * to add features, then rerun kinobi to update it.
6
- *
7
- * @see https://github.com/metaplex-foundation/kinobi
8
- */
9
- Object.defineProperty(exports, "__esModule", { value: true });
10
- exports.getTokenLedgerAccountDataSerializer = getTokenLedgerAccountDataSerializer;
11
- exports.deserializeTokenLedger = deserializeTokenLedger;
12
- exports.fetchTokenLedger = fetchTokenLedger;
13
- exports.safeFetchTokenLedger = safeFetchTokenLedger;
14
- exports.fetchAllTokenLedger = fetchAllTokenLedger;
15
- exports.safeFetchAllTokenLedger = safeFetchAllTokenLedger;
16
- exports.getTokenLedgerGpaBuilder = getTokenLedgerGpaBuilder;
17
- exports.getTokenLedgerSize = getTokenLedgerSize;
18
- const umi_1 = require("@metaplex-foundation/umi");
19
- const serializers_1 = require("@metaplex-foundation/umi/serializers");
20
- function getTokenLedgerAccountDataSerializer() {
21
- return (0, serializers_1.mapSerializer)((0, serializers_1.struct)([
22
- ['discriminator', (0, serializers_1.array)((0, serializers_1.u8)(), { size: 8 })],
23
- ['tokenAccount', (0, serializers_1.publicKey)()],
24
- ['amount', (0, serializers_1.u64)()],
25
- ], { description: 'TokenLedgerAccountData' }), (value) => ({
26
- ...value,
27
- discriminator: [156, 247, 9, 188, 54, 108, 85, 77],
28
- }));
29
- }
30
- function deserializeTokenLedger(rawAccount) {
31
- return (0, umi_1.deserializeAccount)(rawAccount, getTokenLedgerAccountDataSerializer());
32
- }
33
- async function fetchTokenLedger(context, publicKey, options) {
34
- const maybeAccount = await context.rpc.getAccount((0, umi_1.publicKey)(publicKey, false), options);
35
- (0, umi_1.assertAccountExists)(maybeAccount, 'TokenLedger');
36
- return deserializeTokenLedger(maybeAccount);
37
- }
38
- async function safeFetchTokenLedger(context, publicKey, options) {
39
- const maybeAccount = await context.rpc.getAccount((0, umi_1.publicKey)(publicKey, false), options);
40
- return maybeAccount.exists ? deserializeTokenLedger(maybeAccount) : null;
41
- }
42
- async function fetchAllTokenLedger(context, publicKeys, options) {
43
- const maybeAccounts = await context.rpc.getAccounts(publicKeys.map((key) => (0, umi_1.publicKey)(key, false)), options);
44
- return maybeAccounts.map((maybeAccount) => {
45
- (0, umi_1.assertAccountExists)(maybeAccount, 'TokenLedger');
46
- return deserializeTokenLedger(maybeAccount);
47
- });
48
- }
49
- async function safeFetchAllTokenLedger(context, publicKeys, options) {
50
- const maybeAccounts = await context.rpc.getAccounts(publicKeys.map((key) => (0, umi_1.publicKey)(key, false)), options);
51
- return maybeAccounts
52
- .filter((maybeAccount) => maybeAccount.exists)
53
- .map((maybeAccount) => deserializeTokenLedger(maybeAccount));
54
- }
55
- function getTokenLedgerGpaBuilder(context) {
56
- const programId = context.programs.getPublicKey('jupiter', 'JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4');
57
- return (0, umi_1.gpaBuilder)(context, programId)
58
- .registerFields({
59
- discriminator: [0, (0, serializers_1.array)((0, serializers_1.u8)(), { size: 8 })],
60
- tokenAccount: [8, (0, serializers_1.publicKey)()],
61
- amount: [40, (0, serializers_1.u64)()],
62
- })
63
- .deserializeUsing((account) => deserializeTokenLedger(account))
64
- .whereField('discriminator', [156, 247, 9, 188, 54, 108, 85, 77]);
65
- }
66
- function getTokenLedgerSize() {
67
- return 48;
68
- }