@pendle/core-v2 5.8.3-factory → 5.8.4-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 (160) hide show
  1. package/build/artifacts/contracts/interfaces/IPActionAddRemoveLiqV3.sol/IPActionAddRemoveLiqV3.dbg.json +1 -1
  2. package/build/artifacts/contracts/interfaces/IPActionMarketAuxStatic.sol/IPActionMarketAuxStatic.dbg.json +1 -1
  3. package/build/artifacts/contracts/interfaces/IPActionMiscV3.sol/IPActionMiscV3.dbg.json +1 -1
  4. package/build/artifacts/contracts/interfaces/IPActionSimple.sol/IPActionSimple.dbg.json +1 -1
  5. package/build/artifacts/contracts/interfaces/IPActionStorageStatic.sol/IPActionStorageStatic.dbg.json +1 -1
  6. package/build/artifacts/contracts/interfaces/IPActionStorageV4.sol/IPActionStorageV4.dbg.json +1 -1
  7. package/build/artifacts/contracts/interfaces/IPActionSwapPTV3.sol/IPActionSwapPTV3.dbg.json +1 -1
  8. package/build/artifacts/contracts/interfaces/IPActionSwapYTV3.sol/IPActionSwapYTV3.dbg.json +1 -1
  9. package/build/artifacts/contracts/interfaces/IPAllActionV3.sol/IPAllActionV3.dbg.json +1 -1
  10. package/build/artifacts/contracts/interfaces/IPAllEventsV3.sol/IPActionAddRemoveLiqV3Events.dbg.json +1 -1
  11. package/build/artifacts/contracts/interfaces/IPAllEventsV3.sol/IPActionMiscV3Events.dbg.json +1 -1
  12. package/build/artifacts/contracts/interfaces/IPAllEventsV3.sol/IPActionStorageEvents.dbg.json +1 -1
  13. package/build/artifacts/contracts/interfaces/IPAllEventsV3.sol/IPActionSwapPTV3Events.dbg.json +1 -1
  14. package/build/artifacts/contracts/interfaces/IPAllEventsV3.sol/IPActionSwapYTV3Events.dbg.json +1 -1
  15. package/build/artifacts/contracts/interfaces/IPAllEventsV3.sol/IPAllEventsV3.dbg.json +1 -1
  16. package/build/artifacts/contracts/interfaces/IPRouterStatic.sol/IPRouterStatic.dbg.json +1 -1
  17. package/build/artifacts/contracts/offchain-helpers/deploy/PendleCommonPoolDeployHelperV2.sol/PendleCommonPoolDeployHelperV2.dbg.json +1 -1
  18. package/build/artifacts/contracts/offchain-helpers/deploy/PendleCommonPoolDeployHelperV2.sol/PendleCommonPoolDeployHelperV2.json +2 -2
  19. package/build/artifacts/contracts/offchain-helpers/deploy/PendleCommonSYFactory.sol/PendleCommonSYFactory.dbg.json +1 -1
  20. package/build/artifacts/contracts/offchain-helpers/deploy/PendleCommonSYFactory.sol/PendleCommonSYFactory.json +21 -2
  21. package/build/artifacts/contracts/offchain-helpers/deploy/PendlePoolDeployHelper.sol/PendlePoolDeployHelper.dbg.json +1 -1
  22. package/build/artifacts/contracts/offchain-helpers/deploy/PendlePoolDeployHelper.sol/PendlePoolDeployHelper.json +2 -2
  23. package/build/artifacts/contracts/offchain-helpers/deploy/PendlePoolDeployHelperV2.sol/PendlePoolDeployHelperV2.dbg.json +1 -1
  24. package/build/artifacts/contracts/offchain-helpers/deploy/PendlePoolDeployHelperV2.sol/PendlePoolDeployHelperV2.json +2 -2
  25. package/build/artifacts/contracts/offchain-helpers/router-static/PendleRouterStatic.sol/PendleRouterStatic.dbg.json +1 -1
  26. package/build/artifacts/contracts/offchain-helpers/router-static/PendleRouterStatic.sol/PendleRouterStatic.json +2 -2
  27. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionInfoStatic.sol/ActionInfoStatic.dbg.json +1 -1
  28. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionInfoStatic.sol/ActionInfoStatic.json +2 -2
  29. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionMarketAuxStatic.sol/ActionMarketAuxStatic.dbg.json +1 -1
  30. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionMarketAuxStatic.sol/ActionMarketAuxStatic.json +2 -2
  31. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionMarketCoreStatic.sol/ActionMarketCoreStatic.dbg.json +1 -1
  32. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionMarketCoreStatic.sol/ActionMarketCoreStatic.json +2 -2
  33. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionMintRedeemStatic.sol/ActionMintRedeemStatic.dbg.json +1 -1
  34. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionMintRedeemStatic.sol/ActionMintRedeemStatic.json +2 -2
  35. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionStorageStatic.sol/ActionStorageStatic.dbg.json +1 -1
  36. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionStorageStatic.sol/ActionStorageStatic.json +2 -2
  37. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionVePendleStatic.sol/ActionVePendleStatic.dbg.json +1 -1
  38. package/build/artifacts/contracts/offchain-helpers/router-static/base/ActionVePendleStatic.sol/ActionVePendleStatic.json +2 -2
  39. package/build/artifacts/contracts/offchain-helpers/router-static/base/MarketApproxLibV1.sol/MarketApproxPtInLibV1.dbg.json +1 -1
  40. package/build/artifacts/contracts/offchain-helpers/router-static/base/MarketApproxLibV1.sol/MarketApproxPtInLibV1.json +2 -2
  41. package/build/artifacts/contracts/offchain-helpers/router-static/base/MarketApproxLibV1.sol/MarketApproxPtOutLibV1.dbg.json +1 -1
  42. package/build/artifacts/contracts/offchain-helpers/router-static/base/MarketApproxLibV1.sol/MarketApproxPtOutLibV1.json +2 -2
  43. package/build/artifacts/contracts/offchain-helpers/router-static/base/StorageLayout.sol/StorageLayout.dbg.json +1 -1
  44. package/build/artifacts/contracts/router/ActionAddRemoveLiqV3.sol/ActionAddRemoveLiqV3.dbg.json +1 -1
  45. package/build/artifacts/contracts/router/ActionAddRemoveLiqV3.sol/ActionAddRemoveLiqV3.json +2 -2
  46. package/build/artifacts/contracts/router/ActionMiscV3.sol/ActionMiscV3.dbg.json +1 -1
  47. package/build/artifacts/contracts/router/ActionMiscV3.sol/ActionMiscV3.json +2 -2
  48. package/build/artifacts/contracts/router/ActionSimple.sol/ActionSimple.dbg.json +1 -1
  49. package/build/artifacts/contracts/router/ActionSimple.sol/ActionSimple.json +2 -2
  50. package/build/artifacts/contracts/router/ActionStorageV4.sol/ActionStorageV4.dbg.json +1 -1
  51. package/build/artifacts/contracts/router/ActionStorageV4.sol/ActionStorageV4.json +2 -2
  52. package/build/artifacts/contracts/router/ActionSwapPTV3.sol/ActionSwapPTV3.dbg.json +1 -1
  53. package/build/artifacts/contracts/router/ActionSwapPTV3.sol/ActionSwapPTV3.json +2 -2
  54. package/build/artifacts/contracts/router/ActionSwapYTV3.sol/ActionSwapYTV3.dbg.json +1 -1
  55. package/build/artifacts/contracts/router/ActionSwapYTV3.sol/ActionSwapYTV3.json +2 -2
  56. package/build/artifacts/contracts/router/PendleRouterV4.sol/PendleRouterV4.dbg.json +1 -1
  57. package/build/artifacts/contracts/router/PendleRouterV4.sol/PendleRouterV4.json +2 -2
  58. package/build/artifacts/contracts/router/Reflector.sol/Reflector.dbg.json +1 -1
  59. package/build/artifacts/contracts/router/Reflector.sol/Reflector.json +2 -2
  60. package/build/artifacts/contracts/router/base/ActionBase.sol/ActionBase.dbg.json +1 -1
  61. package/build/artifacts/contracts/router/base/ActionDelegateBase.sol/ActionDelegateBase.dbg.json +1 -1
  62. package/build/artifacts/contracts/router/base/ActionDelegateBase.sol/ActionDelegateBase.json +2 -2
  63. package/build/artifacts/contracts/router/math/ApproxStateLib.sol/ApproxStateLib.dbg.json +1 -1
  64. package/build/artifacts/contracts/router/math/ApproxStateLib.sol/ApproxStateLib.json +2 -2
  65. package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtInLibOnchain.dbg.json +1 -1
  66. package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtInLibOnchain.json +2 -2
  67. package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtOutLibOnchain.dbg.json +1 -1
  68. package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtOutLibOnchain.json +2 -2
  69. package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtInLibV2.dbg.json +1 -1
  70. package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtInLibV2.json +2 -2
  71. package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtOutLibV2.dbg.json +1 -1
  72. package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtOutLibV2.json +2 -2
  73. package/build/artifacts/contracts/router/swap-aggregator/IPSwapAggregator.sol/IPSwapAggregator.dbg.json +1 -1
  74. package/build/artifacts/contracts/router/swap-aggregator/OKXScaleHelper.sol/IOKXDexRouter.dbg.json +1 -1
  75. package/build/artifacts/contracts/router/swap-aggregator/OKXScaleHelper.sol/OKXScaleHelper.dbg.json +1 -1
  76. package/build/artifacts/contracts/router/swap-aggregator/ParaswapScaleHelper.sol/IAugustusV6.dbg.json +4 -0
  77. package/build/artifacts/contracts/router/swap-aggregator/ParaswapScaleHelper.sol/IAugustusV6.json +577 -0
  78. package/build/artifacts/contracts/router/swap-aggregator/ParaswapScaleHelper.sol/ParaswapScaleHelper.dbg.json +4 -0
  79. package/build/artifacts/contracts/router/swap-aggregator/ParaswapScaleHelper.sol/ParaswapScaleHelper.json +10 -0
  80. package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/IKyberScalingHelper.dbg.json +1 -1
  81. package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/IOdosRouterV2.dbg.json +1 -1
  82. package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/PendleSwap.dbg.json +1 -1
  83. package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/PendleSwap.json +191 -2
  84. package/contracts/offchain-helpers/deploy/PendleCommonSYFactory.sol +2 -0
  85. package/contracts/offchain-helpers/deploy/PendlePoolDeployHelperV2.sol +1 -5
  86. package/contracts/router/swap-aggregator/IPSwapAggregator.sol +1 -1
  87. package/contracts/router/swap-aggregator/OKXScaleHelper.sol +13 -10
  88. package/contracts/router/swap-aggregator/ParaswapScaleHelper.sol +252 -0
  89. package/contracts/router/swap-aggregator/PendleSwap.sol +25 -5
  90. package/deployments/1-core.json +2 -2
  91. package/deployments/10-core.json +2 -2
  92. package/deployments/146-core.json +9 -10
  93. package/deployments/42161-core.json +3 -3
  94. package/deployments/5000-core.json +2 -2
  95. package/deployments/56-core.json +2 -2
  96. package/deployments/80094-core.json +2 -2
  97. package/deployments/8453-core.json +2 -2
  98. package/package.json +1 -1
  99. package/typechain-types/PendleCommonSYFactory.ts +31 -0
  100. package/typechain-types/PendleSwap.ts +280 -0
  101. package/typechain-types/factories/ActionAddRemoveLiqV3__factory.ts +1 -1
  102. package/typechain-types/factories/ActionInfoStatic__factory.ts +1 -1
  103. package/typechain-types/factories/ActionMarketAuxStatic__factory.ts +1 -1
  104. package/typechain-types/factories/ActionMarketCoreStatic__factory.ts +1 -1
  105. package/typechain-types/factories/ActionMintRedeemStatic__factory.ts +1 -1
  106. package/typechain-types/factories/ActionMiscV3__factory.ts +1 -1
  107. package/typechain-types/factories/ActionSimple__factory.ts +1 -1
  108. package/typechain-types/factories/ActionStorageStatic__factory.ts +1 -1
  109. package/typechain-types/factories/ActionStorageV4__factory.ts +1 -1
  110. package/typechain-types/factories/ActionSwapPTV3__factory.ts +1 -1
  111. package/typechain-types/factories/ActionSwapYTV3__factory.ts +1 -1
  112. package/typechain-types/factories/ActionVePendleStatic__factory.ts +1 -1
  113. package/typechain-types/factories/PendleCommonPoolDeployHelperV2__factory.ts +1 -1
  114. package/typechain-types/factories/PendleCommonSYFactory__factory.ts +20 -1
  115. package/typechain-types/factories/PendlePoolDeployHelperV2__factory.ts +1 -1
  116. package/typechain-types/factories/PendlePoolDeployHelper__factory.ts +1 -1
  117. package/typechain-types/factories/PendleRouterStatic__factory.ts +1 -1
  118. package/typechain-types/factories/PendleRouterV4__factory.ts +1 -1
  119. package/typechain-types/factories/PendleSwap__factory.ts +190 -1
  120. package/typechain-types/factories/Reflector__factory.ts +1 -1
  121. package/typechain-types/hardhat.d.ts +0 -18
  122. package/typechain-types/index.ts +0 -4
  123. package/build/artifacts/contracts/interfaces/IPMarketSwapNSeed.sol/IPMarketSwapNSeed.dbg.json +0 -4
  124. package/build/artifacts/contracts/interfaces/IPMarketSwapNSeed.sol/IPMarketSwapNSeed.json +0 -10
  125. package/build/artifacts/contracts/offchain-helpers/SwapNSeed.sol/MarketSwapNSeed.dbg.json +0 -4
  126. package/build/artifacts/contracts/offchain-helpers/SwapNSeed.sol/MarketSwapNSeed.json +0 -232
  127. package/build/artifacts/contracts/router/swap-aggregator/OneInchScaleHelper.sol/I1inchAggregationRouterV6.dbg.json +0 -4
  128. package/build/artifacts/contracts/router/swap-aggregator/OneInchScaleHelper.sol/I1inchAggregationRouterV6.json +0 -214
  129. package/build/artifacts/contracts/router/swap-aggregator/OneInchScaleHelper.sol/I1inchCommonType.dbg.json +0 -4
  130. package/build/artifacts/contracts/router/swap-aggregator/OneInchScaleHelper.sol/I1inchCommonType.json +0 -10
  131. package/build/artifacts/contracts/router/swap-aggregator/OneInchScaleHelper.sol/OneInchScaleHelper.dbg.json +0 -4
  132. package/build/artifacts/contracts/router/swap-aggregator/OneInchScaleHelper.sol/OneInchScaleHelper.json +0 -10
  133. package/contracts/interfaces/IPMarketSwapNSeed.sol +0 -10
  134. package/contracts/offchain-helpers/SwapNSeed.sol +0 -221
  135. package/contracts/router/swap-aggregator/OneInchScaleHelper.sol +0 -120
  136. package/deployments/merkle-distribution/2023-04-27.json +0 -3342
  137. package/deployments/merkle-distribution/2023-05-25.json +0 -3749
  138. package/deployments/merkle-distribution/2023-06-29.json +0 -4729
  139. package/deployments/merkle-distribution/2023-07-27.json +0 -5525
  140. package/deployments/merkle-distribution/2023-08-31.json +0 -6135
  141. package/deployments/merkle-distribution/2023-09-28.json +0 -6770
  142. package/deployments/merkle-distribution/2023-10-26.json +0 -7300
  143. package/deployments/merkle-distribution/2023-11-30.json +0 -7730
  144. package/deployments/merkle-distribution/2023-12-28.json +0 -8225
  145. package/deployments/merkle-distribution/2024-01-25.json +0 -9615
  146. package/deployments/merkle-distribution/2024-02-29.json +0 -12125
  147. package/deployments/merkle-distribution/2024-03-28.json +0 -12725
  148. package/deployments/merkle-distribution/2024-04-25.json +0 -14930
  149. package/deployments/merkle-distribution/2024-05-30.json +0 -17255
  150. package/deployments/merkle-distribution/2024-06-27.json +0 -18995
  151. package/deployments/merkle-distribution/2024-07-25.json +0 -20365
  152. package/deployments/merkle-distribution/2024-08-29.json +0 -21525
  153. package/deployments/merkle-distribution/2024-09-26-retroactive.json +0 -21525
  154. package/deployments/merkle-distribution/2024-09-26.json +0 -22340
  155. package/deployments/merkle-distribution/2024-10-31.json +0 -23370
  156. package/deployments/merkle-distribution/2024-11-28.json +0 -24040
  157. package/deployments/merkle-distribution/2024-12-26.json +0 -25555
  158. package/deployments/merkle-distribution/2024-12-31-snapshot.json +0 -65767
  159. package/deployments/merkle-distribution/2025-01-30.json +0 -28060
  160. package/deployments/merkle-distribution/2025-02-27.json +0 -29930
