@gooddollar/goodcollective-contracts 1.1.0 → 1.3.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 (72) hide show
  1. package/README.md +14 -1
  2. package/contracts/DirectPayments/DirectPaymentsFactory.sol +23 -15
  3. package/contracts/DirectPayments/DirectPaymentsLibrary.sol +54 -0
  4. package/contracts/DirectPayments/DirectPaymentsPool.sol +25 -41
  5. package/contracts/GoodCollective/GoodCollectiveSuperApp.sol +89 -61
  6. package/contracts/GoodCollective/IGoodCollectiveSuperApp.sol +12 -0
  7. package/contracts/Interfaces.sol +25 -0
  8. package/contracts/UBI/UBIPool.sol +103 -90
  9. package/contracts/UBI/UBIPoolFactory.sol +24 -10
  10. package/contracts/test/HelperLibraryTest.sol +16 -0
  11. package/contracts/utils/HelperLibrary.sol +109 -8
  12. package/package.json +4 -3
  13. package/releases/deployment.json +22797 -431
  14. package/typechain-types/@uniswap/index.ts +0 -2
  15. package/typechain-types/contracts/DirectPayments/DirectPaymentsFactory.ts +56 -9
  16. package/typechain-types/contracts/DirectPayments/DirectPaymentsPool.sol/DirectPaymentsPool.ts +187 -9
  17. package/typechain-types/contracts/GoodCollective/GoodCollectiveSuperApp.ts +150 -6
  18. package/typechain-types/contracts/{UBI/MultiClaimModule.sol/IClaimable.ts → GoodCollective/IGoodCollectiveSuperApp.sol/IGoodCollectiveSuperApp.ts} +24 -23
  19. package/typechain-types/contracts/GoodCollective/{GoodCollectiveSuperApp.sol → IGoodCollectiveSuperApp.sol}/index.ts +1 -1
  20. package/typechain-types/contracts/GoodCollective/index.ts +3 -2
  21. package/typechain-types/contracts/{UBI/UBIPool.sol → Interfaces.sol}/IIdentityV2.ts +1 -1
  22. package/typechain-types/contracts/{UBI/UBIPool.sol → Interfaces.sol}/IMembersValidator.ts +1 -1
  23. package/typechain-types/contracts/{UBI/UBIPool.sol → Interfaces.sol}/index.ts +0 -1
  24. package/typechain-types/contracts/UBI/{UBIPool.sol/UBIPool.ts → UBIPool.ts} +325 -78
  25. package/typechain-types/contracts/UBI/UBIPoolFactory.ts +95 -33
  26. package/typechain-types/contracts/UBI/index.ts +1 -4
  27. package/typechain-types/contracts/index.ts +4 -0
  28. package/typechain-types/contracts/test/HelperLibraryTest.ts +147 -0
  29. package/typechain-types/{@uniswap/v3-periphery/contracts/interfaces → contracts/test}/index.ts +1 -1
  30. package/typechain-types/contracts/utils/HelperLibrary.ts +46 -4
  31. package/typechain-types/factories/@uniswap/index.ts +0 -1
  32. package/typechain-types/factories/contracts/DirectPayments/DirectPaymentsFactory__factory.ts +25 -2
  33. package/typechain-types/factories/contracts/DirectPayments/DirectPaymentsPool.sol/DirectPaymentsPool__factory.ts +128 -1
  34. package/typechain-types/factories/contracts/GoodCollective/GoodCollectiveSuperApp__factory.ts +105 -1
  35. package/typechain-types/factories/contracts/GoodCollective/IGoodCollectiveSuperApp.sol/IGoodCollectiveSuperApp__factory.ts +48 -0
  36. package/typechain-types/factories/contracts/GoodCollective/{GoodCollectiveSuperApp.sol → IGoodCollectiveSuperApp.sol}/IRegistry__factory.ts +1 -1
  37. package/typechain-types/factories/contracts/GoodCollective/{GoodCollectiveSuperApp.sol → IGoodCollectiveSuperApp.sol}/index.ts +1 -1
  38. package/typechain-types/factories/contracts/GoodCollective/index.ts +2 -1
  39. package/typechain-types/factories/contracts/{UBI/UBIPool.sol → Interfaces.sol}/IIdentityV2__factory.ts +1 -1
  40. package/typechain-types/factories/contracts/{UBI/UBIPool.sol → Interfaces.sol}/IMembersValidator__factory.ts +1 -1
  41. package/typechain-types/factories/contracts/{UBI/UBIPool.sol → Interfaces.sol}/index.ts +0 -1
  42. package/typechain-types/factories/contracts/UBI/UBIPoolFactory__factory.ts +76 -4
  43. package/typechain-types/factories/contracts/UBI/UBIPool__factory.ts +2052 -0
  44. package/typechain-types/factories/contracts/UBI/index.ts +1 -2
  45. package/typechain-types/factories/contracts/index.ts +2 -0
  46. package/typechain-types/factories/contracts/test/HelperLibraryTest__factory.ts +154 -0
  47. package/typechain-types/{@uniswap/v3-periphery → factories/contracts/test}/index.ts +1 -2
  48. package/typechain-types/factories/contracts/utils/HelperLibrary__factory.ts +31 -1
  49. package/typechain-types/hardhat.d.ts +18 -36
  50. package/typechain-types/index.ts +10 -14
  51. package/contracts/UBI/MultiClaimModule.sol +0 -78
  52. package/typechain-types/@gooddollar/goodprotocol/contracts/token/FeesFormula.sol/IFeesFormula.ts +0 -115
  53. package/typechain-types/@gooddollar/goodprotocol/contracts/token/FeesFormula.sol/index.ts +0 -4
  54. package/typechain-types/@uniswap/v3-periphery/contracts/index.ts +0 -5
  55. package/typechain-types/@uniswap/v3-periphery/contracts/interfaces/ISwapRouter.ts +0 -369
  56. package/typechain-types/contracts/GoodCollective/GoodCollectiveSuperApp.sol/GoodCollectiveSuperApp.ts +0 -1000
  57. package/typechain-types/contracts/UBI/MultiClaimModule.sol/IModule.ts +0 -196
  58. package/typechain-types/contracts/UBI/MultiClaimModule.sol/MultiClaimModule.ts +0 -242
  59. package/typechain-types/contracts/UBI/MultiClaimModule.sol/index.ts +0 -6
  60. package/typechain-types/factories/@gooddollar/goodprotocol/contracts/token/FeesFormula.sol/IFeesFormula__factory.ts +0 -60
  61. package/typechain-types/factories/@gooddollar/goodprotocol/contracts/token/FeesFormula.sol/index.ts +0 -4
  62. package/typechain-types/factories/@uniswap/v3-periphery/contracts/index.ts +0 -4
  63. package/typechain-types/factories/@uniswap/v3-periphery/contracts/interfaces/ISwapRouter__factory.ts +0 -263
  64. package/typechain-types/factories/@uniswap/v3-periphery/contracts/interfaces/index.ts +0 -4
  65. package/typechain-types/factories/@uniswap/v3-periphery/index.ts +0 -4
  66. package/typechain-types/factories/contracts/GoodCollective/GoodCollectiveSuperApp.sol/GoodCollectiveSuperApp__factory.ts +0 -728
  67. package/typechain-types/factories/contracts/UBI/MultiClaimModule.sol/IClaimable__factory.ts +0 -33
  68. package/typechain-types/factories/contracts/UBI/MultiClaimModule.sol/IModule__factory.ts +0 -84
  69. package/typechain-types/factories/contracts/UBI/MultiClaimModule.sol/MultiClaimModule__factory.ts +0 -150
  70. package/typechain-types/factories/contracts/UBI/MultiClaimModule.sol/index.ts +0 -6
  71. package/typechain-types/factories/contracts/UBI/UBIPool.sol/UBIPool__factory.ts +0 -1835
  72. /package/typechain-types/contracts/GoodCollective/{GoodCollectiveSuperApp.sol → IGoodCollectiveSuperApp.sol}/IRegistry.ts +0 -0
