feat(relay-payment): add admin feature & fix resetPayees issue (#55)

https://trello.com/c/oCDrIyyG/971-fix-contract-issue
lemonadesocial · Jan 2, 2025 · 33bddb0 · 33bddb0
1 parent 5eb4b8c
commit 33bddb0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/contracts/payment/PaymentSplitter.sol b/contracts/payment/PaymentSplitter.sol
@@ -319,10 +319,20 @@ contract PaymentSplitter is Context {
         //-- reset total share
         _totalShares = 0;
 
+        //-- reset shares array
+        for (uint256 i = 0; i < _payees.length; ) {
+            address account = _payees[i];
+            _shares[account] = 0;
+
+            unchecked {
+                ++i;
+            }
+        }
+
         //-- reset payees array
         delete _payees;
 
-        for (uint256 i = 0; i < payees.length; i++) {
+        for (uint256 i = 0; i < payees.length; ) {
             address account = payees[i];
             uint256 shared = shares_[i];
 
@@ -333,6 +343,10 @@ contract PaymentSplitter is Context {
             _payees.push(account);
             _shares[account] = shared;
             _totalShares = _totalShares + shared;
+
+            unchecked {
+                ++i;
+            }
         }
 
         emit PayeesReset();

diff --git a/contracts/payment/relay/LemonadeRelayPayment.sol b/contracts/payment/relay/LemonadeRelayPayment.sol
@@ -7,25 +7,19 @@ import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "../PaymentConfigRegistry.sol";
 import "../PaymentSplitter.sol";
 
-contract RelayPaymentSplitter is PaymentSplitter {
-    address internal _owner;
-
-    error Forbidden();
-
+contract RelayPaymentSplitter is PaymentSplitter, AccessControl {
     constructor(
         address owner,
         address[] memory payees,
         uint256[] memory shares
     ) PaymentSplitter(payees, shares) {
-        _owner = owner;
+        _grantRole(DEFAULT_ADMIN_ROLE, owner);
     }
 
     function resetPayees(
         address[] memory payees,
         uint256[] memory shares
-    ) public {
-        if (_msgSender() != _owner) revert Forbidden();
-
+    ) public onlyRole(DEFAULT_ADMIN_ROLE) {
         _resetPayees(payees, shares);
     }
 }
@@ -128,7 +122,8 @@ contract LemonadeRelayPayment is OwnableUpgradeable {
             payable(configRegistry)
         );
 
-        uint256 transferAmount = amount * 1000000 / (registry.feePPM() + 1000000);
+        uint256 transferAmount = (amount * 1000000) /
+            (registry.feePPM() + 1000000);
         uint256 feeAmount = amount - transferAmount;
 
         address guest = _msgSender();