@pendle/core-v2 0.3.0 → 0.5.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 (104) hide show
  1. package/contracts/SuperComposableYield/ISuperComposableYield.sol +14 -0
  2. package/contracts/SuperComposableYield/implementations/IRewardManager.sol +16 -0
  3. package/contracts/SuperComposableYield/implementations/RewardManager.sol +24 -5
  4. package/contracts/SuperComposableYield/implementations/SCYBase.sol +21 -1
  5. package/contracts/core/PendleMarket.sol +10 -18
  6. package/contracts/core/PendleMarketFactory.sol +49 -22
  7. package/contracts/core/PendleRouter.sol +74 -0
  8. package/contracts/core/PendleYieldToken.sol +20 -12
  9. package/contracts/core/{router/PendleRouterStaticUpg.sol → RouterStatic.sol} +6 -6
  10. package/contracts/core/actions/ActionCallback.sol +101 -0
  11. package/contracts/core/{router/PendleRouterCoreUpg.sol → actions/ActionCore.sol} +6 -10
  12. package/contracts/core/{router/PendleRouterYTUpg.sol → actions/ActionYT.sol} +6 -11
  13. package/contracts/core/{router/base/PendleRouterOTBaseUpg.sol → actions/base/ActionSCYAndOTBase.sol} +1 -5
  14. package/contracts/core/{router/base/PendleRouterSCYAndForgeBaseUpg.sol → actions/base/ActionSCYAndYOBase.sol} +6 -8
  15. package/contracts/core/{router/base/PendleRouterYTBaseUpg.sol → actions/base/ActionSCYAndYTBase.sol} +7 -99
  16. package/contracts/core/actions/base/ActionType.sol +11 -0
  17. package/contracts/interfaces/{IPRouterCore.sol → IPActionCore.sol} +1 -1
  18. package/contracts/interfaces/{IPRouterYT.sol → IPActionYT.sol} +1 -3
  19. package/contracts/interfaces/IPAllAction.sol +9 -0
  20. package/contracts/interfaces/IPMarketFactory.sol +11 -0
  21. package/contracts/interfaces/IPYieldToken.sol +21 -3
  22. package/contracts/libraries/math/MarketMathCore.sol +3 -2
  23. package/package.json +1 -1
  24. package/typechain-types/{PendleRouterYTBaseUpg.ts → ActionCallback.ts} +5 -5
  25. package/typechain-types/{PendleRouterCoreUpg.ts → ActionCore.ts} +5 -5
  26. package/typechain-types/{PendleRouterSCYAndForgeBaseUpg.ts → ActionSCYAndYOBase.ts} +5 -6
  27. package/typechain-types/{BoringOwnableData.ts → ActionSCYAndYTBase.ts} +21 -24
  28. package/typechain-types/{PendleRouterStaticUpg.ts → ActionStatic.ts} +5 -5
  29. package/typechain-types/{IPRouterYT.ts → ActionYT.ts} +27 -42
  30. package/typechain-types/IPActionAll.ts +1431 -0
  31. package/typechain-types/{IPRouterCore.ts → IPActionCore.ts} +5 -5
  32. package/typechain-types/{IPRouterView.ts → IPActionStatic.ts} +57 -5
  33. package/typechain-types/{PendleRouterYTUpg.ts → IPActionYT.ts} +5 -97
  34. package/typechain-types/IPAllAction.ts +1431 -0
  35. package/typechain-types/IPMarket.ts +3 -0
  36. package/typechain-types/IPMarketFactory.ts +46 -0
  37. package/typechain-types/IPYieldToken.ts +342 -14
  38. package/typechain-types/IRewardManager.ts +178 -0
  39. package/typechain-types/ISuperComposableYield.ts +97 -2
  40. package/typechain-types/PendleAaveV3SCY.ts +167 -66
  41. package/typechain-types/PendleBenQiErc20SCY.ts +167 -66
  42. package/typechain-types/PendleBtrflyScy.ts +97 -2
  43. package/typechain-types/PendleMarket.ts +3 -59
  44. package/typechain-types/PendleMarketFactory.ts +150 -24
  45. package/typechain-types/{PendleRouterProxy.ts → PendleRouter.ts} +29 -39
  46. package/typechain-types/PendleYearnVaultScy.ts +97 -2
  47. package/typechain-types/PendleYieldToken.ts +116 -101
  48. package/typechain-types/RewardManager.ts +48 -42
  49. package/typechain-types/RouterStatic.ts +828 -0
  50. package/typechain-types/SCYBase.ts +97 -2
  51. package/typechain-types/SCYBaseWithRewards.ts +167 -66
  52. package/typechain-types/factories/ActionCallback__factory.ts +116 -0
  53. package/typechain-types/factories/ActionCore__factory.ts +632 -0
  54. package/typechain-types/factories/{PendleRouterSCYAndForgeBaseUpg__factory.ts → ActionSCYAndYOBase__factory.ts} +8 -12
  55. package/typechain-types/factories/ActionSCYAndYTBase__factory.ts +52 -0
  56. package/typechain-types/factories/ActionStatic__factory.ts +308 -0
  57. package/typechain-types/factories/ActionYT__factory.ts +370 -0
  58. package/typechain-types/factories/IPActionAll__factory.ts +983 -0
  59. package/typechain-types/factories/{IPRouterCore__factory.ts → IPActionCore__factory.ts} +6 -6
  60. package/typechain-types/factories/{IPRouterView__factory.ts → IPActionStatic__factory.ts} +38 -6
  61. package/typechain-types/factories/{IPRouterYT__factory.ts → IPActionYT__factory.ts} +6 -29
  62. package/typechain-types/factories/IPAllAction__factory.ts +983 -0
  63. package/typechain-types/factories/IPMarketFactory__factory.ts +28 -0
  64. package/typechain-types/factories/IPMarket__factory.ts +7 -2
  65. package/typechain-types/factories/IPYieldToken__factory.ts +158 -1
  66. package/typechain-types/factories/IRewardManager__factory.ts +92 -0
  67. package/typechain-types/factories/ISuperComposableYield__factory.ts +68 -0
  68. package/typechain-types/factories/PendleAaveV3SCY__factory.ts +102 -34
  69. package/typechain-types/factories/PendleBenQiErc20SCY__factory.ts +102 -34
  70. package/typechain-types/factories/PendleBtrflyScy__factory.ts +69 -1
  71. package/typechain-types/factories/PendleMarketFactory__factory.ts +112 -17
  72. package/typechain-types/factories/PendleMarket__factory.ts +8 -69
  73. package/typechain-types/factories/PendleRouter__factory.ts +282 -0
  74. package/typechain-types/factories/PendleYearnVaultScy__factory.ts +69 -1
  75. package/typechain-types/factories/PendleYieldContractFactory__factory.ts +1 -1
  76. package/typechain-types/factories/PendleYieldToken__factory.ts +58 -58
  77. package/typechain-types/factories/RewardManager__factory.ts +18 -18
  78. package/typechain-types/factories/RouterStatic__factory.ts +883 -0
  79. package/typechain-types/factories/SCYBaseWithRewards__factory.ts +101 -33
  80. package/typechain-types/factories/SCYBase__factory.ts +68 -0
  81. package/typechain-types/hardhat.d.ts +93 -75
  82. package/typechain-types/index.ts +22 -18
  83. package/contracts/core/router/PendleRouterProxy.sol +0 -84
  84. package/contracts/interfaces/IPFlashCallBack.sol +0 -10
  85. package/typechain-types/BoringOwnable.ts +0 -194
  86. package/typechain-types/BoringOwnableUpg.ts +0 -194
  87. package/typechain-types/BoringOwnableUpgData.ts +0 -100
  88. package/typechain-types/IPFlashCallback.ts +0 -115
  89. package/typechain-types/IPermissionsV2.ts +0 -87
  90. package/typechain-types/PendleRouterViewUpg.ts +0 -307
  91. package/typechain-types/PermissionsV2.ts +0 -87
  92. package/typechain-types/factories/BoringOwnableData__factory.ts +0 -90
  93. package/typechain-types/factories/BoringOwnableUpgData__factory.ts +0 -94
  94. package/typechain-types/factories/BoringOwnableUpg__factory.ts +0 -139
  95. package/typechain-types/factories/BoringOwnable__factory.ts +0 -149
  96. package/typechain-types/factories/IPFlashCallback__factory.ts +0 -49
  97. package/typechain-types/factories/IPermissionsV2__factory.ts +0 -39
  98. package/typechain-types/factories/PendleRouterCoreUpg__factory.ts +0 -635
  99. package/typechain-types/factories/PendleRouterProxy__factory.ts +0 -285
  100. package/typechain-types/factories/PendleRouterStaticUpg__factory.ts +0 -315
  101. package/typechain-types/factories/PendleRouterViewUpg__factory.ts +0 -265
  102. package/typechain-types/factories/PendleRouterYTBaseUpg__factory.ts +0 -66
  103. package/typechain-types/factories/PendleRouterYTUpg__factory.ts +0 -422
  104. package/typechain-types/factories/PermissionsV2__factory.ts +0 -36