@@ -161,6 +161,7 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
161
161
  "claim(uint256)": FunctionFragment;
162
162
  "claim(uint256,(uint32,uint16,string,(uint16,uint32,uint256,string,address[],uint128)[]))": FunctionFragment;
163
163
  "claimedNfts(uint256)": FunctionFragment;
164
+ "getManagerFee()": FunctionFragment;
164
165
  "getRealtimeContribution(address)": FunctionFragment;
165
166
  "getRealtimeStats()": FunctionFragment;
166
167
  "getRegistry()": FunctionFragment;
@@ -170,9 +171,10 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
170
171
  "handleSwap((address,uint256,uint256,uint256,bytes),address,bytes)": FunctionFragment;
171
172
  "hasRole(bytes32,address)": FunctionFragment;
172
173
  "host()": FunctionFragment;
173
- "initialize(address,(uint32,uint16[],uint128[],address,address,address,address,bool),(uint256,uint256,uint256),address)": FunctionFragment;
174
+ "initialize(address,(uint32,uint16[],uint128[],address,address,address,address,bool),(uint256,uint256,uint256),uint32,address)": FunctionFragment;
174
175
  "isAcceptedSuperToken(address)": FunctionFragment;
175
176
  "limits()": FunctionFragment;
177
+ "managerFeeBps()": FunctionFragment;
176
178
  "memberLimits(address)": FunctionFragment;