@@ -1,221 +0,0 @@
1
- // SPDX-License-Identifier: MIT
2
-
3
- pragma solidity ^0.8.17;
4
-
5
- import "../interfaces/IPMarket.sol";
6
- import "../router/math/MarketApproxLibOnchain.sol";
7
- import "../router/base/ActionBase.sol";
8
- import "../interfaces/IPMarketSwapNSeed.sol";
9
-
10
- contract MarketSwapNSeed is ActionBase, IPMarketSwapNSeed {
11
- using PMath for uint256;
12
- using PMath for int256;
13
- using PYIndexLib for PYIndex;
14
- using MarketMathCore for MarketState;
15
- using PYIndexLib for IPYieldToken;
16
-
17
- address public immutable router;
18
-
19
- uint256 public constant MAX_ITERATIONS = 30;
20
-
21
- struct MarketTokens {
22
- IStandardizedYield SY;
23
- IPPrincipalToken PT;
24
- IPYieldToken YT;
25
- }
26
-
27
- constructor(address _router) {
28
- router = _router;
29
- }
30
-
31
- function swapNSeed(
32
- address receiver,
33
- address market,
34
- uint256 minLpOut,
35
- uint256 minYtOut,
36
- TokenInput calldata input,
37
- SwapNSeedData calldata snsData
38
- ) external payable returns (int256 amountPYToAccount, uint256 netLpOut, uint256 netYtOut) {
39
- MarketTokens memory tokens;
40
- (tokens.SY, tokens.PT, tokens.YT) = IPMarket(market).readTokens();
41
-
42
- _mintSyFromToken(address(this), address(tokens.SY), 1, input);
43
- amountPYToAccount = _swapBeforeSeeding(receiver, market, tokens, snsData);
44
- (netLpOut, netYtOut, ) = _addLiquiditySingleSyKeepYt(
45
- receiver,
46
- market,
47
- tokens.SY,
48
- tokens.YT,
49
- _selfBalance(tokens.SY),
50
- minLpOut,
51
- minYtOut
52
- );
53
- }
54
-
55
- function _addLiquiditySingleSyKeepYt(
56
- address receiver,
57
- address market,
58
- IStandardizedYield SY,
59
- IPYieldToken YT,
60
- uint256 netSyIn,
61
- uint256 minLpOut,
62
- uint256 minYtOut
63
- ) internal returns (uint256 netLpOut, uint256 netYtOut, uint256 netSyMintPy) {
64
- MarketState memory state = _readMarket(market);
65
-
66
- PYIndex pyIndex = YT.newIndex();
67
-
68
- netSyMintPy =
69
- (netSyIn * state.totalPt.Uint()) /
70
- (state.totalPt.Uint() + pyIndex.syToAsset(state.totalSy.Uint()));
71
-
72
- uint256 netSyAddLiquidity = netSyIn - netSyMintPy;
73
-
74
- // transfer SY to mint PY
75
- _transferOut(address(SY), address(YT), netSyMintPy);
76
-
77
- // the rest of SY goes to market
78
- _transferOut(address(SY), market, netSyAddLiquidity);
79
-
80
- // PT goes to market, YT goes to receiver
81
- netYtOut = YT.mintPY(market, receiver);
82
-
83
- (netLpOut, , ) = IPMarket(market).mint(receiver, netSyAddLiquidity, netYtOut);
84
-
85
- if (netLpOut < minLpOut) revert("Slippage: INSUFFICIENT_LP_OUT");
86
- if (netYtOut < minYtOut) revert("Slippage: INSUFFICIENT_YT_OUT");
87
- }
88
-
89
- function _swapBeforeSeeding(
90
- address receiver,
91
- address market,
92
- MarketTokens memory tokens,
93
- SwapNSeedData memory snsData
94
- ) internal returns (int256 amountPYToAccount) {
95
- PYIndex index = _getPYIndex(market);
96
- MarketState memory state = _readMarket(market);
97
- MarketPreCompute memory comp = state.getMarketPreCompute(index, block.timestamp);
98
-
99
- if (state.lastLnImpliedRate > snsData.targetLnImpliedRate) {
100
- // Normalize maxPtToSwap
101
- snsData.maxPtToSwap = PMath.min(
102
- snsData.maxPtToSwap,
103
- MarketApproxPtInLibOnchain.calcSoftMaxPtIn(state, comp)
104
- );
105
-
106
- (int256 amountPtToBuy, int256 amountSyToAccount) = _calcAmountPtToBuy(state, comp, index, snsData);
107
- amountPYToAccount = amountPtToBuy;
108
-
109
- _transferOut(address(tokens.SY), market, amountSyToAccount.abs());
110
- IPMarket(market).swapSyForExactPt(receiver, amountPtToBuy.abs(), EMPTY_BYTES);
111
- } else {
112
- // Normalize maxPtToSwap
113
- snsData.maxPtToSwap = PMath.min(
114
- snsData.maxPtToSwap,
115
- MarketApproxPtOutLibOnchain.calcMaxPtOut(comp, state.totalPt)
116
- );
117
-
118
- amountPYToAccount = _calcAmountPtToSell(state, comp, index, snsData);
119
- uint256 amountPtToSell = amountPYToAccount.abs();
120
- uint256 netPyOut = _mintPyFromSy(
121
- address(this),
122
- address(tokens.SY),
123
- address(tokens.YT),
124
- index.assetToSyUp(amountPtToSell),
125
- amountPtToSell,
126
- false
127
- );
128
-
129
- _transferOut(address(tokens.PT), market, netPyOut);
130
- _transferOut(address(tokens.YT), receiver, netPyOut);
131
-
132
- // this amount of SY will be used to add liquidity in later step
133
- IPMarket(market).swapExactPtForSy(address(this), amountPtToSell, EMPTY_BYTES);
134
- }
135
- }
136
-
137
- function _calcAmountPtToBuy(
138
- MarketState memory state,
139
- MarketPreCompute memory comp,
140
- PYIndex index,
141
- SwapNSeedData memory snsData
142
- ) internal pure returns (int256 amountPtToSwapToAccount, int256 amountSyToAccount) {
143
- int256 refAmt = snsData.maxPtToSwap.Int();
144
- int256 accPtToAccount = 0;
145
-
146
- int256 lastGoodAmountSyToAccount = 0;
147
- uint256 lastGoodRate = state.lastLnImpliedRate;
148
-
149
- for (uint256 iter = 0; iter < MAX_ITERATIONS; ++iter) {
150
- refAmt /= 2;
151
- MarketState memory localState = _deepCopy(state);
152
- int256 curPtToAccount = accPtToAccount + refAmt;
153
-
154
- // Will not revert. maxPtToBuy should already be normalized
155
- (int256 localAmountSyToAccount, , ) = localState.calcTrade(comp, index, curPtToAccount);
156
-
157
- if (localState.lastLnImpliedRate > snsData.targetLnImpliedRate) {
158
- accPtToAccount += refAmt;
159
- lastGoodRate = localState.lastLnImpliedRate;
160
- lastGoodAmountSyToAccount = localAmountSyToAccount;
161
- }
162
- }
163
-
164
- if (PMath.isAApproxB(snsData.targetLnImpliedRate, lastGoodRate, snsData.eps)) {
165
- amountPtToSwapToAccount = accPtToAccount;
166
- amountSyToAccount = lastGoodAmountSyToAccount;
167
- } else {
168
- revert("_calcAmountPtToBuy: failed");
169
- }
170
- }
171
-
172
- function _calcAmountPtToSell(
173
- MarketState memory state,
174
- MarketPreCompute memory comp,
175
- PYIndex index,
176
- SwapNSeedData memory snsData
177
- ) internal pure returns (int256 amountPtToSwapToAccount) {
178
- int256 refAmt = snsData.maxPtToSwap.Int();
179
- int256 accPtToAccount = 0;
180
- uint256 lastGoodRate = state.lastLnImpliedRate;
181
-
182
- for (uint256 iter = 0; iter < MAX_ITERATIONS; ++iter) {
183
- refAmt /= 2;
184
- MarketState memory localState = _deepCopy(state);
185
- int256 curPtToAccount = accPtToAccount - refAmt;
186
-
187
- // Will not revert. maxPtToSell should already be normalized
188
- localState.calcTrade(comp, index, curPtToAccount);
189
-
190
- if (localState.lastLnImpliedRate < snsData.targetLnImpliedRate) {
191
- accPtToAccount -= refAmt;
192
- lastGoodRate = localState.lastLnImpliedRate;
193
- }
194
- }
195
-
196
- if (PMath.isAApproxB(snsData.targetLnImpliedRate, lastGoodRate, snsData.eps)) {
197
- amountPtToSwapToAccount = accPtToAccount;
198
- } else {
199
- revert("_calcAmountPtToSell: failed");
200
- }
201
- }
202
-
203
- function _getPYIndex(address market) internal returns (PYIndex) {
204
- (, , IPYieldToken YT) = IPMarket(market).readTokens();
205
- return PYIndex.wrap(YT.pyIndexCurrent());
206
- }
207
-
208
- function _deepCopy(MarketState memory state) internal pure returns (MarketState memory copiedState) {
209
- copiedState.totalPt = state.totalPt;
210
- copiedState.totalSy = state.totalSy;
211
- copiedState.totalLp = state.totalLp;
212
- copiedState.treasury = state.treasury;
213
-
214
- copiedState.scalarRoot = state.scalarRoot;
215
- copiedState.expiry = state.expiry;
216
-
217
- copiedState.lnFeeRateRoot = state.lnFeeRateRoot;
218
- copiedState.reserveFeePercent = state.reserveFeePercent;
219
- copiedState.lastLnImpliedRate = state.lastLnImpliedRate;
220
- }
221
- }
@@ -1,120 +0,0 @@
1
- // SPDX-License-Identifier: GPL-3.0-or-later
2
- pragma solidity ^0.8.17;
3
- import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
4
-
5
- interface I1inchCommonType {
6
- type Address256 is uint256;
7
- }
8
-
9
- abstract contract OneInchScaleHelper is I1inchCommonType {
10
- function _rescaleMinAmount(
11
- uint256 minAmount,
12
- uint256 oldAmount,
13
- uint256 newAmount
14
- ) internal pure returns (uint256) {
15
- return (minAmount * newAmount) / oldAmount;
16
- }
17
-
18
- function _oneInchScaling(bytes calldata rawCallData, uint256 actualAmount) internal pure returns (bytes memory) {
19
- bytes4 selector = bytes4(rawCallData[:4]);
20
- bytes memory args = rawCallData[4:];
21
-
22
- if (selector == I1inchAggregationRouterV6.unoswapTo.selector) {
23
- (Address256 to, Address256 token, uint256 amount, uint256 minReturn, Address256 dex) = abi.decode(
24
- args,
25
- (Address256, Address256, uint256, uint256, Address256)
26
- );
27
-
28
- minReturn = (minReturn * actualAmount) / amount;
29
- amount = actualAmount;
30
- return abi.encodeWithSelector(selector, to, token, amount, minReturn, dex);
31
- }
32
-
33
- if (selector == I1inchAggregationRouterV6.unoswapTo2.selector) {
34
- (Address256 to, Address256 token, uint256 amount, uint256 minReturn, Address256 dex, Address256 dex2) = abi
35
- .decode(args, (Address256, Address256, uint256, uint256, Address256, Address256));
36
-
37
- minReturn = (minReturn * actualAmount) / amount;
38
- amount = actualAmount;
39
-
40
- return abi.encodeWithSelector(selector, to, token, amount, minReturn, dex, dex2);
41
- }
42
-
43
- if (selector == I1inchAggregationRouterV6.unoswapTo3.selector) {
44
- (
45
- Address256 to,
46
- Address256 token,
47
- uint256 amount,
48
- uint256 minReturn,
49
- Address256 dex,
50
- Address256 dex2,
51
- Address256 dex3
52
- ) = abi.decode(args, (Address256, Address256, uint256, uint256, Address256, Address256, Address256));
53
-
54
- minReturn = (minReturn * actualAmount) / amount;
55
- amount = actualAmount;
56
-
57
- return abi.encodeWithSelector(selector, to, token, amount, minReturn, dex, dex2, dex3);
58
- }
59
-
60
- if (selector == I1inchAggregationRouterV6.swap.selector) {
61
- (address executor, I1inchAggregationRouterV6.SwapDescription memory desc, bytes memory data) = abi.decode(
62
- args,
63
- (address, I1inchAggregationRouterV6.SwapDescription, bytes)
64
- );
65
-
66
- desc.minReturnAmount = (desc.minReturnAmount * actualAmount) / desc.amount;
67
- desc.amount = actualAmount;
68
- return abi.encodeWithSelector(selector, executor, desc, data);
69
- }
70
-
71
- revert("1inch: unsupported selector");
72
- }
73
- }
74
-
75
- interface I1inchAggregationRouterV6 is I1inchCommonType {
76
- struct SwapDescription {
77
- IERC20 srcToken;
78
- IERC20 dstToken;
79
- address payable srcReceiver;
80
- address payable dstReceiver;
81
- uint256 amount;
82
- uint256 minReturnAmount;
83
- uint256 flags;
84
- }
85
-
86
- // we ignore the non-to version since it's guarantee this contract won't receive tokens
87
-
88
- function unoswapTo(
89
- Address256 to,
90
- Address256 token,
91
- uint256 amount,
92
- uint256 minReturn,
93
- Address256 dex
94
- ) external returns (uint256 returnAmount);
95
-
96
- function unoswapTo2(
97
- Address256 to,
98
- Address256 token,
99
- uint256 amount,
100
- uint256 minReturn,
101
- Address256 dex,
102
- Address256 dex2
103
- ) external returns (uint256 returnAmount);
104
-
105
- function unoswapTo3(
106
- Address256 to,
107
- Address256 token,
108
- uint256 amount,
109
- uint256 minReturn,
110
- Address256 dex,
111
- Address256 dex2,
112
- Address256 dex3
113
- ) external returns (uint256 returnAmount);
114
-
115
- function swap(
116
- address executor,
117
- SwapDescription calldata desc,
118
- bytes calldata data
119
- ) external payable returns (uint256 returnAmount, uint256 spentAmount);
120
- }