@gooddollar/goodcollective-contracts 1.2.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 (45) hide show
  1. package/contracts/DirectPayments/DirectPaymentsFactory.sol +12 -7
  2. package/contracts/DirectPayments/DirectPaymentsLibrary.sol +54 -0
  3. package/contracts/DirectPayments/DirectPaymentsPool.sol +13 -38
  4. package/contracts/GoodCollective/GoodCollectiveSuperApp.sol +65 -13
  5. package/contracts/GoodCollective/IGoodCollectiveSuperApp.sol +6 -0
  6. package/contracts/Interfaces.sol +25 -0
  7. package/contracts/UBI/UBIPool.sol +76 -75
  8. package/contracts/UBI/UBIPoolFactory.sol +15 -10
  9. package/contracts/utils/HelperLibrary.sol +56 -23
  10. package/package.json +1 -1
  11. package/releases/deployment.json +4836 -3746
  12. package/typechain-types/contracts/DirectPayments/DirectPaymentsFactory.ts +16 -4
  13. package/typechain-types/contracts/DirectPayments/DirectPaymentsPool.sol/DirectPaymentsPool.ts +138 -9
  14. package/typechain-types/contracts/GoodCollective/GoodCollectiveSuperApp.ts +101 -6
  15. package/typechain-types/contracts/{DirectPayments/DirectPaymentsFactory.sol/IRegistry.ts → GoodCollective/IGoodCollectiveSuperApp.sol/IGoodCollectiveSuperApp.ts} +18 -27
  16. package/typechain-types/contracts/GoodCollective/IGoodCollectiveSuperApp.sol/index.ts +1 -0
  17. package/typechain-types/contracts/{UBI/UBIPool.sol → Interfaces.sol}/IIdentityV2.ts +1 -1
  18. package/typechain-types/contracts/{UBI/UBIPool.sol → Interfaces.sol}/IMembersValidator.ts +1 -1
  19. package/typechain-types/contracts/{UBI/UBIPool.sol → Interfaces.sol}/index.ts +0 -1
  20. package/typechain-types/contracts/UBI/{UBIPool.sol/UBIPool.ts → UBIPool.ts} +239 -47
  21. package/typechain-types/contracts/UBI/UBIPoolFactory.ts +58 -34
  22. package/typechain-types/contracts/UBI/index.ts +1 -2
  23. package/typechain-types/contracts/index.ts +2 -0
  24. package/typechain-types/contracts/utils/HelperLibrary.ts +46 -4
  25. package/typechain-types/factories/contracts/DirectPayments/DirectPaymentsFactory__factory.ts +11 -1
  26. package/typechain-types/factories/contracts/DirectPayments/DirectPaymentsPool.sol/DirectPaymentsPool__factory.ts +72 -1
  27. package/typechain-types/factories/contracts/GoodCollective/GoodCollectiveSuperApp__factory.ts +48 -0
  28. package/typechain-types/factories/contracts/{DirectPayments/DirectPaymentsFactory.sol/IRegistry__factory.ts → GoodCollective/IGoodCollectiveSuperApp.sol/IGoodCollectiveSuperApp__factory.ts} +19 -23
  29. package/typechain-types/factories/contracts/GoodCollective/IGoodCollectiveSuperApp.sol/index.ts +1 -0
  30. package/typechain-types/factories/contracts/{UBI/UBIPool.sol → Interfaces.sol}/IIdentityV2__factory.ts +1 -1
  31. package/typechain-types/factories/contracts/{UBI/UBIPool.sol → Interfaces.sol}/IMembersValidator__factory.ts +1 -1
  32. package/typechain-types/factories/contracts/{UBI/UBIPool.sol → Interfaces.sol}/index.ts +0 -1
  33. package/typechain-types/factories/contracts/UBI/UBIPoolFactory__factory.ts +51 -7
  34. package/typechain-types/factories/contracts/UBI/UBIPool__factory.ts +2052 -0
  35. package/typechain-types/factories/contracts/UBI/index.ts +1 -1
  36. package/typechain-types/factories/contracts/index.ts +1 -0
  37. package/typechain-types/factories/contracts/test/HelperLibraryTest__factory.ts +1 -1
  38. package/typechain-types/factories/contracts/utils/HelperLibrary__factory.ts +31 -1
  39. package/typechain-types/hardhat.d.ts +18 -9
  40. package/typechain-types/index.ts +4 -2
  41. package/typechain-types/contracts/DirectPayments/DirectPaymentsFactory.sol/DirectPaymentsFactory.ts +0 -1327
  42. package/typechain-types/contracts/DirectPayments/DirectPaymentsFactory.sol/index.ts +0 -5
  43. package/typechain-types/factories/contracts/DirectPayments/DirectPaymentsFactory.sol/DirectPaymentsFactory__factory.ts +0 -1004
  44. package/typechain-types/factories/contracts/DirectPayments/DirectPaymentsFactory.sol/index.ts +0 -5
  45. package/typechain-types/factories/contracts/UBI/UBIPool.sol/UBIPool__factory.ts +0 -1916
package/typechain-types/factories/contracts/UBI/index.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /* Autogenerated file. Do not edit manually. */
2
2
  /* tslint:disable */