177
179
  "mintNFT(address,(uint32,uint16,string,(uint16,uint32,uint256,string,address[],uint128)[]),bool)": FunctionFragment;
178
180
  "nft()": FunctionFragment;
@@ -183,11 +185,12 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
183
185
  "renounceRole(bytes32,address)": FunctionFragment;
184
186
  "revokeRole(bytes32,address)": FunctionFragment;
185
187
  "setPoolLimits((uint256,uint256,uint256))": FunctionFragment;
186
- "setPoolSettings((uint32,uint16[],uint128[],address,address,address,address,bool))": FunctionFragment;
188
+ "setPoolSettings((uint32,uint16[],uint128[],address,address,address,address,bool),uint32)": FunctionFragment;
187
189
  "settings()": FunctionFragment;
188
190
  "stats()": FunctionFragment;
189
191
  "superToken()": FunctionFragment;
190
192
  "support(address,uint256,bytes)": FunctionFragment;
193
+ "supportWithSwap(address,(address,uint256,uint256,uint256,bytes),bytes)": FunctionFragment;
191
194
  "supporters(address)": FunctionFragment;
192
195
  "supportsInterface(bytes4)": FunctionFragment;
193
196
  "swapRouter()": FunctionFragment;
@@ -214,6 +217,7 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
214
217
  | "claim(uint256)"
215
218
  | "claim(uint256,(uint32,uint16,string,(uint16,uint32,uint256,string,address[],uint128)[]))"
216
219
  | "claimedNfts"
220
+ | "getManagerFee"
217
221
  | "getRealtimeContribution"
218
222
  | "getRealtimeStats"
219
223
  | "getRegistry"
@@ -226,6 +230,7 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
226
230
  | "initialize"
227
231
  | "isAcceptedSuperToken"
228
232
  | "limits"
233
+ | "managerFeeBps"
229
234
  | "memberLimits"
230
235
  | "mintNFT"
231
236
  | "nft"
@@ -241,6 +246,7 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
241
246
  | "stats"
242
247
  | "superToken"
243
248
  | "support"
249
+ | "supportWithSwap"
244
250
  | "supporters"
245
251
  | "supportsInterface"
246
252
  | "swapRouter"
@@ -349,6 +355,10 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
349
355
  functionFragment: "claimedNfts",
350
356
  values: [PromiseOrValue<BigNumberish>]
351
357
  ): string;
358
+ encodeFunctionData(
359
+ functionFragment: "getManagerFee",
360
+ values?: undefined
361
+ ): string;
352
362
  encodeFunctionData(
353
363
  functionFragment: "getRealtimeContribution",
354
364
  values: [PromiseOrValue<string>]
@@ -392,6 +402,7 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
392
402
  PromiseOrValue<string>,
393
403
  DirectPaymentsPool.PoolSettingsStruct,
394
404
  DirectPaymentsPool.SafetyLimitsStruct,
405
+ PromiseOrValue<BigNumberish>,
395
406
  PromiseOrValue<string>
396
407
  ]
397
408
  ): string;
@@ -400,6 +411,10 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
400
411
  values: [PromiseOrValue<string>]
401
412
  ): string;
402
413
  encodeFunctionData(functionFragment: "limits", values?: undefined): string;