@@ -35,9 +35,11 @@ export interface SCYBaseInterface extends utils.Interface {
35
35
  "getRewardTokens()": FunctionFragment;
36
36
  "increaseAllowance(address,uint256)": FunctionFragment;
37
37
  "isValidBaseToken(address)": FunctionFragment;
38
- "mint(address,address,uint256)": FunctionFragment;
38
+ "mint(address,address,uint256,uint256)": FunctionFragment;
39
+ "mintNoPull(address,address,uint256)": FunctionFragment;
39
40
  "name()": FunctionFragment;
40
- "redeem(address,address,uint256)": FunctionFragment;
41
+ "redeem(address,address,uint256,uint256)": FunctionFragment;
42
+ "redeemNoPull(address,address,uint256)": FunctionFragment;
41
43
  "redeemReward(address)": FunctionFragment;
42
44
  "scyIndexCurrent()": FunctionFragment;
43
45
  "scyIndexStored()": FunctionFragment;
@@ -85,11 +87,19 @@ export interface SCYBaseInterface extends utils.Interface {
85
87
  ): string;
86
88
  encodeFunctionData(
87
89
  functionFragment: "mint",
90
+ values: [string, string, BigNumberish, BigNumberish]
91
+ ): string;
92
+ encodeFunctionData(
93
+ functionFragment: "mintNoPull",
88
94
  values: [string, string, BigNumberish]
89
95
  ): string;
90
96
  encodeFunctionData(functionFragment: "name", values?: undefined): string;
91
97
  encodeFunctionData(
92
98
  functionFragment: "redeem",
99
+ values: [string, string, BigNumberish, BigNumberish]
100
+ ): string;
101
+ encodeFunctionData(
102
+ functionFragment: "redeemNoPull",
93
103
  values: [string, string, BigNumberish]
94
104
  ): string;
95
105
  encodeFunctionData(
@@ -155,8 +165,13 @@ export interface SCYBaseInterface extends utils.Interface {
155
165
  data: BytesLike
156
166
  ): Result;
157
167
  decodeFunctionResult(functionFragment: "mint", data: BytesLike): Result;
168
+ decodeFunctionResult(functionFragment: "mintNoPull", data: BytesLike): Result;
158
169
  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
159
170
  decodeFunctionResult(functionFragment: "redeem", data: BytesLike): Result;
171
+ decodeFunctionResult(
172
+ functionFragment: "redeemNoPull",
173
+ data: BytesLike
174
+ ): Result;
160
175
  decodeFunctionResult(
161
176
  functionFragment: "redeemReward",
162
177
  data: BytesLike
@@ -281,6 +296,14 @@ export interface SCYBase extends BaseContract {
281
296
  ): Promise<[boolean]>;
282
297
 
283
298
  mint(
299
+ receiver: string,
300
+ baseTokenIn: string,
301
+ amountBaseToPull: BigNumberish,
302
+ minAmountScyOut: BigNumberish,
303
+ overrides?: Overrides & { from?: string | Promise<string> }
304
+ ): Promise<ContractTransaction>;
305
+
306
+ mintNoPull(
284
307
  receiver: string,
285
308
  baseTokenIn: string,
286
309
  minAmountScyOut: BigNumberish,
@@ -290,6 +313,14 @@ export interface SCYBase extends BaseContract {
290
313
  name(overrides?: CallOverrides): Promise<[string]>;
291
314
 
292
315
  redeem(
316
+ receiver: string,
317
+ baseTokenOut: string,
318
+ amountScyToPull: BigNumberish,
319
+ minAmountBaseOut: BigNumberish,
320
+ overrides?: Overrides & { from?: string | Promise<string> }
321
+ ): Promise<ContractTransaction>;
322
+
323
+ redeemNoPull(
293
324
  receiver: string,
294
325
  baseTokenOut: string,
295
326
  minAmountBaseOut: BigNumberish,
@@ -373,6 +404,14 @@ export interface SCYBase extends BaseContract {
373
404
  isValidBaseToken(token: string, overrides?: CallOverrides): Promise<boolean>;
374
405
 
375
406
  mint(
407
+ receiver: string,
408
+ baseTokenIn: string,
409
+ amountBaseToPull: BigNumberish,
410
+ minAmountScyOut: BigNumberish,
411
+ overrides?: Overrides & { from?: string | Promise<string> }
412
+ ): Promise<ContractTransaction>;
413
+
414
+ mintNoPull(
376
415
  receiver: string,
377
416
  baseTokenIn: string,
378
417
  minAmountScyOut: BigNumberish,
@@ -382,6 +421,14 @@ export interface SCYBase extends BaseContract {
382
421
  name(overrides?: CallOverrides): Promise<string>;
383
422
 
384
423
  redeem(
424
+ receiver: string,
425
+ baseTokenOut: string,
426
+ amountScyToPull: BigNumberish,
427
+ minAmountBaseOut: BigNumberish,
428
+ overrides?: Overrides & { from?: string | Promise<string> }
429
+ ): Promise<ContractTransaction>;
430
+
431
+ redeemNoPull(
385
432
  receiver: string,
386
433
  baseTokenOut: string,
387
434
  minAmountBaseOut: BigNumberish,
@@ -466,6 +513,14 @@ export interface SCYBase extends BaseContract {
466
513
  ): Promise<boolean>;
467
514
 
468
515
  mint(
516
+ receiver: string,
517
+ baseTokenIn: string,
518
+ amountBaseToPull: BigNumberish,
519
+ minAmountScyOut: BigNumberish,
520
+ overrides?: CallOverrides
521
+ ): Promise<BigNumber>;
522
+
523
+ mintNoPull(
469
524
  receiver: string,
470
525
  baseTokenIn: string,
471
526
  minAmountScyOut: BigNumberish,
@@ -475,6 +530,14 @@ export interface SCYBase extends BaseContract {
475
530
  name(overrides?: CallOverrides): Promise<string>;
476
531
 
477
532
  redeem(
533
+ receiver: string,
534
+ baseTokenOut: string,
535
+ amountScyToPull: BigNumberish,
536
+ minAmountBaseOut: BigNumberish,
537
+ overrides?: CallOverrides
538
+ ): Promise<BigNumber>;
539
+
540
+ redeemNoPull(
478
541
  receiver: string,
479
542
  baseTokenOut: string,
480
543
  minAmountBaseOut: BigNumberish,
@@ -574,6 +637,14 @@ export interface SCYBase extends BaseContract {
574
637
  ): Promise<BigNumber>;
575
638
 
576
639
  mint(
640
+ receiver: string,
641
+ baseTokenIn: string,
642
+ amountBaseToPull: BigNumberish,
643
+ minAmountScyOut: BigNumberish,
644
+ overrides?: Overrides & { from?: string | Promise<string> }
645
+ ): Promise<BigNumber>;
646
+
647
+ mintNoPull(
577
648
  receiver: string,
578
649
  baseTokenIn: string,
579
650
  minAmountScyOut: BigNumberish,
@@ -583,6 +654,14 @@ export interface SCYBase extends BaseContract {
583
654
  name(overrides?: CallOverrides): Promise<BigNumber>;
584
655
 
585
656
  redeem(
657
+ receiver: string,
658
+ baseTokenOut: string,
659
+ amountScyToPull: BigNumberish,
660
+ minAmountBaseOut: BigNumberish,
661
+ overrides?: Overrides & { from?: string | Promise<string> }
662
+ ): Promise<BigNumber>;
663
+
664
+ redeemNoPull(
586
665
  receiver: string,
587
666
  baseTokenOut: string,
588
667
  minAmountBaseOut: BigNumberish,
@@ -671,6 +750,14 @@ export interface SCYBase extends BaseContract {
671
750
  ): Promise<PopulatedTransaction>;
672
751
 
673
752
  mint(
753
+ receiver: string,
754
+ baseTokenIn: string,
755
+ amountBaseToPull: BigNumberish,
756
+ minAmountScyOut: BigNumberish,
757
+ overrides?: Overrides & { from?: string | Promise<string> }
758
+ ): Promise<PopulatedTransaction>;
759
+
760
+ mintNoPull(
674
761
  receiver: string,
675
762
  baseTokenIn: string,
676
763
  minAmountScyOut: BigNumberish,
@@ -680,6 +767,14 @@ export interface SCYBase extends BaseContract {
680
767
  name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
681
768
 
682
769
  redeem(
770
+ receiver: string,
771
+ baseTokenOut: string,
772
+ amountScyToPull: BigNumberish,
773
+ minAmountBaseOut: BigNumberish,
774
+ overrides?: Overrides & { from?: string | Promise<string> }
775
+ ): Promise<PopulatedTransaction>;
776
+
777
+ redeemNoPull(
683
778
  receiver: string,
684
779
  baseTokenOut: string,
685
780
  minAmountBaseOut: BigNumberish,
@@ -32,13 +32,16 @@ export interface SCYBaseWithRewardsInterface extends utils.Interface {
32
32
  "decimals()": FunctionFragment;
33
33
  "decreaseAllowance(address,uint256)": FunctionFragment;
34
34
  "getBaseTokens()": FunctionFragment;
35
+ "getGlobalReward(address)": FunctionFragment;
35
36
  "getRewardTokens()": FunctionFragment;
36
- "globalReward(address)": FunctionFragment;
37
+ "getUserReward(address,address)": FunctionFragment;
37
38
  "increaseAllowance(address,uint256)": FunctionFragment;
38
39
  "isValidBaseToken(address)": FunctionFragment;
39
- "mint(address,address,uint256)": FunctionFragment;
40
+ "mint(address,address,uint256,uint256)": FunctionFragment;
41
+ "mintNoPull(address,address,uint256)": FunctionFragment;
40
42
  "name()": FunctionFragment;
41
- "redeem(address,address,uint256)": FunctionFragment;
43
+ "redeem(address,address,uint256,uint256)": FunctionFragment;
44
+ "redeemNoPull(address,address,uint256)": FunctionFragment;
42
45
  "redeemReward(address)": FunctionFragment;
43
46
  "scyIndexCurrent()": FunctionFragment;
44
47
  "scyIndexStored()": FunctionFragment;
@@ -48,7 +51,6 @@ export interface SCYBaseWithRewardsInterface extends utils.Interface {
48
51
  "transferFrom(address,address,uint256)": FunctionFragment;
49
52
  "updateGlobalReward()": FunctionFragment;
50
53
  "updateUserReward(address)": FunctionFragment;
51
- "userReward(address,address)": FunctionFragment;
52
54
  };
53
55
 
54
56
  encodeFunctionData(
@@ -73,13 +75,17 @@ export interface SCYBaseWithRewardsInterface extends utils.Interface {
73
75
  functionFragment: "getBaseTokens",
74
76
  values?: undefined
75
77
  ): string;
78
+ encodeFunctionData(
79
+ functionFragment: "getGlobalReward",
80
+ values: [string]
81
+ ): string;
76
82
  encodeFunctionData(
77
83
  functionFragment: "getRewardTokens",
78
84
  values?: undefined
79
85
  ): string;
80
86
  encodeFunctionData(
81
- functionFragment: "globalReward",
82
- values: [string]
87
+ functionFragment: "getUserReward",
88
+ values: [string, string]
83
89
  ): string;
84
90
  encodeFunctionData(
85
91
  functionFragment: "increaseAllowance",
@@ -91,11 +97,19 @@ export interface SCYBaseWithRewardsInterface extends utils.Interface {
91
97
  ): string;
92
98
  encodeFunctionData(
93
99
  functionFragment: "mint",
100
+ values: [string, string, BigNumberish, BigNumberish]
101
+ ): string;
102
+ encodeFunctionData(
103
+ functionFragment: "mintNoPull",
94
104
  values: [string, string, BigNumberish]
95
105
  ): string;
96
106
  encodeFunctionData(functionFragment: "name", values?: undefined): string;
97
107
  encodeFunctionData(
98
108
  functionFragment: "redeem",
109
+ values: [string, string, BigNumberish, BigNumberish]
110
+ ): string;
111
+ encodeFunctionData(
112
+ functionFragment: "redeemNoPull",
99
113
  values: [string, string, BigNumberish]
100
114
  ): string;
101
115
  encodeFunctionData(
@@ -131,10 +145,6 @@ export interface SCYBaseWithRewardsInterface extends utils.Interface {
131
145
  functionFragment: "updateUserReward",
132
146
  values: [string]
133
147
  ): string;
134
- encodeFunctionData(
135
- functionFragment: "userReward",
136
- values: [string, string]
137
- ): string;
138
148
 
139
149
  decodeFunctionResult(functionFragment: "allowance", data: BytesLike): Result;
140
150
  decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
@@ -152,12 +162,16 @@ export interface SCYBaseWithRewardsInterface extends utils.Interface {
152
162
  functionFragment: "getBaseTokens",
153
163
  data: BytesLike
154
164
  ): Result;
165
+ decodeFunctionResult(
166
+ functionFragment: "getGlobalReward",
167
+ data: BytesLike
168
+ ): Result;
155
169
  decodeFunctionResult(
156
170
  functionFragment: "getRewardTokens",
157
171
  data: BytesLike
158
172
  ): Result;
159
173
  decodeFunctionResult(
160
- functionFragment: "globalReward",
174
+ functionFragment: "getUserReward",
161
175
  data: BytesLike
162
176
  ): Result;
163
177
  decodeFunctionResult(
@@ -169,8 +183,13 @@ export interface SCYBaseWithRewardsInterface extends utils.Interface {
169
183
  data: BytesLike
170
184
  ): Result;
171
185
  decodeFunctionResult(functionFragment: "mint", data: BytesLike): Result;
186
+ decodeFunctionResult(functionFragment: "mintNoPull", data: BytesLike): Result;
172
187
  decodeFunctionResult(functionFragment: "name", data: BytesLike): Result;
173
188
  decodeFunctionResult(functionFragment: "redeem", data: BytesLike): Result;
189
+ decodeFunctionResult(
190
+ functionFragment: "redeemNoPull",
191
+ data: BytesLike
192
+ ): Result;
174
193
  decodeFunctionResult(
175
194
  functionFragment: "redeemReward",
176
195
  data: BytesLike
@@ -201,7 +220,6 @@ export interface SCYBaseWithRewardsInterface extends utils.Interface {
201
220
  functionFragment: "updateUserReward",
202
221
  data: BytesLike
203
222
  ): Result;
204
- decodeFunctionResult(functionFragment: "userReward", data: BytesLike): Result;
205
223
 
206
224
  events: {
207
225
  "Approval(address,address,uint256)": EventFragment;
@@ -282,13 +300,24 @@ export interface SCYBaseWithRewards extends BaseContract {
282
300
  overrides?: CallOverrides
283
301
  ): Promise<[string[]] & { res: string[] }>;
284
302
 
303
+ getGlobalReward(
304
+ rewardToken: string,
305
+ overrides?: CallOverrides
306
+ ): Promise<
307
+ [BigNumber, BigNumber] & { index: BigNumber; lastBalance: BigNumber }
308
+ >;
309
+
285
310
  getRewardTokens(overrides?: CallOverrides): Promise<[string[]]>;
286
311
 
287
- globalReward(
288
- arg0: string,
312
+ getUserReward(
313
+ user: string,
314
+ rewardToken: string,
289
315
  overrides?: CallOverrides
290
316
  ): Promise<
291
- [BigNumber, BigNumber] & { index: BigNumber; lastBalance: BigNumber }
317
+ [BigNumber, BigNumber] & {
318
+ lastIndex: BigNumber;
319
+ accruedReward: BigNumber;
320
+ }
292
321
  >;
293
322
 
294
323
  increaseAllowance(
@@ -303,6 +332,14 @@ export interface SCYBaseWithRewards extends BaseContract {
303
332
  ): Promise<[boolean]>;
304
333
 
305
334
  mint(
335
+ receiver: string,
336
+ baseTokenIn: string,
337
+ amountBaseToPull: BigNumberish,
338
+ minAmountScyOut: BigNumberish,
339
+ overrides?: Overrides & { from?: string | Promise<string> }
340
+ ): Promise<ContractTransaction>;
341
+
342
+ mintNoPull(
306
343
  receiver: string,
307
344
  baseTokenIn: string,
308
345
  minAmountScyOut: BigNumberish,
@@ -312,6 +349,14 @@ export interface SCYBaseWithRewards extends BaseContract {
312
349
  name(overrides?: CallOverrides): Promise<[string]>;
313
350
 
314
351
  redeem(
352
+ receiver: string,
353
+ baseTokenOut: string,
354
+ amountScyToPull: BigNumberish,
355
+ minAmountBaseOut: BigNumberish,
356
+ overrides?: Overrides & { from?: string | Promise<string> }
357
+ ): Promise<ContractTransaction>;
358
+
359
+ redeemNoPull(
315
360
  receiver: string,
316
361
  baseTokenOut: string,
317
362
  minAmountBaseOut: BigNumberish,
@@ -356,17 +401,6 @@ export interface SCYBaseWithRewards extends BaseContract {
356
401
  user: string,
357
402
  overrides?: Overrides & { from?: string | Promise<string> }
358
403
  ): Promise<ContractTransaction>;
359
-
360
- userReward(
361
- arg0: string,
362
- arg1: string,
363
- overrides?: CallOverrides
364
- ): Promise<
365
- [BigNumber, BigNumber] & {
366
- lastIndex: BigNumber;
367
- accruedReward: BigNumber;
368
- }
369
- >;
370
404
  };
371
405
 
372
406
  allowance(
@@ -395,13 +429,21 @@ export interface SCYBaseWithRewards extends BaseContract {
395
429
 
396
430
  getBaseTokens(overrides?: CallOverrides): Promise<string[]>;
397
431
 
432
+ getGlobalReward(
433
+ rewardToken: string,
434
+ overrides?: CallOverrides
435
+ ): Promise<
436
+ [BigNumber, BigNumber] & { index: BigNumber; lastBalance: BigNumber }
437
+ >;
438
+
398
439
  getRewardTokens(overrides?: CallOverrides): Promise<string[]>;
399
440
 
400
- globalReward(
401
- arg0: string,
441
+ getUserReward(
442
+ user: string,
443
+ rewardToken: string,
402
444
  overrides?: CallOverrides
403
445
  ): Promise<
404
- [BigNumber, BigNumber] & { index: BigNumber; lastBalance: BigNumber }
446
+ [BigNumber, BigNumber] & { lastIndex: BigNumber; accruedReward: BigNumber }
405
447
  >;
406
448
 
407
449
  increaseAllowance(
@@ -413,6 +455,14 @@ export interface SCYBaseWithRewards extends BaseContract {
413
455
  isValidBaseToken(token: string, overrides?: CallOverrides): Promise<boolean>;
414
456
 
415
457
  mint(
458
+ receiver: string,
459
+ baseTokenIn: string,
460
+ amountBaseToPull: BigNumberish,
461
+ minAmountScyOut: BigNumberish,
462
+ overrides?: Overrides & { from?: string | Promise<string> }
463
+ ): Promise<ContractTransaction>;
464
+
465
+ mintNoPull(
416
466
  receiver: string,
417
467
  baseTokenIn: string,
418
468
  minAmountScyOut: BigNumberish,
@@ -422,6 +472,14 @@ export interface SCYBaseWithRewards extends BaseContract {
422
472
  name(overrides?: CallOverrides): Promise<string>;
423
473
 
424
474
  redeem(
475
+ receiver: string,
476
+ baseTokenOut: string,
477
+ amountScyToPull: BigNumberish,
478
+ minAmountBaseOut: BigNumberish,
479
+ overrides?: Overrides & { from?: string | Promise<string> }
480
+ ): Promise<ContractTransaction>;
481
+
482
+ redeemNoPull(
425
483
  receiver: string,
426
484
  baseTokenOut: string,
427
485
  minAmountBaseOut: BigNumberish,
@@ -465,14 +523,6 @@ export interface SCYBaseWithRewards extends BaseContract {
465
523
  overrides?: Overrides & { from?: string | Promise<string> }
466
524
  ): Promise<ContractTransaction>;
467
525
 
468
- userReward(
469
- arg0: string,
470
- arg1: string,
471
- overrides?: CallOverrides
472
- ): Promise<
473
- [BigNumber, BigNumber] & { lastIndex: BigNumber; accruedReward: BigNumber }
474
- >;
475
-
476
526
  callStatic: {
477
527
  allowance(
478
528
  owner: string,
@@ -500,13 +550,24 @@ export interface SCYBaseWithRewards extends BaseContract {
500
550
 
501
551
  getBaseTokens(overrides?: CallOverrides): Promise<string[]>;
502
552
 
553
+ getGlobalReward(
554
+ rewardToken: string,
555
+ overrides?: CallOverrides
556
+ ): Promise<
557
+ [BigNumber, BigNumber] & { index: BigNumber; lastBalance: BigNumber }
558
+ >;
559
+
503
560
  getRewardTokens(overrides?: CallOverrides): Promise<string[]>;
504
561
 
505
- globalReward(
506
- arg0: string,
562
+ getUserReward(
563
+ user: string,
564
+ rewardToken: string,
507
565
  overrides?: CallOverrides
508
566
  ): Promise<
509
- [BigNumber, BigNumber] & { index: BigNumber; lastBalance: BigNumber }
567
+ [BigNumber, BigNumber] & {
568
+ lastIndex: BigNumber;
569
+ accruedReward: BigNumber;
570
+ }
510
571
  >;
511
572
 
512
573
  increaseAllowance(
@@ -521,6 +582,14 @@ export interface SCYBaseWithRewards extends BaseContract {
521
582
  ): Promise<boolean>;
522
583
 
523
584
  mint(
585
+ receiver: string,
586
+ baseTokenIn: string,
587
+ amountBaseToPull: BigNumberish,
588
+ minAmountScyOut: BigNumberish,
589
+ overrides?: CallOverrides
590
+ ): Promise<BigNumber>;
591
+
592
+ mintNoPull(
524
593
  receiver: string,
525
594
  baseTokenIn: string,
526
595
  minAmountScyOut: BigNumberish,
@@ -530,6 +599,14 @@ export interface SCYBaseWithRewards extends BaseContract {
530
599
  name(overrides?: CallOverrides): Promise<string>;
531
600
 
532
601
  redeem(
602
+ receiver: string,
603
+ baseTokenOut: string,
604
+ amountScyToPull: BigNumberish,
605
+ minAmountBaseOut: BigNumberish,
606
+ overrides?: CallOverrides
607
+ ): Promise<BigNumber>;
608
+
609
+ redeemNoPull(
533
610
  receiver: string,
534
611
  baseTokenOut: string,
535
612
  minAmountBaseOut: BigNumberish,
@@ -562,17 +639,6 @@ export interface SCYBaseWithRewards extends BaseContract {
562
639
  updateGlobalReward(overrides?: CallOverrides): Promise<void>;
563
640
 
564
641
  updateUserReward(user: string, overrides?: CallOverrides): Promise<void>;
565
-
566
- userReward(
567
- arg0: string,
568
- arg1: string,
569
- overrides?: CallOverrides
570
- ): Promise<
571
- [BigNumber, BigNumber] & {
572
- lastIndex: BigNumber;
573
- accruedReward: BigNumber;
574
- }
575
- >;
576
642
  };
577
643
 
578
644
  filters: {
@@ -626,9 +692,18 @@ export interface SCYBaseWithRewards extends BaseContract {
626
692
 
627
693
  getBaseTokens(overrides?: CallOverrides): Promise<BigNumber>;
628
694
 
695
+ getGlobalReward(
696
+ rewardToken: string,
697
+ overrides?: CallOverrides
698
+ ): Promise<BigNumber>;
699
+
629
700
  getRewardTokens(overrides?: CallOverrides): Promise<BigNumber>;
630
701
 
631
- globalReward(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
702
+ getUserReward(
703
+ user: string,
704
+ rewardToken: string,
705
+ overrides?: CallOverrides
706
+ ): Promise<BigNumber>;
632
707
 
633
708
  increaseAllowance(
634
709
  spender: string,
@@ -642,6 +717,14 @@ export interface SCYBaseWithRewards extends BaseContract {
642
717
  ): Promise<BigNumber>;
643
718
 
644
719
  mint(
720
+ receiver: string,
721
+ baseTokenIn: string,
722
+ amountBaseToPull: BigNumberish,
723
+ minAmountScyOut: BigNumberish,
724
+ overrides?: Overrides & { from?: string | Promise<string> }
725
+ ): Promise<BigNumber>;
726
+
727
+ mintNoPull(
645
728
  receiver: string,
646
729
  baseTokenIn: string,
647
730
  minAmountScyOut: BigNumberish,
@@ -651,6 +734,14 @@ export interface SCYBaseWithRewards extends BaseContract {
651
734
  name(overrides?: CallOverrides): Promise<BigNumber>;
652
735
 
653
736
  redeem(
737
+ receiver: string,
738
+ baseTokenOut: string,
739
+ amountScyToPull: BigNumberish,
740
+ minAmountBaseOut: BigNumberish,
741
+ overrides?: Overrides & { from?: string | Promise<string> }
742
+ ): Promise<BigNumber>;
743
+
744
+ redeemNoPull(
654
745
  receiver: string,
655
746
  baseTokenOut: string,
656
747
  minAmountBaseOut: BigNumberish,
@@ -693,12 +784,6 @@ export interface SCYBaseWithRewards extends BaseContract {
693
784
  user: string,
694
785
  overrides?: Overrides & { from?: string | Promise<string> }
695
786
  ): Promise<BigNumber>;
696
-
697
- userReward(
698
- arg0: string,
699
- arg1: string,
700
- overrides?: CallOverrides
701
- ): Promise<BigNumber>;
702
787
  };
703
788
 
704
789
  populateTransaction: {
@@ -731,10 +816,16 @@ export interface SCYBaseWithRewards extends BaseContract {
731
816
 
732
817
  getBaseTokens(overrides?: CallOverrides): Promise<PopulatedTransaction>;
733
818
 
819
+ getGlobalReward(
820
+ rewardToken: string,
821
+ overrides?: CallOverrides
822
+ ): Promise<PopulatedTransaction>;
823
+
734
824
  getRewardTokens(overrides?: CallOverrides): Promise<PopulatedTransaction>;
735
825
 
736
- globalReward(
737
- arg0: string,
826
+ getUserReward(
827
+ user: string,
828
+ rewardToken: string,
738
829
  overrides?: CallOverrides
739
830
  ): Promise<PopulatedTransaction>;
740
831
 
@@ -750,6 +841,14 @@ export interface SCYBaseWithRewards extends BaseContract {
750
841
  ): Promise<PopulatedTransaction>;
751
842
 
752
843
  mint(
844
+ receiver: string,
845
+ baseTokenIn: string,
846
+ amountBaseToPull: BigNumberish,
847
+ minAmountScyOut: BigNumberish,
848
+ overrides?: Overrides & { from?: string | Promise<string> }
849
+ ): Promise<PopulatedTransaction>;
850
+
851
+ mintNoPull(
753
852
  receiver: string,
754
853
  baseTokenIn: string,
755
854
  minAmountScyOut: BigNumberish,
@@ -759,6 +858,14 @@ export interface SCYBaseWithRewards extends BaseContract {
759
858
  name(overrides?: CallOverrides): Promise<PopulatedTransaction>;
760
859
 
761
860
  redeem(
861
+ receiver: string,
862
+ baseTokenOut: string,
863
+ amountScyToPull: BigNumberish,
864
+ minAmountBaseOut: BigNumberish,
865
+ overrides?: Overrides & { from?: string | Promise<string> }
866
+ ): Promise<PopulatedTransaction>;
867
+
868
+ redeemNoPull(
762
869
  receiver: string,
763
870
  baseTokenOut: string,
764
871
  minAmountBaseOut: BigNumberish,
@@ -801,11 +908,5 @@ export interface SCYBaseWithRewards extends BaseContract {
801
908
  user: string,
802
909
  overrides?: Overrides & { from?: string | Promise<string> }
803
910
  ): Promise<PopulatedTransaction>;
804
-
805
- userReward(
806
- arg0: string,
807
- arg1: string,
808
- overrides?: CallOverrides
809
- ): Promise<PopulatedTransaction>;
810
911
  };
811
912
  }