3
3
  /* eslint-disable */
4
- export * as ubiPoolSol from "./UBIPool.sol";
4
+ export { UBIPool__factory } from "./UBIPool__factory";
5
5
  export { UBIPoolFactory__factory } from "./UBIPoolFactory__factory";
package/typechain-types/factories/contracts/index.ts CHANGED
@@ -3,6 +3,7 @@
3
3
  /* eslint-disable */
4
4
  export * as directPayments from "./DirectPayments";
5
5
  export * as goodCollective from "./GoodCollective";
6
+ export * as interfacesSol from "./Interfaces.sol";
6
7
  export * as ubi from "./UBI";
7
8
  export * as test from "./test";
8
9
  export * as utils from "./utils";
package/typechain-types/factories/contracts/test/HelperLibraryTest__factory.ts CHANGED
@@ -74,7 +74,7 @@ const _abi = [
74
74
  ] as const;
75
75
 
76
76
  const _bytecode =
77
- "0x608060405234801561001057600080fd5b506103bf806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80630f39b88814610030575b600080fd5b61004361003e366004610177565b610055565b60405190815260200160405180910390f35b6040516321437a5360e01b815260009073__$0d78a42341742155da77b97d7f993534c7$__906321437a539061009790889088908890889081906004016102ab565b602060405180830381865af41580156100b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100d89190610370565b95945050505050565b6001600160a01b03811681146100f657600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b60405160a081016001600160401b0381118282101715610131576101316100f9565b60405290565b604051601f8201601f191681016001600160401b038111828210171561015f5761015f6100f9565b604052919050565b8035610172816100e1565b919050565b6000806000806080858703121561018d57600080fd5b8435610198816100e1565b93506020858101356001600160401b03808211156101b557600080fd5b9087019060a0828a0312156101c957600080fd5b6101d161010f565b82356101dc816100e1565b808252508383013584820152604083013560408201526060830135606082015260808301358281111561020e57600080fd5b80840193505089601f84011261022357600080fd5b823582811115610235576102356100f9565b610247601f8201601f19168601610137565b92508083528a8582860101111561025d57600080fd5b8085850186850137600090830190940193909352608083015250925061028560408601610167565b915061029360608601610167565b905092959194509250565b6001600160a01b03169052565b600060018060a01b038088168352602060a0818501528188511660a08501528088015160c0850152604088015160e085015260608801516101008501526080880151915060a061012085015281518061014086015260005b818110156103205783810183015186820161016001528201610303565b506101609250600083828701015282601f19601f830116860101935050505061034c604083018661029e565b610359606083018561029e565b610366608083018461029e565b9695505050505050565b60006020828403121561038257600080fd5b505191905056fea26469706673582212204640ad1c0f1f491dceb4b047f978b1aef31bb4ea20523b5db75a97440308f57164736f6c63430008130033";
77
+ "0x608060405234801561001057600080fd5b506103bf806100206000396000f3fe608060405234801561001057600080fd5b506004361061002b5760003560e01c80630f39b88814610030575b600080fd5b61004361003e366004610177565b610055565b60405190815260200160405180910390f35b6040516321437a5360e01b815260009073__$0d78a42341742155da77b97d7f993534c7$__906321437a539061009790889088908890889081906004016102ab565b602060405180830381865af41580156100b4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100d89190610370565b95945050505050565b6001600160a01b03811681146100f657600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b60405160a081016001600160401b0381118282101715610131576101316100f9565b60405290565b604051601f8201601f191681016001600160401b038111828210171561015f5761015f6100f9565b604052919050565b8035610172816100e1565b919050565b6000806000806080858703121561018d57600080fd5b8435610198816100e1565b93506020858101356001600160401b03808211156101b557600080fd5b9087019060a0828a0312156101c957600080fd5b6101d161010f565b82356101dc816100e1565b808252508383013584820152604083013560408201526060830135606082015260808301358281111561020e57600080fd5b80840193505089601f84011261022357600080fd5b823582811115610235576102356100f9565b610247601f8201601f19168601610137565b92508083528a8582860101111561025d57600080fd5b8085850186850137600090830190940193909352608083015250925061028560408601610167565b915061029360608601610167565b905092959194509250565b6001600160a01b03169052565b600060018060a01b038088168352602060a0818501528188511660a08501528088015160c0850152604088015160e085015260608801516101008501526080880151915060a061012085015281518061014086015260005b818110156103205783810183015186820161016001528201610303565b506101609250600083828701015282601f19601f830116860101935050505061034c604083018661029e565b610359606083018561029e565b610366608083018461029e565b9695505050505050565b60006020828403121561038257600080fd5b505191905056fea2646970667358221220cd1aa17405a213bbfb55cb6738929d050881064d6ecf1c817200530703b2fa4164736f6c63430008130033";
78
78
 
79
79
  type HelperLibraryTestConstructorParams =
80
80
  | [linkLibraryAddresses: HelperLibraryTestLibraryAddresses, signer?: Signer]
