@pendle/core-v2 0.5.1-beta-4 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (126) hide show
  1. package/contracts/SuperComposableYield/ISuperComposableYield.sol +2 -0
  2. package/contracts/SuperComposableYield/implementations/RewardManager.sol +35 -20
  3. package/contracts/SuperComposableYield/implementations/SCYBase.sol +39 -19
  4. package/contracts/SuperComposableYield/implementations/SCYBaseWithRewards.sol +26 -14
  5. package/contracts/core/PendleBaseToken.sol +2 -2
  6. package/contracts/core/PendleMarket.sol +145 -61
  7. package/contracts/core/PendleMarketFactory.sol +30 -19
  8. package/contracts/core/{PendleOwnershipToken.sol → PendlePrincipalToken.sol} +14 -2
  9. package/contracts/core/PendleRouter.sol +23 -9
  10. package/contracts/core/PendleSCYImpl/AaveV3/PendleAaveV3SCY.sol +21 -20
  11. package/contracts/core/PendleSCYImpl/PendleBenQiErc20SCY.sol +22 -16
  12. package/contracts/core/PendleSCYImpl/PendleBtrflySCY.sol +13 -13
  13. package/contracts/core/PendleSCYImpl/PendleStETHSCY.sol +107 -0
  14. package/contracts/core/PendleSCYImpl/PendleYearnVaultSCY.sol +14 -15
  15. package/contracts/core/PendleYieldContractFactory.sol +29 -14
  16. package/contracts/core/PendleYieldToken.sol +130 -76
  17. package/contracts/core/RouterStatic.sol +16 -157
  18. package/contracts/core/actions/ActionCallback.sol +36 -18
  19. package/contracts/core/actions/ActionCore.sol +41 -88
  20. package/contracts/core/actions/ActionRedeem.sol +36 -0
  21. package/contracts/core/actions/ActionYT.sol +41 -59
  22. package/contracts/core/actions/base/{ActionSCYAndOTBase.sol → ActionSCYAndPTBase.sol} +59 -45
  23. package/contracts/core/actions/base/{ActionSCYAndYOBase.sol → ActionSCYAndPYBase.sol} +57 -19
  24. package/contracts/core/actions/base/ActionSCYAndYTBase.sol +31 -21
  25. package/contracts/interfaces/IPActionCore.sol +21 -28
  26. package/contracts/interfaces/IPActionRedeem.sol +17 -0
  27. package/contracts/interfaces/IPActionYT.sol +5 -12
  28. package/contracts/interfaces/IPAllAction.sol +2 -2
  29. package/contracts/interfaces/IPMarket.sol +33 -10
  30. package/contracts/interfaces/IPMarketAddRemoveCallback.sol +2 -2
  31. package/contracts/interfaces/IPMarketFactory.sol +3 -1
  32. package/contracts/interfaces/IPMarketSwapCallback.sol +1 -1
  33. package/contracts/interfaces/{IPOwnershipToken.sol → IPPrincipalToken.sol} +1 -1
  34. package/contracts/interfaces/IPRouterStatic.sol +7 -82
  35. package/contracts/interfaces/IPYieldContractFactory.sol +10 -2
  36. package/contracts/interfaces/IPYieldToken.sol +14 -5
  37. package/contracts/interfaces/IWstETH.sol +10 -0
  38. package/contracts/libraries/JoeLibrary.sol +1 -1
  39. package/contracts/libraries/math/LogExpMath.sol +1 -1
  40. package/contracts/libraries/math/MarketApproxLib.sol +128 -88
  41. package/contracts/libraries/math/MarketMathAux.sol +13 -13
  42. package/contracts/libraries/math/MarketMathCore.sol +62 -93
  43. package/contracts/libraries/math/Math.sol +14 -2
  44. package/contracts/periphery/PendleGovernanceManager.sol +5 -3
  45. package/package.json +3 -2
  46. package/typechain-types/ActionCallback.ts +5 -5
  47. package/typechain-types/ActionCore.ts +312 -234
  48. package/typechain-types/ActionRedeem.ts +125 -0
  49. package/typechain-types/ActionSCYAndPYBase.ts +223 -0
  50. package/typechain-types/ActionSCYAndYOBase.ts +129 -3
  51. package/typechain-types/ActionSCYAndYTBase.ts +149 -3
  52. package/typechain-types/ActionYT.ts +192 -94
  53. package/typechain-types/IPActionCore.ts +183 -231
  54. package/typechain-types/IPActionRedeem.ts +125 -0
  55. package/typechain-types/IPActionYT.ts +43 -91
  56. package/typechain-types/IPAllAction.ts +258 -321
  57. package/typechain-types/IPMarket.ts +150 -50
  58. package/typechain-types/IPMarketAddRemoveCallback.ts +10 -10
  59. package/typechain-types/IPMarketFactory.ts +28 -6
  60. package/typechain-types/IPMarketSwapCallback.ts +5 -5
  61. package/typechain-types/{IPOwnershipToken.ts → IPPrincipalToken.ts} +5 -5
  62. package/typechain-types/IPRouterStatic.ts +50 -530
  63. package/typechain-types/IPYieldContractFactory.ts +85 -19
  64. package/typechain-types/IPYieldToken.ts +138 -37
  65. package/typechain-types/ISuperComposableYield.ts +13 -0
  66. package/typechain-types/IWstETH.ts +149 -0
  67. package/typechain-types/PendleAaveV3SCY.ts +110 -0
  68. package/typechain-types/PendleBaseToken.ts +1 -1
  69. package/typechain-types/PendleBenQiErc20SCY.ts +55 -12
  70. package/typechain-types/PendleBtrflyScy.ts +27 -23
  71. package/typechain-types/PendleGovernanceManager.ts +5 -5
  72. package/typechain-types/PendleMarket.ts +197 -100
  73. package/typechain-types/PendleMarketFactory.ts +96 -34
  74. package/typechain-types/{PendleOwnershipToken.ts → PendlePrincipalToken.ts} +15 -6
  75. package/typechain-types/PendleRouter.ts +19 -0
  76. package/typechain-types/PendleRouterRedeemUpg.ts +125 -0
  77. package/typechain-types/PendleStEthSCY.ts +872 -0
  78. package/typechain-types/PendleYearnVaultScy.ts +27 -23
  79. package/typechain-types/PendleYieldContractFactory.ts +94 -28
  80. package/typechain-types/PendleYieldToken.ts +142 -57
  81. package/typechain-types/RewardManager.ts +21 -0
  82. package/typechain-types/RouterStatic.ts +50 -530
  83. package/typechain-types/SCYBase.ts +25 -0
  84. package/typechain-types/SCYBaseWithRewards.ts +64 -0
  85. package/typechain-types/factories/ActionCallback__factory.ts +2 -2
  86. package/typechain-types/factories/ActionCore__factory.ts +263 -79
  87. package/typechain-types/factories/ActionRedeem__factory.ts +105 -0
  88. package/typechain-types/factories/ActionSCYAndPYBase__factory.ts +200 -0
  89. package/typechain-types/factories/ActionSCYAndYOBase__factory.ts +148 -0
  90. package/typechain-types/factories/ActionSCYAndYTBase__factory.ts +173 -0
  91. package/typechain-types/factories/ActionYT__factory.ts +265 -56
  92. package/typechain-types/factories/IPActionCore__factory.ts +114 -78
  93. package/typechain-types/factories/IPActionRedeem__factory.ts +70 -0
  94. package/typechain-types/factories/IPActionYT__factory.ts +90 -54
  95. package/typechain-types/factories/IPAllAction__factory.ts +254 -138
  96. package/typechain-types/factories/IPMarketAddRemoveCallback__factory.ts +2 -2
  97. package/typechain-types/factories/IPMarketFactory__factory.ts +26 -1
  98. package/typechain-types/factories/IPMarketSwapCallback__factory.ts +1 -1
  99. package/typechain-types/factories/IPMarket__factory.ts +125 -13
  100. package/typechain-types/factories/{IPOwnershipToken__factory.ts → IPPrincipalToken__factory.ts} +8 -8
  101. package/typechain-types/factories/IPRouterStatic__factory.ts +12 -628
  102. package/typechain-types/factories/IPYieldContractFactory__factory.ts +72 -2
  103. package/typechain-types/factories/IPYieldToken__factory.ts +93 -7
  104. package/typechain-types/factories/ISuperComposableYield__factory.ts +13 -0
  105. package/typechain-types/factories/IWstETH__factory.ts +74 -0
  106. package/typechain-types/factories/PendleAaveV3SCY__factory.ts +97 -3
  107. package/typechain-types/factories/PendleBaseToken__factory.ts +1 -1
  108. package/typechain-types/factories/PendleBenQiErc20SCY__factory.ts +62 -7
  109. package/typechain-types/factories/PendleBtrflyScy__factory.ts +42 -19
  110. package/typechain-types/factories/PendleGovernanceManager__factory.ts +2 -2
  111. package/typechain-types/factories/PendleMarketFactory__factory.ts +66 -15
  112. package/typechain-types/factories/PendleMarket__factory.ts +170 -53
  113. package/typechain-types/factories/PendlePrincipalToken__factory.ts +540 -0
  114. package/typechain-types/factories/PendleRouterRedeemUpg__factory.ts +112 -0
  115. package/typechain-types/factories/PendleRouter__factory.ts +23 -1
  116. package/typechain-types/factories/PendleStEthSCY__factory.ts +716 -0
  117. package/typechain-types/factories/PendleYearnVaultScy__factory.ts +41 -18
  118. package/typechain-types/factories/PendleYieldContractFactory__factory.ts +75 -5
  119. package/typechain-types/factories/PendleYieldToken__factory.ts +102 -33
  120. package/typechain-types/factories/RewardManager__factory.ts +13 -0
  121. package/typechain-types/factories/RouterStatic__factory.ts +13 -629
  122. package/typechain-types/factories/SCYBaseWithRewards__factory.ts +60 -2
  123. package/typechain-types/factories/SCYBase__factory.ts +28 -2
  124. package/typechain-types/hardhat.d.ts +52 -16
  125. package/typechain-types/index.ts +14 -6
  126. package/typechain-types/factories/PendleOwnershipToken__factory.ts +0 -527
