@gooddollar/goodcollective-contracts 1.0.2 → 1.0.3
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.
- package/contracts/DirectPayments/DirectPaymentsPool.sol +3 -3
- package/contracts/GoodCollective/GoodCollectiveSuperApp.sol +3 -3
- package/package.json +1 -1
- package/releases/deployment.json +742 -4569
- package/typechain-types/contracts/DirectPayments/DirectPaymentsFactory.ts +2 -2
- package/typechain-types/contracts/DirectPayments/DirectPaymentsPool.sol/DirectPaymentsPool.ts +7 -7
- package/typechain-types/contracts/GoodCollective/GoodCollectiveSuperApp.ts +2 -2
- package/typechain-types/factories/contracts/DirectPayments/DirectPaymentsFactory__factory.ts +2 -2
- package/typechain-types/factories/contracts/DirectPayments/DirectPaymentsPool.sol/DirectPaymentsPool__factory.ts +5 -5
- package/typechain-types/factories/contracts/GoodCollective/GoodCollectiveSuperApp__factory.ts +1 -1
- package/typechain-types/@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20PermitUpgradeable.ts +0 -193
- package/typechain-types/contracts/Lock.ts +0 -148
- package/typechain-types/factories/@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20PermitUpgradeable__factory.ts +0 -105
- package/typechain-types/factories/contracts/Lock__factory.ts +0 -129
|
@@ -64,7 +64,7 @@ contract DirectPaymentsPool is
|
|
|
64
64
|
uint128[] rewardPerEvent;
|
|
65
65
|
address manager;
|
|
66
66
|
IMembersValidator membersValidator;
|
|
67
|
-
IIdentityV2
|
|
67
|
+
IIdentityV2 uniquenessValidator;
|
|
68
68
|
IERC20Upgradeable rewardToken;
|
|
69
69
|
}
|
|
70
70
|
|
|
@@ -279,8 +279,8 @@ contract DirectPaymentsPool is
|
|
|
279
279
|
*/
|
|
280
280
|
|
|
281
281
|
function addMember(address member, bytes memory extraData) external {
|
|
282
|
-
if (address(settings.
|
|
283
|
-
address rootAddress = settings.
|
|
282
|
+
if (address(settings.uniquenessValidator) != address(0)) {
|
|
283
|
+
address rootAddress = settings.uniquenessValidator.getWhitelistedRoot(member);
|
|
284
284
|
if (rootAddress == address(0)) revert NOT_WHITELISTED(member);
|
|
285
285
|
}
|
|
286
286
|
|
|
@@ -40,7 +40,7 @@ abstract contract GoodCollectiveSuperApp is SuperAppBaseFlow {
|
|
|
40
40
|
address swapFrom;
|
|
41
41
|
uint256 amount;
|
|
42
42
|
uint256 minReturn;
|
|
43
|
-
uint256
|
|
43
|
+
uint256 deadline;
|
|
44
44
|
bytes path;
|
|
45
45
|
}
|
|
46
46
|
|
|
@@ -151,7 +151,7 @@ abstract contract GoodCollectiveSuperApp is SuperAppBaseFlow {
|
|
|
151
151
|
ISwapRouter.ExactInputParams memory params = ISwapRouter.ExactInputParams({
|
|
152
152
|
path: _customData.path,
|
|
153
153
|
recipient: _sender,
|
|
154
|
-
deadline: _customData.
|
|
154
|
+
deadline: _customData.deadline,
|
|
155
155
|
amountIn: _customData.amount,
|
|
156
156
|
amountOutMinimum: _customData.minReturn
|
|
157
157
|
});
|
|
@@ -163,7 +163,7 @@ abstract contract GoodCollectiveSuperApp is SuperAppBaseFlow {
|
|
|
163
163
|
tokenOut: address(superToken),
|
|
164
164
|
fee: 10000,
|
|
165
165
|
recipient: _sender,
|
|
166
|
-
deadline: _customData.
|
|
166
|
+
deadline: _customData.deadline,
|
|
167
167
|
amountIn: _customData.amount,
|
|
168
168
|
amountOutMinimum: _customData.minReturn,
|
|
169
169
|
sqrtPriceLimitX96: 0
|