package/typechain-types/factories/contracts/utils/HelperLibrary__factory.ts CHANGED
@@ -39,6 +39,21 @@ const _abi = [
39
39
  name: "lastIncomeRate",
40
40
  type: "int96",
41
41
  },
42
+ {
43
+ internalType: "address",
44
+ name: "lastManagerFeeRecipient",
45
+ type: "address",
46
+ },
47
+ {
48
+ internalType: "uint256",
49
+ name: "protocolFees",
50
+ type: "uint256",
51
+ },
52
+ {
53
+ internalType: "uint256",
54
+ name: "managerFees",
55
+ type: "uint256",
56
+ },
42
57
  ],
43
58
  internalType: "struct IGoodCollectiveSuperApp.Stats",
44
59
  name: "stats",
@@ -62,6 +77,16 @@ const _abi = [
62
77
  name: "totalFees",
63
78
  type: "uint256",
64
79
  },
80
+ {
81
+ internalType: "uint256",
82
+ name: "protocolFees",
83
+ type: "uint256",
84
+ },
85
+ {
86
+ internalType: "uint256",
87
+ name: "managerFees",
88
+ type: "uint256",
89
+ },
65
90
  {
66
91
  internalType: "int96",
67
92
  name: "incomeFlowRate",
@@ -72,6 +97,11 @@ const _abi = [
72
97
  name: "feeRate",
73
98
  type: "int96",
74
99
  },
100
+ {
101
+ internalType: "int96",
102
+ name: "managerFeeRate",
103
+ type: "int96",
104
+ },
75
105
  ],
76
106
  stateMutability: "view",
77
107
  type: "function",
@@ -79,7 +109,7 @@ const _abi = [
79
109
  ] as const;
80
110
 
81
111
  const _bytecode =
