Skip to content

fix: clear vote for earlier rounds (OZ L-02) #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 20, 2024
Merged

fix: clear vote for earlier rounds (OZ L-02) #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a52066c
fix: clear vote for earlier rounds (OZ L-02)
Maikol Feb 2, 2024
1ce46f0
fix: change to if/else
Maikol Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions packages/contracts/contracts/rewards/SubgraphAvailabilityManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,15 @@ contract SubgraphAvailabilityManager is Governed {
) private {
uint256 timestamp = block.timestamp;

// corresponding votes based on _deny for a subgraph deployment
uint256[NUM_ORACLES] storage lastVoteForSubgraph = _deny
? lastDenyVote[currentNonce][_subgraphDeploymentID]
: lastAllowVote[currentNonce][_subgraphDeploymentID];
lastVoteForSubgraph[_oracleIndex] = timestamp;
if (_deny) {
lastDenyVote[currentNonce][_subgraphDeploymentID][_oracleIndex] = timestamp;
// clear opposite vote for a subgraph deployment if it exists
lastAllowVote[currentNonce][_subgraphDeploymentID][_oracleIndex] = 0;
} else {
lastAllowVote[currentNonce][_subgraphDeploymentID][_oracleIndex] = timestamp;
// clear opposite vote for a subgraph deployment if it exists
lastDenyVote[currentNonce][_subgraphDeploymentID][_oracleIndex] = 0;
}

emit OracleVote(_subgraphDeploymentID, _deny, _oracleIndex, timestamp);

Expand Down
25 changes: 25 additions & 0 deletions packages/contracts/test/rewards/subgraphAvailability.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,31 @@ describe('SubgraphAvailabilityManager', () => {
// previous votes are no longer valid
expect(await rewardsManager.isDenied(subgraphDeploymentID1)).to.be.false
})

it('clears opposite vote when voting', async () => {
const denied = true
await subgraphAvailabilityManager.connect(oracleOne).vote(subgraphDeploymentID1, denied, 0)
await subgraphAvailabilityManager.connect(oracleTwo).vote(subgraphDeploymentID1, denied, 1)
await subgraphAvailabilityManager.connect(oracleThree).vote(subgraphDeploymentID1, denied, 2)

// 3/5 oracles vote denied = true so subgraph is denied
expect(await rewardsManager.isDenied(subgraphDeploymentID1)).to.be.true

// oracleOne changes its vote to denied = false
await subgraphAvailabilityManager.connect(oracleOne).vote(subgraphDeploymentID1, false, 0)

// last deny vote should be 0 for oracleOne
expect(
await subgraphAvailabilityManager.lastDenyVote(0, subgraphDeploymentID1, 0),
).to.be.equal(0)

// executionThreshold isn't met now since oracleOne changed its vote
expect(await subgraphAvailabilityManager.checkVotes(subgraphDeploymentID1, denied)).to.be
.false

// subgraph is still denied in rewards manager because only one oracle changed its vote
expect(await rewardsManager.isDenied(subgraphDeploymentID1)).to.be.true
})
})

describe('vote many', async () => {
Expand Down