status-im
/
community-dapp
mirror of https://github.com/status-im/community-dapp.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(VotingContract): improve `votingRooms` indexing

This commit is contained in:
Patryk Osmaczko 2023-03-16 20:54:10 +01:00 committed by osmaczko
parent 396aa6d8a7
commit 5cc0f21e07
4 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/DApp/src/componentsMobile/VotingRoomMobile.tsx
View File

@ -15,7 +15,7 @@ export function VotingRoomMobile() {
abi: votingContract.interface,
address: votingContract.address,
method: 'votingRooms',
args: [Number(id)],
args: [Number(id) - 1],
}) as any
const [details] = useCommunities([votingRoom?.community])
const [detailedVotingRoom, setDetailedVotingRoom] = useState<DetailedVotingRoom | undefined>(undefined)

2
packages/DApp/src/hooks/useVotingCommunities.ts
View File

@ -36,7 +36,7 @@ export function useVotingCommunities(
abi: votingContract.interface,
address: votingContract.address,
method: 'votingRooms',
args: [el],
args: [el - 1],
}
})

60
packages/contracts/contracts/VotingContract.sol
View File

@ -83,8 +83,6 @@ contract VotingContract {
constructor(IERC20 _address) {
owner = msg.sender;
token = _address;
VotingRoom memory newVotingRoom;
votingRooms.push(newVotingRoom);
DOMAIN_SEPARATOR = hash(
EIP712Domain({
name: 'Voting Contract',
@ -100,16 +98,32 @@ contract VotingContract {
directory = _address;
}
/// Voting room with `ID` doesn't exist.
error VotingRoomDoesntExist(uint256 ID);
/// Room `ID` must be greater than 0.
error InvalidRoomID(uint256 ID);
modifier onlyIfVotingRoomExists(uint256 ID) {
if (ID < 1) revert InvalidRoomID(ID);
if (ID > votingRooms.length) revert VotingRoomDoesntExist(ID);
_;
}
function _getVotingRoom(uint256 roomID) private view onlyIfVotingRoomExists(roomID) returns (VotingRoom storage) {
return votingRooms[roomID - 1];
}
function getCommunityVoting(bytes calldata publicKey) public view returns (VotingRoom memory) {
return votingRooms[communityVotingId[publicKey]];
return _getVotingRoom(communityVotingId[publicKey]);
}
function getActiveVotingRooms() public view returns (uint256[] memory) {
uint256[] memory returnVotingRooms = new uint256[](votingRooms.length);
uint256 count = 0;
for (uint256 i = 1; i < votingRooms.length; i++) {
for (uint256 i = 0; i < votingRooms.length; i++) {
if (!votingRooms[i].finalized) {
returnVotingRooms[count] = i;
returnVotingRooms[count] = votingRooms[i].roomNumber;
count++;
}
}
@ -121,13 +135,13 @@ contract VotingContract {
}
function listRoomVoters(uint256 roomId) public view returns (address[] memory) {
return votingRooms[roomId].voters;
return _getVotingRoom(roomId).voters;
}
function getCommunityHistory(bytes calldata publicKey) public view returns (VotingRoom[] memory returnVotingRooms) {
returnVotingRooms = new VotingRoom[](communityVotingHistory[publicKey].length);
for (uint256 i = 0; i < communityVotingHistory[publicKey].length; i++) {
returnVotingRooms[i] = votingRooms[communityVotingHistory[publicKey][i]];
returnVotingRooms[i] = _getVotingRoom(communityVotingHistory[publicKey][i]);
}
}
@ -143,36 +157,37 @@ contract VotingContract {
if (historyLength > 0) {
uint256 roomId = communityVotingHistory[publicKey][historyLength - 1];
require(
block.timestamp.sub(votingRooms[roomId].endAt) > TIME_BETWEEN_VOTING,
block.timestamp.sub(_getVotingRoom(roomId).endAt) > TIME_BETWEEN_VOTING,
'Community was in a vote recently'
);
}
require(token.balanceOf(msg.sender) >= voteAmount, 'not enough token');
communityVotingId[publicKey] = votingRooms.length;
communityVotingHistory[publicKey].push(votingRooms.length);
uint votingRoomID = votingRooms.length + 1;
communityVotingId[publicKey] = votingRoomID;
communityVotingHistory[publicKey].push(votingRoomID);
VotingRoom memory newVotingRoom;
newVotingRoom.startBlock = block.number;
newVotingRoom.endAt = block.timestamp.add(VOTING_LENGTH);
newVotingRoom.voteType = voteType;
newVotingRoom.community = publicKey;
newVotingRoom.roomNumber = votingRooms.length;
newVotingRoom.roomNumber = votingRoomID;
newVotingRoom.totalVotesFor = voteAmount;
voted[votingRooms.length][msg.sender] = true;
voted[votingRoomID][msg.sender] = true;
votingRooms.push(newVotingRoom);
votingRooms[votingRooms.length - 1].voters.push(msg.sender);
_getVotingRoom(votingRoomID).voters.push(msg.sender);
emit VotingRoomStarted(votingRooms.length - 1, publicKey);
emit VotingRoomStarted(votingRoomID, publicKey);
}
function finalizeVotingRoom(uint256 roomId) public {
require(roomId > 0, 'vote not found');
require(roomId < votingRooms.length, 'vote not found');
require(votingRooms[roomId].finalized == false, 'vote already finalized');
require(votingRooms[roomId].endAt < block.timestamp, 'vote still ongoing');
VotingRoom storage votingRoom = _getVotingRoom(roomId);
VotingRoom storage votingRoom = votingRooms[roomId];
require(votingRoom.finalized == false, 'vote already finalized');
require(votingRoom.endAt < block.timestamp, 'vote still ongoing');
votingRoom.finalized = true;
votingRoom.endAt = block.timestamp;
@ -204,13 +219,14 @@ contract VotingContract {
function castVotes(Vote[] calldata votes) public {
for (uint256 i = 0; i < votes.length; i++) {
Vote calldata vote = votes[i];
if (verify(vote, vote.r, vote.vs)) {
uint256 roomId = vote.roomIdAndType >> 1;
require(roomId > 0, 'vote not found');
require(roomId < votingRooms.length, 'vote not found');
VotingRoom storage room = votingRooms[roomId];
VotingRoom storage room = _getVotingRoom(roomId);
require(room.endAt > block.timestamp, 'vote closed');
require(!room.finalized, 'room finalized');
if (voted[roomId][vote.voter] == false) {
if (token.balanceOf(vote.voter) >= vote.sntAmount) {
if (vote.roomIdAndType & 1 == 1) {

18
packages/contracts/test/1.votingContract.test.ts
View File

@ -187,7 +187,7 @@ describe('VotingContract', () => {
it('gets', async () => {
const { votingContract } = await loadFixture(fixture)
await votingContract.initializeVotingRoom(1, publicKeys[0], BigNumber.from(100))
const votingRoom1 = await votingContract.votingRooms(1)
const votingRoom1 = await votingContract.votingRooms(0)
expect(votingRoom1.slice(2)).to.deep.eq([
1,
false,
@ -202,7 +202,7 @@ describe('VotingContract', () => {
expect(history[0][4]).to.eq(publicKeys[0])
await votingContract.initializeVotingRoom(1, publicKeys[1], BigNumber.from(100))
expect((await votingContract.votingRooms(2)).slice(2)).to.deep.eq([
expect((await votingContract.votingRooms(1)).slice(2)).to.deep.eq([
1,
false,
publicKeys[1],
@ -210,7 +210,7 @@ describe('VotingContract', () => {
BigNumber.from(0),
BigNumber.from(2),
])
expect((await votingContract.votingRooms(1)).slice(2)).to.deep.eq([
expect((await votingContract.votingRooms(0)).slice(2)).to.deep.eq([
1,
false,
publicKeys[0],
@ -260,7 +260,7 @@ describe('VotingContract', () => {
it('finalizes', async () => {
const { votingContract } = await loadFixture(fixture)
await votingContract.initializeVotingRoom(1, publicKeys[0], BigNumber.from(100))
expect((await votingContract.votingRooms(1)).slice(2)).to.deep.eq([
expect((await votingContract.votingRooms(0)).slice(2)).to.deep.eq([
1,
false,
publicKeys[0],
@ -272,7 +272,7 @@ describe('VotingContract', () => {
await expect(await votingContract.finalizeVotingRoom(1))
.to.emit(votingContract, 'VotingRoomFinalized')
.withArgs(1, publicKeys[0], true, 1)
expect((await votingContract.votingRooms(1)).slice(2)).to.deep.eq([
expect((await votingContract.votingRooms(0)).slice(2)).to.deep.eq([
1,
true,
publicKeys[0],
@ -287,7 +287,7 @@ describe('VotingContract', () => {
const { votingContract, directoryContract, secondSigner } = await loadFixture(fixture)
await votingContract.initializeVotingRoom(1, publicKeys[0], BigNumber.from(100))
await voteAndFinalize(1, 1, secondSigner, votingContract)
expect((await votingContract.votingRooms(1)).slice(2)).to.deep.eq([
expect((await votingContract.votingRooms(0)).slice(2)).to.deep.eq([
1,
true,
publicKeys[0],
@ -407,7 +407,7 @@ describe('VotingContract', () => {
.to.emit(votingContract, 'NotEnoughToken')
.withArgs(1, secondSigner.address)
await expect((await votingContract.votingRooms(1)).slice(2)).to.deep.eq([
await expect((await votingContract.votingRooms(0)).slice(2)).to.deep.eq([
1,
false,
publicKeys[0],
@ -422,7 +422,7 @@ describe('VotingContract', () => {
const votes = await getSignedVotes(firstSigner, secondSigner, thirdSigner)
await votingContract.initializeVotingRoom(1, publicKeys[0], BigNumber.from(100))
await votingContract.castVotes(votes)
expect((await votingContract.votingRooms(1)).slice(2)).to.deep.eq([
expect((await votingContract.votingRooms(0)).slice(2)).to.deep.eq([
1,
false,
publicKeys[0],
@ -438,7 +438,7 @@ describe('VotingContract', () => {
await votingContract.initializeVotingRoom(1, publicKeys[0], BigNumber.from(100))
await votingContract.castVotes(votes)
await votingContract.castVotes(votes)
expect((await votingContract.votingRooms(1)).slice(2)).to.deep.eq([
expect((await votingContract.votingRooms(0)).slice(2)).to.deep.eq([
1,
false,
publicKeys[0],