82
- "0x6115bf61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100615760003560e01c80631f8f04bf1461006657806321437a531461009c57806358c0dacb146100ca578063891d61cc146100ea578063b2f918a11461010c575b600080fd5b81801561007257600080fd5b50610086610081366004610e98565b610148565b6040516100939190610f6e565b60405180910390f35b8180156100a857600080fd5b506100bc6100b7366004611000565b610377565b604051908152602001610093565b8180156100d657600080fd5b506100bc6100e5366004611089565b61050b565b8180156100f657600080fd5b5061010a6101053660046110fd565b61051a565b005b61011f61011a366004611145565b6106b5565b604080519485526020850193909352600b91820b928401929092520b6060820152608001610093565b806001600160a01b0384161561036d576000846001600160a01b031663469048406040518163ffffffff1660e01b8152600401602060405180830381865afa158015610198573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101bc91906111c9565b60038801549091506000906101df906001600160a01b0389811691309116610772565b60038901549091506000906001600160a01b0384811691161461025e575060038801546001906001600160a01b03161561024057600082600b0b131561024057600389015461023d908b90869030906001600160a01b03168c61080a565b93505b6003890180546001600160a01b0319166001600160a01b0385161790555b6001600160a01b0383166102745750505061036d565b6000612710886001600160a01b03166324a9d8536040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102db91906111e6565b6102e89060030b89611222565b6102f2919061125f565b6102fc908461129d565b9050600081600b0b13158015610310575081155b15610329576103228b8630878d61080a565b9450610368565b600083600b0b13801561033a575081155b1561034c576103228b86868c8561082f565b600081600b0b1315610368576103658b86868c85610854565b94505b505050505b9695505050505050565b600061038d856000015184308860200151610879565b6103a08560000151878760200151610988565b6080850151511561044f57604080516080808201835287015181526001600160a01b0380851660208084019190915288015182840152878301516060830152915163b858183f60e01b8152909188169063b858183f906104049084906004016112d0565b6020604051808303816000875af1158015610423573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610447919061131e565b915050610502565b6040805160e08101825286516001600160a01b039081168252868116602080840191825261271084860190815287841660608601908152918b0151608086019081528b87015160a08701908152600060c0880190815297516304e45aaf60e01b8152875187166004820152945186166024860152915162ffffff166044850152915184166064840152905160848301525160a48201529251811660c48401529091908816906304e45aaf9060e401610404565b95945050505050565b60006105028585858586610377565b60028401546105299042611337565b60038501546105489190600160a01b90046001600160601b031661134a565b84600001600082825461055b9190611361565b90915550600090506001600160a01b0383161561063557826001600160a01b03166324a9d8536040518163ffffffff1660e01b8152600401602060405180830381865afa1580156105b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d491906111e6565b63ffffffff1690508460020154426105ec9190611337565b6003860154610609906001600160a01b0387811691309116610772565b6001600160601b031661061c919061134a565b85600101600082825461062f9190611361565b90915550505b81156106a5576127106106488282611337565b610652908461134a565b61065c9190611374565b85600001600082825461066f9190611361565b909155506127109050610682828461134a565b61068c9190611374565b85600101600082825461069f9190611361565b90915550505b4285600201819055505050505050565b60808201516040830151600091829182906106d09042611337565b86608001516001600160601b03166106e8919061134a565b86516106f49190611361565b9350610718308760600151876001600160a01b03166107729092919063ffffffff16565b905085604001514261072a9190611337565b6060870151610745906001600160a01b038816903090610772565b6001600160601b0316610758919061134a565b86602001516107679190611361565b925092959194509250565b60008061077e85610a88565b604051631cd43d1160e31b81526001600160a01b03888116600483015287811660248301528681166044830152919350908316915063e6a1e88890606401608060405180830381865afa1580156107d9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107fd9190611388565b5090979650505050505050565b60408051600081526020810190915260609061036d9087908790879087908790610c09565b60408051600081526020810190915260609061036d9087908790879087908790610cf2565b60408051600081526020810190915260609061036d9087908790879087908790610d59565b604080516001600160a01b0385811660248301528481166044830152606480830185905283518084039091018152608490920183526020820180516001600160e01b03166323b872dd60e01b17905291516000928392908816916108dd91906113c6565b6000604051808303816000865af19150503d806000811461091a576040519150601f19603f3d011682016040523d82523d6000602084013e61091f565b606091505b509150915081801561094957508051158061094957508080602001905181019061094991906113e2565b6109805760405162461bcd60e51b815260206004820152600360248201526229aa2360e91b60448201526064015b60405180910390fd5b505050505050565b604080516001600160a01b038481166024830152604480830185905283518084039091018152606490920183526020820180516001600160e01b031663095ea7b360e01b17905291516000928392908716916109e491906113c6565b6000604051808303816000865af19150503d8060008114610a21576040519150601f19603f3d011682016040523d82523d6000602084013e610a26565b606091505b5091509150818015610a50575080511580610a50575080806020019051810190610a5091906113e2565b610a815760405162461bcd60e51b8152602060048201526002602482015261534160f01b6044820152606401610977565b5050505050565b7f65599bf746e17a00ea62e3610586992d88101b78eec3cf380706621fb97ea837547fb969d79d88acd02d04ed7ee7d43b949e7daf093d363abcfbbc43dfdfd1ce969a546001600160a01b038116610bd8576001600160a01b038216610b4d57826001600160a01b03166320bc44256040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b26573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b4a91906111c9565b91505b604051635b69006f60e11b81527fa9214cc96615e0085d3bb077758db69497dc2dce3b2b1e97bc93c3d18d83efd360048201526001600160a01b0383169063b6d200de90602401602060405180830381865afa158015610bb1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bd591906111c9565b90505b6001600160a01b038216610bee57610bee611404565b6001600160a01b038116610c0457610c04611404565b915091565b855460018701546040805160008152602081019091526060926001600160a01b0390811692634329d29392911690819063b4b333c690610c529089908c908c906044810161141a565b60408051808303601f1901815291815260208201805160e094851b6001600160e01b03909116179052519185901b6001600160e01b0319168252610c9f9392509087908c9060040161144e565b6000604051808303816000875af1158015610cbe573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610ce691908101906114f0565b50979650505050505050565b855460018701546060916001600160a01b0390811691634329d2939116806350209a62888a8960005b6040519080825280601f01601f191660200182016040528015610d45576020820181803683370190505b50604051602401610c529493929190611553565b855460018701546060916001600160a01b0390811691634329d2939116806362fc305e888a896000610d1b565b6001600160a01b0381168114610d9b57600080fd5b50565b80600b0b8114610d9b57600080fd5b634e487b7160e01b600052604160045260246000fd5b60405160a081016001600160401b0381118282101715610de557610de5610dad565b60405290565b604051601f8201601f191681016001600160401b0381118282101715610e1357610e13610dad565b604052919050565b60006001600160401b03821115610e3457610e34610dad565b50601f01601f191660200190565b600082601f830112610e5357600080fd5b8135610e66610e6182610e1b565b610deb565b818152846020838601011115610e7b57600080fd5b816020850160208301376000918101602001919091529392505050565b60008060008060008060c08789031215610eb157600080fd5b86359550602087013594506040870135610eca81610d86565b93506060870135610eda81610d86565b92506080870135610eea81610d9e565b915060a08701356001600160401b03811115610f0557600080fd5b610f1189828a01610e42565b9150509295509295509295565b60005b83811015610f39578181015183820152602001610f21565b50506000910152565b60008151808452610f5a816020860160208601610f1e565b601f01601f19169290920160200192915050565b602081526000610f816020830184610f42565b9392505050565b600060a08284031215610f9a57600080fd5b610fa2610dc3565b90508135610faf81610d86565b815260208281013590820152604080830135908201526060808301359082015260808201356001600160401b03811115610fe857600080fd5b610ff484828501610e42565b60808301525092915050565b600080600080600060a0868803121561101857600080fd5b853561102381610d86565b945060208601356001600160401b0381111561103e57600080fd5b61104a88828901610f88565b945050604086013561105b81610d86565b9250606086013561106b81610d86565b9150608086013561107b81610d86565b809150509295509295909350565b6000806000806080858703121561109f57600080fd5b84356110aa81610d86565b935060208501356001600160401b038111156110c557600080fd5b6110d187828801610f88565b93505060408501356110e281610d86565b915060608501356110f281610d86565b939692955090935050565b6000806000806080858703121561111357600080fd5b84359350602085013561112581610d86565b9250604085013561113581610d86565b9396929550929360600135925050565b60008082840360c081121561115957600080fd5b60a081121561116757600080fd5b50611170610dc3565b833581526020840135602082015260408401356040820152606084013561119681610d86565b606082015260808401356111a981610d9e565b6080820152915060a08301356111be81610d86565b809150509250929050565b6000602082840312156111db57600080fd5b8151610f8181610d86565b6000602082840312156111f857600080fd5b815163ffffffff81168114610f8157600080fd5b634e487b7160e01b600052601160045260246000fd5b600082600b0b82600b0b0280600b0b91508082146112425761124261120c565b5092915050565b634e487b7160e01b600052601260045260246000fd5b600081600b0b83600b0b8061127657611276611249565b60016001605f1b03198214600019821416156112945761129461120c565b90059392505050565b600b81810b9083900b0160016001605f1b03811360016001605f1b0319821217156112ca576112ca61120c565b92915050565b6020815260008251608060208401526112ec60a0840182610f42565b905060018060a01b03602085015116604084015260408401516060840152606084015160808401528091505092915050565b60006020828403121561133057600080fd5b5051919050565b818103818111156112ca576112ca61120c565b80820281158282048414176112ca576112ca61120c565b808201808211156112ca576112ca61120c565b60008261138357611383611249565b500490565b6000806000806080858703121561139e57600080fd5b8451935060208501516113b081610d9e565b6040860151606090960151949790965092505050565b600082516113d8818460208701610f1e565b9190910192915050565b6000602082840312156113f457600080fd5b81518015158114610f8157600080fd5b634e487b7160e01b600052600160045260246000fd5b6001600160a01b03858116825284811660208301528316604082015260806060820181905260009061036d90830184610f42565b6001600160a01b038516815260806020820181905260009061147290830186610f42565b82810360408401526114848186610f42565b905082810360608401526114988185610f42565b979650505050505050565b600082601f8301126114b457600080fd5b81516114c2610e6182610e1b565b8181528460208386010111156114d757600080fd5b6114e8826020830160208701610f1e565b949350505050565b6000806040838503121561150357600080fd5b82516001600160401b038082111561151a57600080fd5b611526868387016114a3565b9350602085015191508082111561153c57600080fd5b50611549858286016114a3565b9150509250929050565b6001600160a01b03858116825284166020820152600b83900b604082015260806060820181905260009061036d90830184610f4256fea26469706673582212201f85328ba56491d96c15832707e50b6536e3254e9b231b2c3aa1eb53b4c0825664736f6c63430008130033";
112
+ "0x6116bd61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100615760003560e01c806321437a53146100665780634d167a901461009957806358c0dacb146100c6578063934e2cce146100e6578063b2f918a114610108575b600080fd5b81801561007257600080fd5b50610086610081366004610fa1565b610159565b6040519081526020015b60405180910390f35b8180156100a557600080fd5b506100b96100b4366004611056565b6102ed565b6040516100909190611149565b8180156100d257600080fd5b506100866100e1366004611163565b610409565b8180156100f257600080fd5b506101066101013660046111d7565b610418565b005b61011b610116366004611232565b610691565b604080519788526020880196909652948601939093526060850191909152600b90810b608085015290810b60a08401520b60c082015260e001610090565b600061016f8560000151843088602001516107d7565b61018285600001518787602001516108e6565b6080850151511561023157604080516080808201835287015181526001600160a01b0380851660208084019190915288015182840152878301516060830152915163b858183f60e01b8152909188169063b858183f906101e69084906004016112db565b6020604051808303816000875af1158015610205573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102299190611329565b9150506102e4565b6040805160e08101825286516001600160a01b039081168252868116602080840191825261271084860190815287841660608601908152918b0151608086019081528b87015160a08701908152600060c0880190815297516304e45aaf60e01b8152875187166004820152945186166024860152915162ffffff166044850152915184166064840152905160848301525160a48201529251811660c48401529091908816906304e45aaf9060e4016101e6565b95945050505050565b806001600160a01b038516156103fe5760006103136001600160a01b03891630896109e6565b90506000876001600160a01b0316876001600160a01b03161461035e575060016001600160a01b0388161561035e57600082600b0b131561035e5761035b8a84308b8d610a7e565b92505b6001600160a01b0387166103735750506103fe565b6000612710610386600389900b88611358565b6103909190611395565b61039a90846113d3565b9050811580156103ad5750600083600b0b135b156103de57600081600b0b136103d1576103ca8b85308b8e610a7e565b93506103fa565b6103ca8b858a8d85610aad565b600081600b0b13156103fa576103f78b858a8d85610ad2565b93505b5050505b979650505050505050565b60006102e48585858586610159565b60006001600160a01b0384161561049457836001600160a01b03166324a9d8536040518163ffffffff1660e01b8152600401602060405180830381865afa158015610467573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061048b9190611406565b63ffffffff1690505b60028601546104a39042611423565b60038701546104c29190600160a01b90046001600160601b0316611436565b8660000160008282546104d5919061144d565b909155505060038601546001600160a01b0316156105455760028601546104fc9042611423565b6003870154610519906001600160a01b03888116913091166109e6565b6001600160601b031661052c9190611436565b86600501600082825461053f919061144d565b90915550505b60048601546001600160a01b0316156105b05760028601546105679042611423565b6004870154610584906001600160a01b03888116913091166109e6565b6001600160601b03166105979190611436565b8660060160008282546105aa919061144d565b90915550505b81156106675761271063ffffffff84166105ca8383611423565b6105d49190611423565b6105de9084611436565b6105e89190611460565b8660000160008282546105fb919061144d565b90915550612710905061060e8284611436565b6106189190611460565b86600501600082825461062b919061144d565b90915550612710905061064463ffffffff851684611436565b61064e9190611460565b866006016000828254610661919061144d565b90915550505b8560050154866006015461067b919061144d565b6001870155505042600290940193909355505050565b6000806000806000806000886080015192508860400151426106b39190611423565b89608001516001600160601b03166106cb9190611436565b89516106d7919061144d565b96506106fb308a606001518a6001600160a01b03166109e69092919063ffffffff16565b915061071f308a60a001518a6001600160a01b03166109e69092919063ffffffff16565b90508860400151426107319190611423565b60608a015161074c906001600160a01b038b169030906109e6565b6001600160601b031661075f9190611436565b8960c0015161076e919061144d565b94508860400151426107809190611423565b60a08a015161079b906001600160a01b038b169030906109e6565b6001600160601b03166107ae9190611436565b8960e001516107bd919061144d565b93506107c9848661144d565b955092959891949750929550565b604080516001600160a01b0385811660248301528481166044830152606480830185905283518084039091018152608490920183526020820180516001600160e01b03166323b872dd60e01b179052915160009283929088169161083b9190611474565b6000604051808303816000865af19150503d8060008114610878576040519150601f19603f3d011682016040523d82523d6000602084013e61087d565b606091505b50915091508180156108a75750805115806108a75750808060200190518101906108a79190611490565b6108de5760405162461bcd60e51b815260206004820152600360248201526229aa2360e91b60448201526064015b60405180910390fd5b505050505050565b604080516001600160a01b038481166024830152604480830185905283518084039091018152606490920183526020820180516001600160e01b031663095ea7b360e01b17905291516000928392908716916109429190611474565b6000604051808303816000865af19150503d806000811461097f576040519150601f19603f3d011682016040523d82523d6000602084013e610984565b606091505b50915091508180156109ae5750805115806109ae5750808060200190518101906109ae9190611490565b6109df5760405162461bcd60e51b8152602060048201526002602482015261534160f01b60448201526064016108d5565b5050505050565b6000806109f285610af7565b604051631cd43d1160e31b81526001600160a01b03888116600483015287811660248301528681166044830152919350908316915063e6a1e88890606401608060405180830381865afa158015610a4d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a7191906114b2565b5090979650505050505050565b604080516000815260208101909152606090610aa39087908790879087908790610c78565b9695505050505050565b604080516000815260208101909152606090610aa39087908790879087908790610d61565b604080516000815260208101909152606090610aa39087908790879087908790610dc8565b7f65599bf746e17a00ea62e3610586992d88101b78eec3cf380706621fb97ea837547fb969d79d88acd02d04ed7ee7d43b949e7daf093d363abcfbbc43dfdfd1ce969a546001600160a01b038116610c47576001600160a01b038216610bbc57826001600160a01b03166320bc44256040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b95573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bb991906114f0565b91505b604051635b69006f60e11b81527fa9214cc96615e0085d3bb077758db69497dc2dce3b2b1e97bc93c3d18d83efd360048201526001600160a01b0383169063b6d200de90602401602060405180830381865afa158015610c20573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c4491906114f0565b90505b6001600160a01b038216610c5d57610c5d61150d565b6001600160a01b038116610c7357610c7361150d565b915091565b855460018701546040805160008152602081019091526060926001600160a01b0390811692634329d29392911690819063b4b333c690610cc19089908c908c9060448101611523565b60408051808303601f1901815291815260208201805160e094851b6001600160e01b03909116179052519185901b6001600160e01b0319168252610d0e9392509087908c90600401611557565b6000604051808303816000875af1158015610d2d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d5591908101906115ee565b50979650505050505050565b855460018701546060916001600160a01b0390811691634329d2939116806350209a62888a8960005b6040519080825280601f01601f191660200182016040528015610db4576020820181803683370190505b50604051602401610cc19493929190611651565b855460018701546060916001600160a01b0390811691634329d2939116806362fc305e888a896000610d8a565b6001600160a01b0381168114610e0a57600080fd5b50565b634e487b7160e01b600052604160045260246000fd5b60405161010081016001600160401b0381118282101715610e4657610e46610e0d565b60405290565b604051601f8201601f191681016001600160401b0381118282101715610e7457610e74610e0d565b604052919050565b8035610e8781610df5565b919050565b60006001600160401b03821115610ea557610ea5610e0d565b50601f01601f191660200190565b600082601f830112610ec457600080fd5b8135610ed7610ed282610e8c565b610e4c565b818152846020838601011115610eec57600080fd5b816020850160208301376000918101602001919091529392505050565b600060a08284031215610f1b57600080fd5b60405160a081016001600160401b038082118383101715610f3e57610f3e610e0d565b8160405282935084359150610f5282610df5565b8183526020850135602084015260408501356040840152606085013560608401526080850135915080821115610f8757600080fd5b50610f9485828601610eb3565b6080830152505092915050565b600080600080600060a08688031215610fb957600080fd5b8535610fc481610df5565b945060208601356001600160401b03811115610fdf57600080fd5b610feb88828901610f09565b9450506040860135610ffc81610df5565b9250606086013561100c81610df5565b9150608086013561101c81610df5565b809150509295509295909350565b63ffffffff81168114610e0a57600080fd5b80600b0b8114610e0a57600080fd5b8035610e878161103c565b600080600080600080600060e0888a03121561107157600080fd5b87359650602088013561108381610df5565b9550604088013561109381610df5565b945060608801356110a381610df5565b935060808801356110b38161102a565b925060a08801356110c38161103c565b915060c08801356001600160401b038111156110de57600080fd5b6110ea8a828b01610eb3565b91505092959891949750929550565b60005b838110156111145781810151838201526020016110fc565b50506000910152565b600081518084526111358160208601602086016110f9565b601f01601f19169290920160200192915050565b60208152600061115c602083018461111d565b9392505050565b6000806000806080858703121561117957600080fd5b843561118481610df5565b935060208501356001600160401b0381111561119f57600080fd5b6111ab87828801610f09565b93505060408501356111bc81610df5565b915060608501356111cc81610df5565b939692955090935050565b600080600080600060a086880312156111ef57600080fd5b85359450602086013561120181610df5565b9350604086013561121181610df5565b925060608601356112218161102a565b949793965091946080013592915050565b60008082840361012081121561124757600080fd5b6101008082121561125757600080fd5b61125f610e23565b9150843582526020850135602083015260408501356040830152606085013561128781610df5565b60608301526112986080860161104b565b60808301526112a960a08601610e7c565b60a083015260c085013560c083015260e085013560e08301528193506112d0818601610e7c565b925050509250929050565b6020815260008251608060208401526112f760a084018261111d565b905060018060a01b03602085015116604084015260408401516060840152606084015160808401528091505092915050565b60006020828403121561133b57600080fd5b5051919050565b634e487b7160e01b600052601160045260246000fd5b600082600b0b82600b0b0280600b0b915080821461137857611378611342565b5092915050565b634e487b7160e01b600052601260045260246000fd5b600081600b0b83600b0b806113ac576113ac61137f565b60016001605f1b03198214600019821416156113ca576113ca611342565b90059392505050565b600b81810b9083900b0160016001605f1b03811360016001605f1b03198212171561140057611400611342565b92915050565b60006020828403121561141857600080fd5b815161115c8161102a565b8181038181111561140057611400611342565b808202811582820484141761140057611400611342565b8082018082111561140057611400611342565b60008261146f5761146f61137f565b500490565b600082516114868184602087016110f9565b9190910192915050565b6000602082840312156114a257600080fd5b8151801515811461115c57600080fd5b600080600080608085870312156114c857600080fd5b8451935060208501516114da8161103c565b6040860151606090960151949790965092505050565b60006020828403121561150257600080fd5b815161115c81610df5565b634e487b7160e01b600052600160045260246000fd5b6001600160a01b038581168252848116602083015283166040820152608060608201819052600090610aa39083018461111d565b6001600160a01b038516815260806020820181905260009061157b9083018661111d565b828103604084015261158d818661111d565b905082810360608401526103fe818561111d565b600082601f8301126115b257600080fd5b81516115c0610ed282610e8c565b8181528460208386010111156115d557600080fd5b6115e68260208301602087016110f9565b949350505050565b6000806040838503121561160157600080fd5b82516001600160401b038082111561161857600080fd5b611624868387016115a1565b9350602085015191508082111561163a57600080fd5b50611647858286016115a1565b9150509250929050565b6001600160a01b03858116825284166020820152600b83900b6040820152608060608201819052600090610aa39083018461111d56fea26469706673582212206f86969876c39f24a01169b8913522e7f6e27e1313d7a3502880f4f3a1d94ce564736f6c63430008130033";
83
113
 