414
+ encodeFunctionData(
415
+ functionFragment: "managerFeeBps",
416
+ values?: undefined
417
+ ): string;
403
418
  encodeFunctionData(
404
419
  functionFragment: "memberLimits",
405
420
  values: [PromiseOrValue<string>]
@@ -449,7 +464,10 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
449
464
  ): string;
450
465
  encodeFunctionData(
451
466
  functionFragment: "setPoolSettings",
452
- values: [DirectPaymentsPool.PoolSettingsStruct]
467
+ values: [
468
+ DirectPaymentsPool.PoolSettingsStruct,
469
+ PromiseOrValue<BigNumberish>
470
+ ]
453
471
  ): string;
454
472
  encodeFunctionData(functionFragment: "settings", values?: undefined): string;
455
473
  encodeFunctionData(functionFragment: "stats", values?: undefined): string;
@@ -465,6 +483,14 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
465
483
  PromiseOrValue<BytesLike>
466
484
  ]
467
485
  ): string;
486
+ encodeFunctionData(
487
+ functionFragment: "supportWithSwap",
488
+ values: [
489
+ PromiseOrValue<string>,
490
+ HelperLibrary.SwapDataStruct,
491
+ PromiseOrValue<BytesLike>
492
+ ]
493
+ ): string;
468
494
  encodeFunctionData(
469
495
  functionFragment: "supporters",
470
496
  values: [PromiseOrValue<string>]
@@ -548,6 +574,10 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
548
574
  functionFragment: "claimedNfts",
549
575
  data: BytesLike
550
576
  ): Result;
577
+ decodeFunctionResult(
578
+ functionFragment: "getManagerFee",
579
+ data: BytesLike
580
+ ): Result;
551
581
  decodeFunctionResult(
552
582
  functionFragment: "getRealtimeContribution",
553
583
  data: BytesLike
@@ -578,6 +608,10 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
578
608
  data: BytesLike
579
609
  ): Result;
580
610
  decodeFunctionResult(functionFragment: "limits", data: BytesLike): Result;