@@ -22,174 +22,29 @@ import type {
22
22
  OnEvent,
23
23
  } from "./common";
24
24
 
25
- export type MarketStateStruct = {
26
- totalOt: BigNumberish;
27
- totalScy: BigNumberish;
28
- totalLp: BigNumberish;
29
- oracleRate: BigNumberish;
30
- treasury: string;
31
- scalarRoot: BigNumberish;
32
- feeRateRoot: BigNumberish;
33
- rateOracleTimeWindow: BigNumberish;
34
- expiry: BigNumberish;
35
- reserveFeePercent: BigNumberish;
36
- lastImpliedRate: BigNumberish;
37
- lastTradeTime: BigNumberish;
38
- };
39
-
40
- export type MarketStateStructOutput = [
41
- BigNumber,
42
- BigNumber,
43
- BigNumber,
44
- BigNumber,
45
- string,
46
- BigNumber,
47
- BigNumber,
48
- BigNumber,
49
- BigNumber,
50
- BigNumber,
51
- BigNumber,
52
- BigNumber
53
- ] & {
54
- totalOt: BigNumber;
55
- totalScy: BigNumber;
56
- totalLp: BigNumber;
57
- oracleRate: BigNumber;
58
- treasury: string;
59
- scalarRoot: BigNumber;
60
- feeRateRoot: BigNumber;
61
- rateOracleTimeWindow: BigNumber;
62
- expiry: BigNumber;
63
- reserveFeePercent: BigNumber;
64
- lastImpliedRate: BigNumber;
65
- lastTradeTime: BigNumber;
66
- };
67
-
68
- export declare namespace IPRouterStatic {
69
- export type TokenAmountStruct = { token: string; amount: BigNumberish };
70
-
71
- export type TokenAmountStructOutput = [string, BigNumber] & {
72
- token: string;
73
- amount: BigNumber;
74
- };
75
-
76
- export type UserMarketInfoStruct = {
77
- market: string;
78
- lpBalance: BigNumberish;
79
- otBalance: IPRouterStatic.TokenAmountStruct;
80
- scyBalance: IPRouterStatic.TokenAmountStruct;
81
- assetBalance: IPRouterStatic.TokenAmountStruct;
82
- };
83
-
84
- export type UserMarketInfoStructOutput = [
85
- string,
86
- BigNumber,
87
- IPRouterStatic.TokenAmountStructOutput,
88
- IPRouterStatic.TokenAmountStructOutput,
89
- IPRouterStatic.TokenAmountStructOutput
90
- ] & {
91
- market: string;
92
- lpBalance: BigNumber;
93
- otBalance: IPRouterStatic.TokenAmountStructOutput;
94
- scyBalance: IPRouterStatic.TokenAmountStructOutput;
95
- assetBalance: IPRouterStatic.TokenAmountStructOutput;
96
- };
97
-
98
- export type UserYOInfoStruct = {
99
- yt: string;
100
- ot: string;
101
- ytBalance: BigNumberish;
102
- otBalance: BigNumberish;
103
- unclaimedInterest: IPRouterStatic.TokenAmountStruct;
104
- unclaimedRewards: IPRouterStatic.TokenAmountStruct[];
105
- };
106
-
107
- export type UserYOInfoStructOutput = [
108
- string,
109
- string,
110
- BigNumber,
111
- BigNumber,
112
- IPRouterStatic.TokenAmountStructOutput,
113
- IPRouterStatic.TokenAmountStructOutput[]
114
- ] & {
115
- yt: string;
116
- ot: string;
117
- ytBalance: BigNumber;
118
- otBalance: BigNumber;
119
- unclaimedInterest: IPRouterStatic.TokenAmountStructOutput;
120
- unclaimedRewards: IPRouterStatic.TokenAmountStructOutput[];
121
- };
122
-
123
- export type RewardIndexStruct = { rewardToken: string; index: BigNumberish };
124
-
125
- export type RewardIndexStructOutput = [string, BigNumber] & {
126
- rewardToken: string;
127
- index: BigNumber;
128
- };
129
- }
130
-
131
25
  export interface IPRouterStaticInterface extends utils.Interface {
132
26
  contractName: "IPRouterStatic";
133
27
  functions: {
134
28
  "addLiquidityStatic(address,uint256,uint256)": FunctionFragment;
135
- "getMarketInfo(address)": FunctionFragment;
136
- "getOtImpliedYield(address)": FunctionFragment;
137
29
  "getPendleTokenType(address)": FunctionFragment;
138
- "getUserMarketInfo(address,address)": FunctionFragment;
139
- "getUserMarketPositions(address,address[])": FunctionFragment;
140
- "getUserSCYInfo(address,address)": FunctionFragment;
141
- "getUserYOInfo(address,address)": FunctionFragment;
142
- "getUserYOPositionsByYOs(address,address[])": FunctionFragment;
143
- "getYO(address)": FunctionFragment;
144
- "getYOInfo(address)": FunctionFragment;
145
- "hasYOPosition((address,address,uint256,uint256,(address,uint256),(address,uint256)[]))": FunctionFragment;
30
+ "getPtImpliedYield(address)": FunctionFragment;
146
31
  "removeLiquidityStatic(address,uint256)": FunctionFragment;
147
32
  "scyIndex(address)": FunctionFragment;
148
- "swapOtForScyStatic(address,uint256)": FunctionFragment;
149
- "swapScyForOtStatic(address,uint256)": FunctionFragment;
33
+ "swapPtForScyStatic(address,uint256)": FunctionFragment;
34
+ "swapScyForPtStatic(address,uint256)": FunctionFragment;
150
35
  };
151
36
 
152
37
  encodeFunctionData(
153
38
  functionFragment: "addLiquidityStatic",
154
39
  values: [string, BigNumberish, BigNumberish]
155
40
  ): string;
156
- encodeFunctionData(
157
- functionFragment: "getMarketInfo",
158
- values: [string]
159
- ): string;
160
- encodeFunctionData(
161
- functionFragment: "getOtImpliedYield",
162
- values: [string]
163
- ): string;
164
41
  encodeFunctionData(
165
42
  functionFragment: "getPendleTokenType",
166
43
  values: [string]
167
44
  ): string;
168
45
  encodeFunctionData(
169
- functionFragment: "getUserMarketInfo",
170
- values: [string, string]
171
- ): string;
172
- encodeFunctionData(
173
- functionFragment: "getUserMarketPositions",
174
- values: [string, string[]]
175
- ): string;
176
- encodeFunctionData(
177
- functionFragment: "getUserSCYInfo",
178
- values: [string, string]
179
- ): string;
180
- encodeFunctionData(
181
- functionFragment: "getUserYOInfo",
182
- values: [string, string]
183
- ): string;
184
- encodeFunctionData(
185
- functionFragment: "getUserYOPositionsByYOs",
186
- values: [string, string[]]
187
- ): string;
188
- encodeFunctionData(functionFragment: "getYO", values: [string]): string;
189
- encodeFunctionData(functionFragment: "getYOInfo", values: [string]): string;
190
- encodeFunctionData(
191
- functionFragment: "hasYOPosition",
192
- values: [IPRouterStatic.UserYOInfoStruct]
46
+ functionFragment: "getPtImpliedYield",
47
+ values: [string]
193
48
  ): string;
194
49
  encodeFunctionData(
195
50
  functionFragment: "removeLiquidityStatic",
@@ -197,11 +52,11 @@ export interface IPRouterStaticInterface extends utils.Interface {
197
52
  ): string;
198
53
  encodeFunctionData(functionFragment: "scyIndex", values: [string]): string;
199
54
  encodeFunctionData(
200
- functionFragment: "swapOtForScyStatic",
55
+ functionFragment: "swapPtForScyStatic",
201
56
  values: [string, BigNumberish]
202
57
  ): string;
203
58
  encodeFunctionData(
204
- functionFragment: "swapScyForOtStatic",
59
+ functionFragment: "swapScyForPtStatic",
205
60
  values: [string, BigNumberish]
206
61
  ): string;
207
62
 
@@ -209,42 +64,12 @@ export interface IPRouterStaticInterface extends utils.Interface {
209
64
  functionFragment: "addLiquidityStatic",
210
65
  data: BytesLike
211
66
  ): Result;
212
- decodeFunctionResult(
213
- functionFragment: "getMarketInfo",
214
- data: BytesLike
215
- ): Result;
216
- decodeFunctionResult(
217
- functionFragment: "getOtImpliedYield",
218
- data: BytesLike
219
- ): Result;
220
67
  decodeFunctionResult(
221
68
  functionFragment: "getPendleTokenType",
222
69
  data: BytesLike
223
70
  ): Result;
224
71
  decodeFunctionResult(
225
- functionFragment: "getUserMarketInfo",
226
- data: BytesLike
227
- ): Result;
228
- decodeFunctionResult(
229
- functionFragment: "getUserMarketPositions",
230
- data: BytesLike
231
- ): Result;
232
- decodeFunctionResult(
233
- functionFragment: "getUserSCYInfo",
234
- data: BytesLike
235
- ): Result;
236
- decodeFunctionResult(
237
- functionFragment: "getUserYOInfo",
238
- data: BytesLike
239
- ): Result;
240
- decodeFunctionResult(
241
- functionFragment: "getUserYOPositionsByYOs",
242
- data: BytesLike
243
- ): Result;
244
- decodeFunctionResult(functionFragment: "getYO", data: BytesLike): Result;
245
- decodeFunctionResult(functionFragment: "getYOInfo", data: BytesLike): Result;
246
- decodeFunctionResult(
247
- functionFragment: "hasYOPosition",
72
+ functionFragment: "getPtImpliedYield",
248
73
  data: BytesLike
249
74
  ): Result;
250
75
  decodeFunctionResult(
@@ -253,11 +78,11 @@ export interface IPRouterStaticInterface extends utils.Interface {
253
78
  ): Result;
254
79
  decodeFunctionResult(functionFragment: "scyIndex", data: BytesLike): Result;
255
80
  decodeFunctionResult(
256
- functionFragment: "swapOtForScyStatic",
81
+ functionFragment: "swapPtForScyStatic",
257
82
  data: BytesLike
258
83
  ): Result;
259
84
  decodeFunctionResult(
260
- functionFragment: "swapScyForOtStatic",
85
+ functionFragment: "swapScyForPtStatic",
261
86
  data: BytesLike
262
87
  ): Result;
263
88
 
@@ -295,111 +120,32 @@ export interface IPRouterStatic extends BaseContract {
295
120
  addLiquidityStatic(
296
121
  market: string,
297
122
  scyDesired: BigNumberish,
298
- otDesired: BigNumberish,
123
+ ptDesired: BigNumberish,
299
124
  overrides?: Overrides & { from?: string | Promise<string> }
300
125
  ): Promise<ContractTransaction>;
301
126
 
302
- getMarketInfo(
303
- market: string,
304
- overrides?: CallOverrides
305
- ): Promise<
306
- [string, string, MarketStateStructOutput, BigNumber, BigNumber] & {
307
- ot: string;
308
- scy: string;
309
- state: MarketStateStructOutput;
310
- impliedYield: BigNumber;
311
- exchangeRate: BigNumber;
312
- }
313
- >;
314
-
315
- getOtImpliedYield(
316
- market: string,
317
- overrides?: CallOverrides
318
- ): Promise<[BigNumber]>;
319
-
320
127
  getPendleTokenType(
321
128
  token: string,
322
129
  overrides?: CallOverrides
323
130
  ): Promise<
324
131
  [boolean, boolean, boolean] & {
325
- isOT: boolean;
132
+ isPT: boolean;
326
133
  isYT: boolean;
327
134
  isMarket: boolean;
328
135
  }
329
136
  >;
330
137
 
331
- getUserMarketInfo(
138
+ getPtImpliedYield(
332
139
  market: string,
333
- user: string,
334
- overrides?: CallOverrides
335
- ): Promise<
336
- [IPRouterStatic.UserMarketInfoStructOutput] & {
337
- userMarketInfo: IPRouterStatic.UserMarketInfoStructOutput;
338
- }
339
- >;
340
-
341
- getUserMarketPositions(
342
- user: string,
343
- markets: string[],
344
- overrides?: CallOverrides
345
- ): Promise<
346
- [IPRouterStatic.UserMarketInfoStructOutput[]] & {
347
- userMarketPositions: IPRouterStatic.UserMarketInfoStructOutput[];
348
- }
349
- >;
350
-
351
- getUserSCYInfo(
352
- scy: string,
353
- user: string,
354
140
  overrides?: CallOverrides
355
- ): Promise<
356
- [BigNumber, IPRouterStatic.TokenAmountStructOutput[]] & {
357
- balance: BigNumber;
358
- rewards: IPRouterStatic.TokenAmountStructOutput[];
359
- }
360
- >;
361
-
362
- getUserYOInfo(
363
- yo: string,
364
- user: string,
365
- overrides?: CallOverrides
366
- ): Promise<
367
- [IPRouterStatic.UserYOInfoStructOutput] & {
368
- userYOInfo: IPRouterStatic.UserYOInfoStructOutput;
369
- }
370
- >;
371
-
372
- getUserYOPositionsByYOs(
373
- user: string,
374
- yos: string[],
375
- overrides?: CallOverrides
376
- ): Promise<
377
- [IPRouterStatic.UserYOInfoStructOutput[]] & {
378
- userYOPositions: IPRouterStatic.UserYOInfoStructOutput[];
379
- }
380
- >;
381
-
382
- getYO(
383
- yo: string,
384
- overrides?: CallOverrides
385
- ): Promise<[string, string] & { yt: string; ot: string }>;
386
-
387
- getYOInfo(
388
- yo: string,
389
- overrides?: Overrides & { from?: string | Promise<string> }
390
- ): Promise<ContractTransaction>;
391
-
392
- hasYOPosition(
393
- userYOInfo: IPRouterStatic.UserYOInfoStruct,
394
- overrides?: CallOverrides
395
- ): Promise<[boolean] & { hasPosition: boolean }>;
141
+ ): Promise<[BigNumber]>;
396
142
 
397
143
  removeLiquidityStatic(
398
144
  market: string,
399
145
  lpToRemove: BigNumberish,
400
146
  overrides?: CallOverrides
401
147
  ): Promise<
402
- [BigNumber, BigNumber] & { netScyOut: BigNumber; netOtOut: BigNumber }
148
+ [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
403
149
  >;
404
150
 
405
151
  scyIndex(
@@ -407,15 +153,15 @@ export interface IPRouterStatic extends BaseContract {
407
153
  overrides?: Overrides & { from?: string | Promise<string> }
408
154
  ): Promise<ContractTransaction>;
409
155
 
410
- swapOtForScyStatic(
156
+ swapPtForScyStatic(
411
157
  market: string,
412
- exactOtIn: BigNumberish,
158
+ exactPtIn: BigNumberish,
413
159
  overrides?: Overrides & { from?: string | Promise<string> }
414
160
  ): Promise<ContractTransaction>;
415
161
 
416
- swapScyForOtStatic(
162
+ swapScyForPtStatic(
417
163
  market: string,
418
- exactOtOut: BigNumberish,
164
+ exactPtOut: BigNumberish,
419
165
  overrides?: Overrides & { from?: string | Promise<string> }
420
166
  ): Promise<ContractTransaction>;
421
167
  };
@@ -423,95 +169,32 @@ export interface IPRouterStatic extends BaseContract {
423
169
  addLiquidityStatic(
424
170
  market: string,
425
171
  scyDesired: BigNumberish,
426
- otDesired: BigNumberish,
172
+ ptDesired: BigNumberish,
427
173
  overrides?: Overrides & { from?: string | Promise<string> }
428
174
  ): Promise<ContractTransaction>;
429
175
 
430
- getMarketInfo(
431
- market: string,
432
- overrides?: CallOverrides
433
- ): Promise<
434
- [string, string, MarketStateStructOutput, BigNumber, BigNumber] & {
435
- ot: string;
436
- scy: string;
437
- state: MarketStateStructOutput;
438
- impliedYield: BigNumber;
439
- exchangeRate: BigNumber;
440
- }
441
- >;
442
-
443
- getOtImpliedYield(
444
- market: string,
445
- overrides?: CallOverrides
446
- ): Promise<BigNumber>;
447
-
448
176
  getPendleTokenType(
449
177
  token: string,
450
178
  overrides?: CallOverrides
451
179
  ): Promise<
452
180
  [boolean, boolean, boolean] & {
453
- isOT: boolean;
181
+ isPT: boolean;
454
182
  isYT: boolean;
455
183
  isMarket: boolean;
456
184
  }
457
185
  >;
458
186
 
459
- getUserMarketInfo(
187
+ getPtImpliedYield(
460
188
  market: string,
461
- user: string,
462
- overrides?: CallOverrides
463
- ): Promise<IPRouterStatic.UserMarketInfoStructOutput>;
464
-
465
- getUserMarketPositions(
466
- user: string,
467
- markets: string[],
468
- overrides?: CallOverrides
469
- ): Promise<IPRouterStatic.UserMarketInfoStructOutput[]>;
470
-
471
- getUserSCYInfo(
472
- scy: string,
473
- user: string,
474
189
  overrides?: CallOverrides
475
- ): Promise<
476
- [BigNumber, IPRouterStatic.TokenAmountStructOutput[]] & {
477
- balance: BigNumber;
478
- rewards: IPRouterStatic.TokenAmountStructOutput[];
479
- }
480
- >;
481
-
482
- getUserYOInfo(
483
- yo: string,
484
- user: string,
485
- overrides?: CallOverrides
486
- ): Promise<IPRouterStatic.UserYOInfoStructOutput>;
487
-
488
- getUserYOPositionsByYOs(
489
- user: string,
490
- yos: string[],
491
- overrides?: CallOverrides
492
- ): Promise<IPRouterStatic.UserYOInfoStructOutput[]>;
493
-
494
- getYO(
495
- yo: string,
496
- overrides?: CallOverrides
497
- ): Promise<[string, string] & { yt: string; ot: string }>;
498
-
499
- getYOInfo(
500
- yo: string,
501
- overrides?: Overrides & { from?: string | Promise<string> }
502
- ): Promise<ContractTransaction>;
503
-
504
- hasYOPosition(
505
- userYOInfo: IPRouterStatic.UserYOInfoStruct,
506
- overrides?: CallOverrides
507
- ): Promise<boolean>;
190
+ ): Promise<BigNumber>;
508
191
 
509
192
  removeLiquidityStatic(
510
193
  market: string,
511
194
  lpToRemove: BigNumberish,
512
195
  overrides?: CallOverrides
513
196
  ): Promise<
514
- [BigNumber, BigNumber] & { netScyOut: BigNumber; netOtOut: BigNumber }
197
+ [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
515
198
  >;
516
199
 
517
200
  scyIndex(
@@ -519,15 +202,15 @@ export interface IPRouterStatic extends BaseContract {
519
202
  overrides?: Overrides & { from?: string | Promise<string> }
520
203
  ): Promise<ContractTransaction>;
521
204
 
522
- swapOtForScyStatic(
205
+ swapPtForScyStatic(
523
206
  market: string,
524
- exactOtIn: BigNumberish,
207
+ exactPtIn: BigNumberish,
525
208
  overrides?: Overrides & { from?: string | Promise<string> }
526
209
  ): Promise<ContractTransaction>;
527
210
 
528
- swapScyForOtStatic(
211
+ swapScyForPtStatic(
529
212
  market: string,
530
- exactOtOut: BigNumberish,
213
+ exactPtOut: BigNumberish,
531
214
  overrides?: Overrides & { from?: string | Promise<string> }
532
215
  ): Promise<ContractTransaction>;
533
216
 
@@ -535,122 +218,53 @@ export interface IPRouterStatic extends BaseContract {
535
218
  addLiquidityStatic(
536
219
  market: string,
537
220
  scyDesired: BigNumberish,
538
- otDesired: BigNumberish,
221
+ ptDesired: BigNumberish,
539
222
  overrides?: CallOverrides
540
223
  ): Promise<
541
224
  [BigNumber, BigNumber, BigNumber] & {
542
225
  netLpOut: BigNumber;
543
226
  scyUsed: BigNumber;
544
- otUsed: BigNumber;
545
- }
546
- >;
547
-
548
- getMarketInfo(
549
- market: string,
550
- overrides?: CallOverrides
551
- ): Promise<
552
- [string, string, MarketStateStructOutput, BigNumber, BigNumber] & {
553
- ot: string;
554
- scy: string;
555
- state: MarketStateStructOutput;
556
- impliedYield: BigNumber;
557
- exchangeRate: BigNumber;
227
+ ptUsed: BigNumber;
558
228
  }
559
229
  >;
560
230
 
561
- getOtImpliedYield(
562
- market: string,
563
- overrides?: CallOverrides
564
- ): Promise<BigNumber>;
565
-
566
231
  getPendleTokenType(
567
232
  token: string,
568
233
  overrides?: CallOverrides
569
234
  ): Promise<
570
235
  [boolean, boolean, boolean] & {
571
- isOT: boolean;
236
+ isPT: boolean;
572
237
  isYT: boolean;
573
238
  isMarket: boolean;
574
239
  }
575
240
  >;
576
241
 
577
- getUserMarketInfo(
242
+ getPtImpliedYield(
578
243
  market: string,
579
- user: string,
580
- overrides?: CallOverrides
581
- ): Promise<IPRouterStatic.UserMarketInfoStructOutput>;
582
-
583
- getUserMarketPositions(
584
- user: string,
585
- markets: string[],
586
- overrides?: CallOverrides
587
- ): Promise<IPRouterStatic.UserMarketInfoStructOutput[]>;
588
-
589
- getUserSCYInfo(
590
- scy: string,
591
- user: string,
592
244
  overrides?: CallOverrides
593
- ): Promise<
594
- [BigNumber, IPRouterStatic.TokenAmountStructOutput[]] & {
595
- balance: BigNumber;
596
- rewards: IPRouterStatic.TokenAmountStructOutput[];
597
- }
598
- >;
599
-
600
- getUserYOInfo(
601
- yo: string,
602
- user: string,
603
- overrides?: CallOverrides
604
- ): Promise<IPRouterStatic.UserYOInfoStructOutput>;
605
-
606
- getUserYOPositionsByYOs(
607
- user: string,
608
- yos: string[],
609
- overrides?: CallOverrides
610
- ): Promise<IPRouterStatic.UserYOInfoStructOutput[]>;
611
-
612
- getYO(
613
- yo: string,
614
- overrides?: CallOverrides
615
- ): Promise<[string, string] & { yt: string; ot: string }>;
616
-
617
- getYOInfo(
618
- yo: string,
619
- overrides?: CallOverrides
620
- ): Promise<
621
- [BigNumber, BigNumber, IPRouterStatic.RewardIndexStructOutput[]] & {
622
- exchangeRate: BigNumber;
623
- totalSupply: BigNumber;
624
- rewardIndexes: IPRouterStatic.RewardIndexStructOutput[];
625
- }
626
- >;
627
-
628
- hasYOPosition(
629
- userYOInfo: IPRouterStatic.UserYOInfoStruct,
630
- overrides?: CallOverrides
631
- ): Promise<boolean>;
245
+ ): Promise<BigNumber>;
632
246
 
633
247
  removeLiquidityStatic(
634
248
  market: string,
635
249
  lpToRemove: BigNumberish,
636
250
  overrides?: CallOverrides
637
251
  ): Promise<
638
- [BigNumber, BigNumber] & { netScyOut: BigNumber; netOtOut: BigNumber }
252
+ [BigNumber, BigNumber] & { netScyOut: BigNumber; netPtOut: BigNumber }
639
253
  >;
640
254
 
641
255
  scyIndex(market: string, overrides?: CallOverrides): Promise<BigNumber>;
642
256
 
643
- swapOtForScyStatic(
257
+ swapPtForScyStatic(
644
258
  market: string,
645
- exactOtIn: BigNumberish,
259
+ exactPtIn: BigNumberish,
646
260
  overrides?: CallOverrides
647
261
  ): Promise<
648
262
  [BigNumber, BigNumber] & { netScyOut: BigNumber; netScyFee: BigNumber }
649
263
  >;
650
264
 
651
- swapScyForOtStatic(
265
+ swapScyForPtStatic(
652
266
  market: string,
653
- exactOtOut: BigNumberish,
267
+ exactPtOut: BigNumberish,
654
268
  overrides?: CallOverrides
655
269
  ): Promise<
656
270
  [BigNumber, BigNumber] & { netScyIn: BigNumber; netScyFee: BigNumber }
@@ -663,64 +277,17 @@ export interface IPRouterStatic extends BaseContract {
663
277
  addLiquidityStatic(
664
278
  market: string,
665
279
  scyDesired: BigNumberish,
666
- otDesired: BigNumberish,
280
+ ptDesired: BigNumberish,
667
281
  overrides?: Overrides & { from?: string | Promise<string> }
668
282
  ): Promise<BigNumber>;
669
283
 
670
- getMarketInfo(
671
- market: string,
672
- overrides?: CallOverrides
673
- ): Promise<BigNumber>;
674
-
675
- getOtImpliedYield(
676
- market: string,
677
- overrides?: CallOverrides
678
- ): Promise<BigNumber>;
679
-
680
284
  getPendleTokenType(
681
285
  token: string,
682
286
  overrides?: CallOverrides
683
287
  ): Promise<BigNumber>;
684
288
 
685
- getUserMarketInfo(
289
+ getPtImpliedYield(
686
290
  market: string,
687
- user: string,
688
- overrides?: CallOverrides
689
- ): Promise<BigNumber>;
690
-
691
- getUserMarketPositions(
692
- user: string,
693
- markets: string[],
694
- overrides?: CallOverrides
695
- ): Promise<BigNumber>;
696
-
697
- getUserSCYInfo(
698
- scy: string,
699
- user: string,
700
- overrides?: CallOverrides
701
- ): Promise<BigNumber>;
702
-
703
- getUserYOInfo(
704
- yo: string,
705
- user: string,
706
- overrides?: CallOverrides
707
- ): Promise<BigNumber>;
708
-
709
- getUserYOPositionsByYOs(
710
- user: string,
711
- yos: string[],
712
- overrides?: CallOverrides
713
- ): Promise<BigNumber>;
714
-
715
- getYO(yo: string, overrides?: CallOverrides): Promise<BigNumber>;
716
-
717
- getYOInfo(
718
- yo: string,
719
- overrides?: Overrides & { from?: string | Promise<string> }
720
- ): Promise<BigNumber>;
721
-
722
- hasYOPosition(
723
- userYOInfo: IPRouterStatic.UserYOInfoStruct,
724
291
  overrides?: CallOverrides
725
292
  ): Promise<BigNumber>;
726
293
 
@@ -735,15 +302,15 @@ export interface IPRouterStatic extends BaseContract {
735
302
  overrides?: Overrides & { from?: string | Promise<string> }
736
303
  ): Promise<BigNumber>;
737
304
 
738
- swapOtForScyStatic(
305
+ swapPtForScyStatic(
739
306
  market: string,
740
- exactOtIn: BigNumberish,
307
+ exactPtIn: BigNumberish,
741
308
  overrides?: Overrides & { from?: string | Promise<string> }
742
309
  ): Promise<BigNumber>;
743
310
 
744
- swapScyForOtStatic(
311
+ swapScyForPtStatic(
745
312
  market: string,
746
- exactOtOut: BigNumberish,
313
+ exactPtOut: BigNumberish,
747
314
  overrides?: Overrides & { from?: string | Promise<string> }
748
315
  ): Promise<BigNumber>;
749
316
  };
@@ -752,64 +319,17 @@ export interface IPRouterStatic extends BaseContract {
752
319
  addLiquidityStatic(
753
320
  market: string,
754
321
  scyDesired: BigNumberish,
755
- otDesired: BigNumberish,
322
+ ptDesired: BigNumberish,
756
323
  overrides?: Overrides & { from?: string | Promise<string> }
757
324
  ): Promise<PopulatedTransaction>;
758
325
 
759
- getMarketInfo(
760
- market: string,
761
- overrides?: CallOverrides
762
- ): Promise<PopulatedTransaction>;
763
-
764
- getOtImpliedYield(
765
- market: string,
766
- overrides?: CallOverrides
767
- ): Promise<PopulatedTransaction>;
768
-
769
326
  getPendleTokenType(
770
327
  token: string,
771
328
  overrides?: CallOverrides
772
329
  ): Promise<PopulatedTransaction>;
773
330
 
774
- getUserMarketInfo(
331
+ getPtImpliedYield(
775
332
  market: string,
776
- user: string,
777
- overrides?: CallOverrides
778
- ): Promise<PopulatedTransaction>;
779
-
780
- getUserMarketPositions(
781
- user: string,
782
- markets: string[],
783
- overrides?: CallOverrides
784
- ): Promise<PopulatedTransaction>;
785
-
786
- getUserSCYInfo(
787
- scy: string,
788
- user: string,
789
- overrides?: CallOverrides
790
- ): Promise<PopulatedTransaction>;
791
-
792
- getUserYOInfo(
793
- yo: string,
794
- user: string,
795
- overrides?: CallOverrides
796
- ): Promise<PopulatedTransaction>;
797
-
798
- getUserYOPositionsByYOs(
799
- user: string,
800
- yos: string[],
801
- overrides?: CallOverrides
802
- ): Promise<PopulatedTransaction>;
803
-
804
- getYO(yo: string, overrides?: CallOverrides): Promise<PopulatedTransaction>;
805
-
806
- getYOInfo(
807
- yo: string,
808
- overrides?: Overrides & { from?: string | Promise<string> }
809
- ): Promise<PopulatedTransaction>;
810
-
811
- hasYOPosition(
812
- userYOInfo: IPRouterStatic.UserYOInfoStruct,
813
333
  overrides?: CallOverrides
814
334
  ): Promise<PopulatedTransaction>;
815
335
 
@@ -824,15 +344,15 @@ export interface IPRouterStatic extends BaseContract {
824
344
  overrides?: Overrides & { from?: string | Promise<string> }
825
345
  ): Promise<PopulatedTransaction>;
826
346
 
827
- swapOtForScyStatic(
347
+ swapPtForScyStatic(
828
348
  market: string,
829
- exactOtIn: BigNumberish,
349
+ exactPtIn: BigNumberish,
830
350
  overrides?: Overrides & { from?: string | Promise<string> }
831
351
  ): Promise<PopulatedTransaction>;
832
352
 
833
- swapScyForOtStatic(
353
+ swapScyForPtStatic(
834
354
  market: string,
835
- exactOtOut: BigNumberish,
355
+ exactPtOut: BigNumberish,
836
356
  overrides?: Overrides & { from?: string | Promise<string> }
837
357
  ): Promise<PopulatedTransaction>;
838
358
  };