84
114
  type HelperLibraryConstructorParams =
85
115
  | [signer?: Signer]
package/typechain-types/hardhat.d.ts CHANGED
@@ -336,6 +336,10 @@ declare module "hardhat/types/runtime" {
336
336
  name: "GoodCollectiveSuperApp",
337
337
  signerOrOptions?: ethers.Signer | FactoryOptions
338
338
  ): Promise<Contracts.GoodCollectiveSuperApp__factory>;
339
+ getContractFactory(
340
+ name: "IGoodCollectiveSuperApp",
341
+ signerOrOptions?: ethers.Signer | FactoryOptions
342
+ ): Promise<Contracts.IGoodCollectiveSuperApp__factory>;
339
343
  getContractFactory(
340
344
  name: "IRegistry",
341
345
  signerOrOptions?: ethers.Signer | FactoryOptions
@@ -344,10 +348,6 @@ declare module "hardhat/types/runtime" {
344
348
  name: "SuperAppBaseFlow",
345
349
  signerOrOptions?: ethers.Signer | FactoryOptions
346
350
  ): Promise<Contracts.SuperAppBaseFlow__factory>;
347
- getContractFactory(
348
- name: "HelperLibraryTest",
349
- signerOrOptions?: ethers.Signer | FactoryOptions
350
- ): Promise<Contracts.HelperLibraryTest__factory>;
351
351
  getContractFactory(
352
352
  name: "IIdentityV2",
353
353
  signerOrOptions?: ethers.Signer | FactoryOptions
@@ -356,6 +356,10 @@ declare module "hardhat/types/runtime" {
356
356
  name: "IMembersValidator",
357
357
  signerOrOptions?: ethers.Signer | FactoryOptions
358
358
  ): Promise<Contracts.IMembersValidator__factory>;
359
+ getContractFactory(
360
+ name: "HelperLibraryTest",
361
+ signerOrOptions?: ethers.Signer | FactoryOptions
362
+ ): Promise<Contracts.HelperLibraryTest__factory>;
359
363
  getContractFactory(
360
364
  name: "UBIPool",
361
365
  signerOrOptions?: ethers.Signer | FactoryOptions
@@ -778,6 +782,11 @@ declare module "hardhat/types/runtime" {
778
782
  address: string,
779
783
  signer?: ethers.Signer
780
784
  ): Promise<Contracts.GoodCollectiveSuperApp>;
785
+ getContractAt(
786
+ name: "IGoodCollectiveSuperApp",
787
+ address: string,
788
+ signer?: ethers.Signer
789
+ ): Promise<Contracts.IGoodCollectiveSuperApp>;
781
790
  getContractAt(
782
791
  name: "IRegistry",
783
792
  address: string,
@@ -788,11 +797,6 @@ declare module "hardhat/types/runtime" {
788
797
  address: string,
789
798
  signer?: ethers.Signer
790
799
  ): Promise<Contracts.SuperAppBaseFlow>;
791
- getContractAt(
792
- name: "HelperLibraryTest",
793
- address: string,
794
- signer?: ethers.Signer
795
- ): Promise<Contracts.HelperLibraryTest>;
796
800
  getContractAt(
797
801
  name: "IIdentityV2",
798
802
  address: string,
@@ -803,6 +807,11 @@ declare module "hardhat/types/runtime" {
803
807
  address: string,
804
808
  signer?: ethers.Signer
805
809
  ): Promise<Contracts.IMembersValidator>;
810
+ getContractAt(
811
+ name: "HelperLibraryTest",
812
+ address: string,
813
+ signer?: ethers.Signer
814
+ ): Promise<Contracts.HelperLibraryTest>;
806
815
  getContractAt(
807
816
  name: "UBIPool",
808
817
  address: string,
package/typechain-types/index.ts CHANGED
@@ -172,14 +172,16 @@ export type { ProvableNFT } from "./contracts/DirectPayments/ProvableNFT";
172
172
  export { ProvableNFT__factory } from "./factories/contracts/DirectPayments/ProvableNFT__factory";
173
173
  export type { GoodCollectiveSuperApp } from "./contracts/GoodCollective/GoodCollectiveSuperApp";
174
174
  export { GoodCollectiveSuperApp__factory } from "./factories/contracts/GoodCollective/GoodCollectiveSuperApp__factory";
175
+ export type { IGoodCollectiveSuperApp } from "./contracts/GoodCollective/IGoodCollectiveSuperApp.sol/IGoodCollectiveSuperApp";
176
+ export { IGoodCollectiveSuperApp__factory } from "./factories/contracts/GoodCollective/IGoodCollectiveSuperApp.sol/IGoodCollectiveSuperApp__factory";
175
177
  export type { IRegistry } from "./contracts/GoodCollective/IGoodCollectiveSuperApp.sol/IRegistry";
176
178
  export { IRegistry__factory } from "./factories/contracts/GoodCollective/IGoodCollectiveSuperApp.sol/IRegistry__factory";
177
179
  export type { SuperAppBaseFlow } from "./contracts/GoodCollective/SuperAppBaseFlow";
178
180
  export { SuperAppBaseFlow__factory } from "./factories/contracts/GoodCollective/SuperAppBaseFlow__factory";
179
181
  export type { HelperLibraryTest } from "./contracts/test/HelperLibraryTest";
180
182
  export { HelperLibraryTest__factory } from "./factories/contracts/test/HelperLibraryTest__factory";
181
- export type { UBIPool } from "./contracts/UBI/UBIPool.sol/UBIPool";
182
- export { UBIPool__factory } from "./factories/contracts/UBI/UBIPool.sol/UBIPool__factory";
183
+ export type { UBIPool } from "./contracts/UBI/UBIPool";
184
+ export { UBIPool__factory } from "./factories/contracts/UBI/UBIPool__factory";
183
185
  export type { UBIPoolFactory } from "./contracts/UBI/UBIPoolFactory";
184
186
  export { UBIPoolFactory__factory } from "./factories/contracts/UBI/UBIPoolFactory__factory";
185
187
  export type { HelperLibrary } from "./contracts/utils/HelperLibrary";