611
+ decodeFunctionResult(
612
+ functionFragment: "managerFeeBps",
613
+ data: BytesLike
614
+ ): Result;
581
615
  decodeFunctionResult(
582
616
  functionFragment: "memberLimits",
583
617
  data: BytesLike
@@ -614,6 +648,10 @@ export interface DirectPaymentsPoolInterface extends utils.Interface {
614
648
  decodeFunctionResult(functionFragment: "stats", data: BytesLike): Result;
615
649
  decodeFunctionResult(functionFragment: "superToken", data: BytesLike): Result;
616
650
  decodeFunctionResult(functionFragment: "support", data: BytesLike): Result;
651
+ decodeFunctionResult(
652
+ functionFragment: "supportWithSwap",
653
+ data: BytesLike
654
+ ): Result;
617
655
  decodeFunctionResult(functionFragment: "supporters", data: BytesLike): Result;
618
656
  decodeFunctionResult(
619
657
  functionFragment: "supportsInterface",
@@ -950,6 +988,10 @@ export interface DirectPaymentsPool extends BaseContract {
950
988
  overrides?: CallOverrides
951
989
  ): Promise<[boolean]>;
952
990
 
991
+ getManagerFee(
992
+ overrides?: CallOverrides
993
+ ): Promise<[string, number] & { feeRecipient: string; feeBps: number }>;
994
+
953
995
  getRealtimeContribution(
954
996
  _user: PromiseOrValue<string>,
955
997
  overrides?: CallOverrides
@@ -958,11 +1000,22 @@ export interface DirectPaymentsPool extends BaseContract {
958
1000
  getRealtimeStats(
959
1001
  overrides?: CallOverrides
960
1002
  ): Promise<
961
- [BigNumber, BigNumber, BigNumber, BigNumber] & {
1003
+ [
1004
+ BigNumber,
1005
+ BigNumber,
1006
+ BigNumber,
1007
+ BigNumber,
1008
+ BigNumber,
1009
+ BigNumber,
1010
+ BigNumber
1011
+ ] & {
962
1012
  netIncome: BigNumber;
963
1013
  totalFees: BigNumber;
1014
+ protocolFees: BigNumber;
1015
+ managerFees: BigNumber;
964
1016
  incomeFlowRate: BigNumber;
965
1017
  feeRate: BigNumber;
1018
+ managerFeeRate: BigNumber;
966
1019
  }
967
1020
  >;
968
1021
 
@@ -1010,6 +1063,7 @@ export interface DirectPaymentsPool extends BaseContract {
1010
1063
  _nft: PromiseOrValue<string>,
1011
1064
  _settings: DirectPaymentsPool.PoolSettingsStruct,
1012
1065
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
1066
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
1013
1067
  _registry: PromiseOrValue<string>,
1014
1068
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1015
1069
  ): Promise<ContractTransaction>;
@@ -1029,6 +1083,8 @@ export interface DirectPaymentsPool extends BaseContract {
1029
1083
  }
1030
1084
  >;
1031
1085
 
1086
+ managerFeeBps(overrides?: CallOverrides): Promise<[number]>;
1087
+
1032
1088
  memberLimits(
1033
1089
  arg0: PromiseOrValue<string>,
1034
1090
  overrides?: CallOverrides
@@ -1089,6 +1145,7 @@ export interface DirectPaymentsPool extends BaseContract {
1089
1145
 
1090
1146
  setPoolSettings(
1091
1147
  _settings: DirectPaymentsPool.PoolSettingsStruct,
1148
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
1092
1149
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1093
1150
  ): Promise<ContractTransaction>;
1094
1151
 
@@ -1108,12 +1165,24 @@ export interface DirectPaymentsPool extends BaseContract {
1108
1165
  stats(
1109
1166
  overrides?: CallOverrides
1110
1167
  ): Promise<
1111
- [BigNumber, BigNumber, BigNumber, string, BigNumber] & {
1168
+ [
1169
+ BigNumber,
1170
+ BigNumber,
1171
+ BigNumber,
1172
+ string,
1173
+ BigNumber,
1174
+ string,
1175
+ BigNumber,
1176
+ BigNumber
1177
+ ] & {
1112
1178
  netIncome: BigNumber;
1113
1179
  totalFees: BigNumber;
1114
1180
  lastUpdate: BigNumber;
1115
1181
  lastFeeRecipient: string;
1116
1182
  lastIncomeRate: BigNumber;
1183
+ lastManagerFeeRecipient: string;
1184
+ protocolFees: BigNumber;
1185
+ managerFees: BigNumber;
1117
1186
  }
1118
1187
  >;
1119
1188
 
@@ -1126,6 +1195,13 @@ export interface DirectPaymentsPool extends BaseContract {
1126
1195
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1127
1196
  ): Promise<ContractTransaction>;
1128
1197
 
1198
+ supportWithSwap(
1199
+ _sender: PromiseOrValue<string>,
1200
+ _customData: HelperLibrary.SwapDataStruct,
1201
+ _ctx: PromiseOrValue<BytesLike>,
1202
+ overrides?: Overrides & { from?: PromiseOrValue<string> }
1203
+ ): Promise<ContractTransaction>;
1204
+
1129
1205
  supporters(
1130
1206
  arg0: PromiseOrValue<string>,
1131
1207
  overrides?: CallOverrides
@@ -1250,6 +1326,10 @@ export interface DirectPaymentsPool extends BaseContract {
1250
1326
  overrides?: CallOverrides
1251
1327
  ): Promise<boolean>;
1252
1328
 
1329
+ getManagerFee(
1330
+ overrides?: CallOverrides
1331
+ ): Promise<[string, number] & { feeRecipient: string; feeBps: number }>;
1332
+
1253
1333
  getRealtimeContribution(
1254
1334
  _user: PromiseOrValue<string>,
1255
1335
  overrides?: CallOverrides
@@ -1258,11 +1338,22 @@ export interface DirectPaymentsPool extends BaseContract {
1258
1338
  getRealtimeStats(
1259
1339
  overrides?: CallOverrides
1260
1340
  ): Promise<
1261
- [BigNumber, BigNumber, BigNumber, BigNumber] & {
1341
+ [
1342
+ BigNumber,
1343
+ BigNumber,
1344
+ BigNumber,
1345
+ BigNumber,
1346
+ BigNumber,
1347
+ BigNumber,
1348
+ BigNumber
1349
+ ] & {
1262
1350
  netIncome: BigNumber;
1263
1351
  totalFees: BigNumber;
1352
+ protocolFees: BigNumber;
1353
+ managerFees: BigNumber;
1264
1354
  incomeFlowRate: BigNumber;
1265
1355
  feeRate: BigNumber;
1356
+ managerFeeRate: BigNumber;
1266
1357
  }
1267
1358
  >;
1268
1359
 
@@ -1310,6 +1401,7 @@ export interface DirectPaymentsPool extends BaseContract {
1310
1401
  _nft: PromiseOrValue<string>,
1311
1402
  _settings: DirectPaymentsPool.PoolSettingsStruct,
1312
1403
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
1404
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
1313
1405
  _registry: PromiseOrValue<string>,
1314
1406
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1315
1407
  ): Promise<ContractTransaction>;
@@ -1329,6 +1421,8 @@ export interface DirectPaymentsPool extends BaseContract {
1329
1421
  }
1330
1422
  >;
1331
1423
 
1424
+ managerFeeBps(overrides?: CallOverrides): Promise<number>;
1425
+
1332
1426
  memberLimits(
1333
1427
  arg0: PromiseOrValue<string>,
1334
1428
  overrides?: CallOverrides
@@ -1389,6 +1483,7 @@ export interface DirectPaymentsPool extends BaseContract {
1389
1483
 
1390
1484
  setPoolSettings(
1391
1485
  _settings: DirectPaymentsPool.PoolSettingsStruct,
1486
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
1392
1487
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1393
1488
  ): Promise<ContractTransaction>;
1394
1489
 
@@ -1408,12 +1503,24 @@ export interface DirectPaymentsPool extends BaseContract {
1408
1503
  stats(
1409
1504
  overrides?: CallOverrides
1410
1505
  ): Promise<
1411
- [BigNumber, BigNumber, BigNumber, string, BigNumber] & {
1506
+ [
1507
+ BigNumber,
1508
+ BigNumber,
1509
+ BigNumber,
1510
+ string,
1511
+ BigNumber,
1512
+ string,
1513
+ BigNumber,
1514
+ BigNumber
1515
+ ] & {
1412
1516
  netIncome: BigNumber;
1413
1517
  totalFees: BigNumber;
1414
1518
  lastUpdate: BigNumber;
1415
1519
  lastFeeRecipient: string;
1416
1520
  lastIncomeRate: BigNumber;
1521
+ lastManagerFeeRecipient: string;
1522
+ protocolFees: BigNumber;
1523
+ managerFees: BigNumber;
1417
1524
  }
1418
1525
  >;
1419
1526
 
@@ -1426,6 +1533,13 @@ export interface DirectPaymentsPool extends BaseContract {
1426
1533
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1427
1534
  ): Promise<ContractTransaction>;
1428
1535
 
1536
+ supportWithSwap(
1537
+ _sender: PromiseOrValue<string>,
1538
+ _customData: HelperLibrary.SwapDataStruct,
1539
+ _ctx: PromiseOrValue<BytesLike>,
1540
+ overrides?: Overrides & { from?: PromiseOrValue<string> }
1541
+ ): Promise<ContractTransaction>;
1542
+
1429
1543
  supporters(
1430
1544
  arg0: PromiseOrValue<string>,
1431
1545
  overrides?: CallOverrides
@@ -1550,6 +1664,10 @@ export interface DirectPaymentsPool extends BaseContract {
1550
1664
  overrides?: CallOverrides
1551
1665
  ): Promise<boolean>;
1552
1666
 
1667
+ getManagerFee(
1668
+ overrides?: CallOverrides
1669
+ ): Promise<[string, number] & { feeRecipient: string; feeBps: number }>;
1670
+
1553
1671
  getRealtimeContribution(
1554
1672
  _user: PromiseOrValue<string>,
1555
1673
  overrides?: CallOverrides
@@ -1558,11 +1676,22 @@ export interface DirectPaymentsPool extends BaseContract {
1558
1676
  getRealtimeStats(
1559
1677
  overrides?: CallOverrides
1560
1678
  ): Promise<
1561
- [BigNumber, BigNumber, BigNumber, BigNumber] & {
1679
+ [
1680
+ BigNumber,
1681
+ BigNumber,
1682
+ BigNumber,
1683
+ BigNumber,
1684
+ BigNumber,
1685
+ BigNumber,
1686
+ BigNumber
1687
+ ] & {
1562
1688
  netIncome: BigNumber;
1563
1689
  totalFees: BigNumber;
1690
+ protocolFees: BigNumber;
1691
+ managerFees: BigNumber;
1564
1692
  incomeFlowRate: BigNumber;
1565
1693
  feeRate: BigNumber;
1694
+ managerFeeRate: BigNumber;
1566
1695
  }
1567
1696
  >;
1568
1697
 
@@ -1610,6 +1739,7 @@ export interface DirectPaymentsPool extends BaseContract {
1610
1739
  _nft: PromiseOrValue<string>,
1611
1740
  _settings: DirectPaymentsPool.PoolSettingsStruct,
1612
1741
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
1742
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
1613
1743
  _registry: PromiseOrValue<string>,
1614
1744
  overrides?: CallOverrides
1615
1745
  ): Promise<void>;
@@ -1629,6 +1759,8 @@ export interface DirectPaymentsPool extends BaseContract {
1629
1759
  }
1630
1760
  >;
1631
1761
 
1762
+ managerFeeBps(overrides?: CallOverrides): Promise<number>;
1763
+
1632
1764
  memberLimits(
1633
1765
  arg0: PromiseOrValue<string>,
1634
1766
  overrides?: CallOverrides
@@ -1689,6 +1821,7 @@ export interface DirectPaymentsPool extends BaseContract {
1689
1821
 
1690
1822
  setPoolSettings(
1691
1823
  _settings: DirectPaymentsPool.PoolSettingsStruct,
1824
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
1692
1825
  overrides?: CallOverrides
1693
1826
  ): Promise<void>;
1694
1827
 
@@ -1708,12 +1841,24 @@ export interface DirectPaymentsPool extends BaseContract {
1708
1841
  stats(
1709
1842
  overrides?: CallOverrides
1710
1843
  ): Promise<
1711
- [BigNumber, BigNumber, BigNumber, string, BigNumber] & {
1844
+ [
1845
+ BigNumber,
1846
+ BigNumber,
1847
+ BigNumber,
1848
+ string,
1849
+ BigNumber,
1850
+ string,
1851
+ BigNumber,
1852
+ BigNumber
1853
+ ] & {
1712
1854
  netIncome: BigNumber;
1713
1855
  totalFees: BigNumber;
1714
1856
  lastUpdate: BigNumber;
1715
1857
  lastFeeRecipient: string;
1716
1858
  lastIncomeRate: BigNumber;
1859
+ lastManagerFeeRecipient: string;
1860
+ protocolFees: BigNumber;
1861
+ managerFees: BigNumber;
1717
1862
  }
1718
1863
  >;
1719
1864
 
@@ -1726,6 +1871,13 @@ export interface DirectPaymentsPool extends BaseContract {
1726
1871
  overrides?: CallOverrides
1727
1872
  ): Promise<string>;
1728
1873
 
1874
+ supportWithSwap(
1875
+ _sender: PromiseOrValue<string>,
1876
+ _customData: HelperLibrary.SwapDataStruct,
1877
+ _ctx: PromiseOrValue<BytesLike>,
1878
+ overrides?: CallOverrides
1879
+ ): Promise<string>;
1880
+
1729
1881
  supporters(
1730
1882
  arg0: PromiseOrValue<string>,
1731
1883
  overrides?: CallOverrides
@@ -1987,6 +2139,8 @@ export interface DirectPaymentsPool extends BaseContract {
1987
2139
  overrides?: CallOverrides
1988
2140
  ): Promise<BigNumber>;
1989
2141
 
2142
+ getManagerFee(overrides?: CallOverrides): Promise<BigNumber>;
2143
+
1990
2144
  getRealtimeContribution(
1991
2145
  _user: PromiseOrValue<string>,
1992
2146
  overrides?: CallOverrides
@@ -2028,6 +2182,7 @@ export interface DirectPaymentsPool extends BaseContract {
2028
2182
  _nft: PromiseOrValue<string>,
2029
2183
  _settings: DirectPaymentsPool.PoolSettingsStruct,
2030
2184
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
2185
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
2031
2186
  _registry: PromiseOrValue<string>,
2032
2187
  overrides?: Overrides & { from?: PromiseOrValue<string> }
2033
2188
  ): Promise<BigNumber>;
@@ -2039,6 +2194,8 @@ export interface DirectPaymentsPool extends BaseContract {
2039
2194
 
2040
2195
  limits(overrides?: CallOverrides): Promise<BigNumber>;
2041
2196
 
2197
+ managerFeeBps(overrides?: CallOverrides): Promise<BigNumber>;
2198
+
2042
2199
  memberLimits(
2043
2200
  arg0: PromiseOrValue<string>,
2044
2201
  overrides?: CallOverrides
@@ -2091,6 +2248,7 @@ export interface DirectPaymentsPool extends BaseContract {
2091
2248
 
2092
2249
  setPoolSettings(
2093
2250
  _settings: DirectPaymentsPool.PoolSettingsStruct,
2251
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
2094
2252
  overrides?: Overrides & { from?: PromiseOrValue<string> }
2095
2253
  ): Promise<BigNumber>;
2096
2254
 
@@ -2107,6 +2265,13 @@ export interface DirectPaymentsPool extends BaseContract {
2107
2265
  overrides?: Overrides & { from?: PromiseOrValue<string> }
2108
2266
  ): Promise<BigNumber>;
2109
2267
 
2268
+ supportWithSwap(
2269
+ _sender: PromiseOrValue<string>,
2270
+ _customData: HelperLibrary.SwapDataStruct,
2271
+ _ctx: PromiseOrValue<BytesLike>,
2272
+ overrides?: Overrides & { from?: PromiseOrValue<string> }
2273
+ ): Promise<BigNumber>;
2274
+
2110
2275
  supporters(
2111
2276
  arg0: PromiseOrValue<string>,
2112
2277
  overrides?: CallOverrides
@@ -2226,6 +2391,8 @@ export interface DirectPaymentsPool extends BaseContract {
2226
2391
  overrides?: CallOverrides
2227
2392
  ): Promise<PopulatedTransaction>;
2228
2393
 
2394
+ getManagerFee(overrides?: CallOverrides): Promise<PopulatedTransaction>;
2395
+
2229
2396
  getRealtimeContribution(
2230
2397
  _user: PromiseOrValue<string>,
2231
2398
  overrides?: CallOverrides
@@ -2267,6 +2434,7 @@ export interface DirectPaymentsPool extends BaseContract {
2267
2434
  _nft: PromiseOrValue<string>,
2268
2435
  _settings: DirectPaymentsPool.PoolSettingsStruct,
2269
2436
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
2437
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
2270
2438
  _registry: PromiseOrValue<string>,
2271
2439
  overrides?: Overrides & { from?: PromiseOrValue<string> }
2272
2440
  ): Promise<PopulatedTransaction>;
@@ -2278,6 +2446,8 @@ export interface DirectPaymentsPool extends BaseContract {
2278
2446
 
2279
2447
  limits(overrides?: CallOverrides): Promise<PopulatedTransaction>;
2280
2448
 
2449
+ managerFeeBps(overrides?: CallOverrides): Promise<PopulatedTransaction>;
2450
+
2281
2451
  memberLimits(
2282
2452
  arg0: PromiseOrValue<string>,
2283
2453
  overrides?: CallOverrides
@@ -2330,6 +2500,7 @@ export interface DirectPaymentsPool extends BaseContract {
2330
2500
 
2331
2501
  setPoolSettings(
2332
2502
  _settings: DirectPaymentsPool.PoolSettingsStruct,
2503
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
2333
2504
  overrides?: Overrides & { from?: PromiseOrValue<string> }
2334
2505
  ): Promise<PopulatedTransaction>;
2335
2506
 
@@ -2346,6 +2517,13 @@ export interface DirectPaymentsPool extends BaseContract {
2346
2517
  overrides?: Overrides & { from?: PromiseOrValue<string> }
2347
2518
  ): Promise<PopulatedTransaction>;
2348
2519
 
2520
+ supportWithSwap(
2521
+ _sender: PromiseOrValue<string>,
2522
+ _customData: HelperLibrary.SwapDataStruct,
2523
+ _ctx: PromiseOrValue<BytesLike>,
2524
+ overrides?: Overrides & { from?: PromiseOrValue<string> }
2525
+ ): Promise<PopulatedTransaction>;
2526
+
2349
2527
  supporters(
2350
2528
  arg0: PromiseOrValue<string>,
2351
2529
  overrides?: CallOverrides