fix: make it possible for the initial member addr to change the deleg…

…ate key (#492) * make it possible for the initial member addr to change the delegate key * add test and fix update delegate key * make sure you can update from the delegate key too
openlawteam · Feb 2, 2022 · c2c5068 · c2c5068
1 parent b1f0c09
commit c2c5068
Show file tree

Hide file tree

Showing 4 changed files with 583 additions and 521 deletions.
diff --git a/contracts/adapters/DaoRegistryAdapter.sol b/contracts/adapters/DaoRegistryAdapter.sol
@@ -41,11 +41,16 @@ contract DaoRegistryAdapterContract is MemberGuard, AdapterGuard {
     function updateDelegateKey(DaoRegistry dao, address delegateKey)
         external
         reentrancyGuard(dao)
-        onlyMember(dao)
     {
-        dao.updateDelegateKey(
-            DaoHelper.msgSender(dao, msg.sender),
-            delegateKey
-        );
+        address dk = dao.getCurrentDelegateKey(msg.sender);
+        if (dk != msg.sender && dao.isMember(dk)) {
+            dao.updateDelegateKey(msg.sender, delegateKey);
+        } else {
+            require(dao.isMember(msg.sender), "only member");
+            dao.updateDelegateKey(
+                DaoHelper.msgSender(dao, msg.sender),
+                delegateKey
+            );
+        }
     }
 }