@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
@@ -5,5 +5,3 @@ import type * as swapRouterContracts from "./swap-router-contracts";
5
5
  export type { swapRouterContracts };
6
6
  import type * as v3Core from "./v3-core";
7
7
  export type { v3Core };
8
- import type * as v3Periphery from "./v3-periphery";
9
- export type { v3Periphery };
@@ -78,8 +78,8 @@ export interface DirectPaymentsFactoryInterface extends utils.Interface {
78
78
  "DEFAULT_ADMIN_ROLE()": FunctionFragment;
79
79
  "addMember(address)": FunctionFragment;
80
80
  "changePoolDetails(address,string)": FunctionFragment;
81
- "createBeaconPool(string,string,(uint32,uint16[],uint128[],address,address,address,address,bool),(uint256,uint256,uint256))": FunctionFragment;
82
- "createPool(string,string,(uint32,uint16[],uint128[],address,address,address,address,bool),(uint256,uint256,uint256))": FunctionFragment;
81
+ "createBeaconPool(string,string,(uint32,uint16[],uint128[],address,address,address,address,bool),(uint256,uint256,uint256),uint32)": FunctionFragment;
82
+ "createPool(string,string,(uint32,uint16[],uint128[],address,address,address,address,bool),(uint256,uint256,uint256),uint32)": FunctionFragment;
83
83
  "feeBps()": FunctionFragment;
84
84
  "feeRecipient()": FunctionFragment;
85
85
  "getRoleAdmin(bytes32)": FunctionFragment;
@@ -94,6 +94,7 @@ export interface DirectPaymentsFactoryInterface extends utils.Interface {
94
94
  "projectIdToControlPool(bytes32)": FunctionFragment;
95
95
  "proxiableUUID()": FunctionFragment;
96
96
  "registry(address)": FunctionFragment;
97
+ "removeMember(address)": FunctionFragment;
97
98
  "renounceRole(bytes32,address)": FunctionFragment;
98
99
  "revokeRole(bytes32,address)": FunctionFragment;
99
100
  "setFeeInfo(address,uint32)": FunctionFragment;
@@ -125,6 +126,7 @@ export interface DirectPaymentsFactoryInterface extends utils.Interface {
125
126
  | "projectIdToControlPool"
126
127
  | "proxiableUUID"
127
128
  | "registry"
129
+ | "removeMember"
128
130
  | "renounceRole"
129
131
  | "revokeRole"
130
132
  | "setFeeInfo"
@@ -153,7 +155,8 @@ export interface DirectPaymentsFactoryInterface extends utils.Interface {
153
155
  PromiseOrValue<string>,
154
156
  PromiseOrValue<string>,
155
157
  DirectPaymentsPool.PoolSettingsStruct,
156
- DirectPaymentsPool.SafetyLimitsStruct
158
+ DirectPaymentsPool.SafetyLimitsStruct,
159
+ PromiseOrValue<BigNumberish>
157
160
  ]
158
161
  ): string;
159
162
  encodeFunctionData(
@@ -162,7 +165,8 @@ export interface DirectPaymentsFactoryInterface extends utils.Interface {
162
165
  PromiseOrValue<string>,
163
166
  PromiseOrValue<string>,
164
167
  DirectPaymentsPool.PoolSettingsStruct,
165
- DirectPaymentsPool.SafetyLimitsStruct
168
+ DirectPaymentsPool.SafetyLimitsStruct,
169
+ PromiseOrValue<BigNumberish>
166
170
  ]
167
171
  ): string;
168
172
  encodeFunctionData(functionFragment: "feeBps", values?: undefined): string;
@@ -218,6 +222,10 @@ export interface DirectPaymentsFactoryInterface extends utils.Interface {
218
222
  functionFragment: "registry",
219
223
  values: [PromiseOrValue<string>]
220
224
  ): string;
225
+ encodeFunctionData(
226
+ functionFragment: "removeMember",
227
+ values: [PromiseOrValue<string>]
228
+ ): string;
221
229
  encodeFunctionData(
222
230
  functionFragment: "renounceRole",
223
231
  values: [PromiseOrValue<BytesLike>, PromiseOrValue<string>]
@@ -297,6 +305,10 @@ export interface DirectPaymentsFactoryInterface extends utils.Interface {
297
305
  data: BytesLike
298
306
  ): Result;
299
307
  decodeFunctionResult(functionFragment: "registry", data: BytesLike): Result;
308
+ decodeFunctionResult(
309
+ functionFragment: "removeMember",
310
+ data: BytesLike
311
+ ): Result;
300
312
  decodeFunctionResult(
301
313
  functionFragment: "renounceRole",
302
314
  data: BytesLike
@@ -500,7 +512,7 @@ export interface DirectPaymentsFactory extends BaseContract {
500
512
  DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<[string]>;
501
513
 
502
514
  addMember(
503
- account: PromiseOrValue<string>,
515
+ member: PromiseOrValue<string>,
504
516
  overrides?: Overrides & { from?: PromiseOrValue<string> }
505
517
  ): Promise<ContractTransaction>;
506
518
 
@@ -515,6 +527,7 @@ export interface DirectPaymentsFactory extends BaseContract {
515
527
  _ipfs: PromiseOrValue<string>,
516
528
  _settings: DirectPaymentsPool.PoolSettingsStruct,
517
529
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
530
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
518
531
  overrides?: Overrides & { from?: PromiseOrValue<string> }
519
532
  ): Promise<ContractTransaction>;
520
533
 
@@ -523,6 +536,7 @@ export interface DirectPaymentsFactory extends BaseContract {
523
536
  _ipfs: PromiseOrValue<string>,
524
537
  _settings: DirectPaymentsPool.PoolSettingsStruct,
525
538
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
539
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
526
540
  overrides?: Overrides & { from?: PromiseOrValue<string> }
527
541
  ): Promise<ContractTransaction>;
528
542
 
@@ -591,6 +605,11 @@ export interface DirectPaymentsFactory extends BaseContract {
591
605
  }
592
606
  >;
593
607
 
608
+ removeMember(
609
+ member: PromiseOrValue<string>,
610
+ overrides?: Overrides & { from?: PromiseOrValue<string> }
611
+ ): Promise<ContractTransaction>;
612
+
594
613
  renounceRole(
595
614
  role: PromiseOrValue<BytesLike>,
596
615
  account: PromiseOrValue<string>,
@@ -640,7 +659,7 @@ export interface DirectPaymentsFactory extends BaseContract {
640
659
  DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
641
660
 
642
661
  addMember(
643
- account: PromiseOrValue<string>,
662
+ member: PromiseOrValue<string>,
644
663
  overrides?: Overrides & { from?: PromiseOrValue<string> }
645
664
  ): Promise<ContractTransaction>;
646
665
 
@@ -655,6 +674,7 @@ export interface DirectPaymentsFactory extends BaseContract {
655
674
  _ipfs: PromiseOrValue<string>,
656
675
  _settings: DirectPaymentsPool.PoolSettingsStruct,
657
676
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
677
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
658
678
  overrides?: Overrides & { from?: PromiseOrValue<string> }
659
679
  ): Promise<ContractTransaction>;
660
680
 
@@ -663,6 +683,7 @@ export interface DirectPaymentsFactory extends BaseContract {
663
683
  _ipfs: PromiseOrValue<string>,
664
684
  _settings: DirectPaymentsPool.PoolSettingsStruct,
665
685
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
686
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
666
687
  overrides?: Overrides & { from?: PromiseOrValue<string> }
667
688
  ): Promise<ContractTransaction>;
668
689
 
@@ -731,6 +752,11 @@ export interface DirectPaymentsFactory extends BaseContract {
731
752
  }
732
753
  >;
733
754
 
755
+ removeMember(
756
+ member: PromiseOrValue<string>,
757
+ overrides?: Overrides & { from?: PromiseOrValue<string> }
758
+ ): Promise<ContractTransaction>;
759
+
734
760
  renounceRole(
735
761
  role: PromiseOrValue<BytesLike>,
736
762
  account: PromiseOrValue<string>,
@@ -780,7 +806,7 @@ export interface DirectPaymentsFactory extends BaseContract {
780
806
  DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<string>;
781
807
 
782
808
  addMember(
783
- account: PromiseOrValue<string>,
809
+ member: PromiseOrValue<string>,
784
810
  overrides?: CallOverrides
785
811
  ): Promise<void>;
786
812
 
@@ -795,6 +821,7 @@ export interface DirectPaymentsFactory extends BaseContract {
795
821
  _ipfs: PromiseOrValue<string>,
796
822
  _settings: DirectPaymentsPool.PoolSettingsStruct,
797
823
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
824
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
798
825
  overrides?: CallOverrides
799
826
  ): Promise<string>;
800
827
 
@@ -803,6 +830,7 @@ export interface DirectPaymentsFactory extends BaseContract {
803
830
  _ipfs: PromiseOrValue<string>,
804
831
  _settings: DirectPaymentsPool.PoolSettingsStruct,
805
832
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
833
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
806
834
  overrides?: CallOverrides
807
835
  ): Promise<string>;
808
836
 
@@ -871,6 +899,11 @@ export interface DirectPaymentsFactory extends BaseContract {
871
899
  }
872
900
  >;
873
901
 
902
+ removeMember(
903
+ member: PromiseOrValue<string>,
904
+ overrides?: CallOverrides
905
+ ): Promise<void>;
906
+
874
907
  renounceRole(
875
908
  role: PromiseOrValue<BytesLike>,
876
909
  account: PromiseOrValue<string>,
@@ -1022,7 +1055,7 @@ export interface DirectPaymentsFactory extends BaseContract {
1022
1055
  DEFAULT_ADMIN_ROLE(overrides?: CallOverrides): Promise<BigNumber>;
1023
1056
 
1024
1057
  addMember(
1025
- account: PromiseOrValue<string>,
1058
+ member: PromiseOrValue<string>,
1026
1059
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1027
1060
  ): Promise<BigNumber>;
1028
1061
 
@@ -1037,6 +1070,7 @@ export interface DirectPaymentsFactory extends BaseContract {
1037
1070
  _ipfs: PromiseOrValue<string>,
1038
1071
  _settings: DirectPaymentsPool.PoolSettingsStruct,
1039
1072
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
1073
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
1040
1074
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1041
1075
  ): Promise<BigNumber>;
1042
1076
 
@@ -1045,6 +1079,7 @@ export interface DirectPaymentsFactory extends BaseContract {
1045
1079
  _ipfs: PromiseOrValue<string>,
1046
1080
  _settings: DirectPaymentsPool.PoolSettingsStruct,
1047
1081
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
1082
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
1048
1083
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1049
1084
  ): Promise<BigNumber>;
1050
1085
 
@@ -1107,6 +1142,11 @@ export interface DirectPaymentsFactory extends BaseContract {
1107
1142
  overrides?: CallOverrides
1108
1143
  ): Promise<BigNumber>;
1109
1144
 
1145
+ removeMember(
1146
+ member: PromiseOrValue<string>,
1147
+ overrides?: Overrides & { from?: PromiseOrValue<string> }
1148
+ ): Promise<BigNumber>;
1149
+
1110
1150
  renounceRole(
1111
1151
  role: PromiseOrValue<BytesLike>,
1112
1152
  account: PromiseOrValue<string>,
@@ -1159,7 +1199,7 @@ export interface DirectPaymentsFactory extends BaseContract {
1159
1199
  ): Promise<PopulatedTransaction>;
1160
1200
 
1161
1201
  addMember(
1162
- account: PromiseOrValue<string>,
1202
+ member: PromiseOrValue<string>,
1163
1203
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1164
1204
  ): Promise<PopulatedTransaction>;
1165
1205
 
@@ -1174,6 +1214,7 @@ export interface DirectPaymentsFactory extends BaseContract {
1174
1214
  _ipfs: PromiseOrValue<string>,
1175
1215
  _settings: DirectPaymentsPool.PoolSettingsStruct,
1176
1216
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
1217
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
1177
1218
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1178
1219
  ): Promise<PopulatedTransaction>;
1179
1220
 
@@ -1182,6 +1223,7 @@ export interface DirectPaymentsFactory extends BaseContract {
1182
1223
  _ipfs: PromiseOrValue<string>,
1183
1224
  _settings: DirectPaymentsPool.PoolSettingsStruct,
1184
1225
  _limits: DirectPaymentsPool.SafetyLimitsStruct,
1226
+ _managerFeeBps: PromiseOrValue<BigNumberish>,
1185
1227
  overrides?: Overrides & { from?: PromiseOrValue<string> }
1186
1228
  ): Promise<PopulatedTransaction>;
1187
1229
 
@@ -1244,6 +1286,11 @@ export interface DirectPaymentsFactory extends BaseContract {
1244
1286
  overrides?: CallOverrides
1245
1287
  ): Promise<PopulatedTransaction>;
1246
1288
 
1289
+ removeMember(
1290
+ member: PromiseOrValue<string>,
1291
+ overrides?: Overrides & { from?: PromiseOrValue<string> }
1292
+ ): Promise<PopulatedTransaction>;
1293
+
1247
1294
  renounceRole(
1248
1295
  role: PromiseOrValue<BytesLike>,
1249
1296
  account: PromiseOrValue<string>,