--wip-- [skip ci]

Author: shark0der

contracts/modules/governance/Registry.sol

@@ -67,6 +67,7 @@ contract Registry is IRegistry {
 
   mapping(uint memberId => address member) internal members;
   mapping(address member => uint memberId) internal memberIds;
+  mapping(bytes32 signature => bool used) internal usedSignatures;
   mapping(uint memberId => bool isAdvisoryBoardMember) public isAdvisoryBoardMember;
 
   function isMember(address member) external view returns (bool) {
@@ -93,15 +94,20 @@ contract Registry is IRegistry {
     memberIds[member] = memberId;
     members[memberId] = member;
     // todo:
+    // validate signature
+    // mark signature as used
     // TC.addToWhitelist(member)
   }
 
   function swap(address to) external {
-    require(memberIds[to] == 0, AlreadyMember());
     uint memberId = memberIds[msg.sender];
-    members[memberId] = to;
-    memberIds[to] = memberId;
+    require(memberId != 0, NotMember());
+    require(memberIds[to] == 0, AlreadyMember());
+
     delete memberIds[msg.sender];
+    memberIds[to] = memberId;
+    members[memberId] = to;
+
     // todo:
     // TC.removeFromWhitelist(msg.sender)
     // TC.addToWhitelist(to)
@@ -113,6 +119,7 @@ contract Registry is IRegistry {
     uint memberId = memberIds[msg.sender];
     require(memberId != 0, NotMember());
     require(!isAdvisoryBoardMember[memberId], AdvisoryBoardMemberCannotLeave());
+
     // todo:
     // address[] memory pools = TC.getManagerStakingPools(memberId)
     // require(pools.length == 0, StakingPoolManagersCannotLeave());
@@ -122,73 +129,8 @@ contract Registry is IRegistry {
 
     // todo:
     // TC.removeFromWhitelist(msg.sender)
-    // TK.burnFrom(msg.sender)
-  }
-
-  /// WITH DESIGNATED ROLES
-
-  struct AddressInfo {
-    uint32 id;     // member id
-    uint8 role;    // role id
-  }
-
-  struct MemberRole {
-    uint32 id;
-    uint8 role;
-    address addr;
-  }
-
-  mapping(uint id => mapping(uint role => address)) internal roleAddresses;
-  mapping(address => AddressInfo) internal addressToInfo;
-  mapping(uint id => mapping(uint role => address nominee)) internal roleOffers;
-
-  /* == MEMBER MANAGEMENT == */
-
-  function getAddress(uint id, uint role) external view returns (address) {
-    return roleAddresses[id][role];
-  }
-
-  function getMemberAddresses(uint id) external view returns (MemberRole[] memory memberRoles) {
-    memberRoles = new MemberRole[](256);
-
-    for (uint role = 1; role <= 256; role++) {
-      AddressInfo memory info = addressToInfo[roleAddresses[id][role]];
-      memberRoles[role - 1] = MemberRole({
-        id: info.id,
-        role: info.role,
-        addr: roleAddresses[id][role]
-      });
-    }
-
-    return memberRoles;
-  }
-
-  function nominateAddress(uint role, address nominee) external {
-    AddressInfo memory info = addressToInfo[msg.sender];
-    require(info.id != 0, NotMember());
-    require(info.role == 1, NotMainAddress());
-
-    require(role > 0 && role <= 256, InvalidRole());
-    roleOffers[info.id][role] = nominee;
-  }
-
-  function acceptNomination(uint memberId, uint role) external {
-
-    require(memberId != 0, InvalidMemberId());
-    require(role > 0 && role <= 256, InvalidRole());
-
-    address nominee = roleOffers[memberId][role];
-    require(nominee == msg.sender, NotNominee());
-
-    roleAddresses[memberId][role] = nominee;
-    addressToInfo[nominee] = AddressInfo({ id: memberId, role: role });
-
-    delete roleOffers[memberId][role];
-  }
-
-  function getMember(address addr) external view returns (uint id, uint role) {
-    AddressInfo memory info = addressToInfo[addr];
-    return (info.id, info.role);
+    // uint balance = TK.balanceOf(msg.sender)
+    // TK.burnFrom(msg.sender, balance) // or revert?
   }
 
   /* == CONTRACT MANAGEMENT == */