From f26ee275f77d12bf82e2b27d331e396de052c039 Mon Sep 17 00:00:00 2001 From: ChaoticWalrus <93558947+ChaoticWalrus@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:50:57 -0700 Subject: [PATCH] modify events for slightly more consistency remove multiplier from `StrategyAddedToQuorum` event and emit a `StrategyMultiplierUpdated` event when a strategy is added to a quorum / removed from a quorum --- src/contracts/interfaces/IVoteWeigher.sol | 4 ++-- src/contracts/middleware/VoteWeigherBase.sol | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/contracts/interfaces/IVoteWeigher.sol b/src/contracts/interfaces/IVoteWeigher.sol index 56cdea4f5..05cd0e0ea 100644 --- a/src/contracts/interfaces/IVoteWeigher.sol +++ b/src/contracts/interfaces/IVoteWeigher.sol @@ -15,8 +15,8 @@ import "../interfaces/IDelegationManager.sol"; interface IVoteWeigher { /// @notice emitted when a new quorum is created event QuorumCreated(uint8 indexed quorumNumber); - /// @notice emitted when `strategy` has been added to the array at `strategiesConsideredAndMultipliers[quorumNumber]` with the `multiplier` - event StrategyAddedToQuorum(uint8 indexed quorumNumber, IStrategy strategy, uint96 multiplier); + /// @notice emitted when `strategy` has been added to the array at `strategiesConsideredAndMultipliers[quorumNumber]` + event StrategyAddedToQuorum(uint8 indexed quorumNumber, IStrategy strategy); /// @notice emitted when `strategy` has removed from the array at `strategiesConsideredAndMultipliers[quorumNumber]` event StrategyRemovedFromQuorum(uint8 indexed quorumNumber, IStrategy strategy); /// @notice emitted when `strategy` has its `multiplier` updated in the array at `strategiesConsideredAndMultipliers[quorumNumber]` diff --git a/src/contracts/middleware/VoteWeigherBase.sol b/src/contracts/middleware/VoteWeigherBase.sol index 7dc902c1a..41702b3a9 100644 --- a/src/contracts/middleware/VoteWeigherBase.sol +++ b/src/contracts/middleware/VoteWeigherBase.sol @@ -111,6 +111,7 @@ contract VoteWeigherBase is VoteWeigherBaseStorage { require(indicesToRemoveLength > 0, "VoteWeigherBase.removeStrategiesConsideredAndMultipliers: no indices to remove provided"); for (uint256 i = 0; i < indicesToRemoveLength;) { emit StrategyRemovedFromQuorum(quorumNumber, strategiesConsideredAndMultipliers[quorumNumber][indicesToRemove[i]].strategy); + emit StrategyMultiplierUpdated(quorumNumber, strategiesConsideredAndMultipliers[quorumNumber][indicesToRemove[i]].strategy, 0); // remove strategy and its associated multiplier strategiesConsideredAndMultipliers[quorumNumber][indicesToRemove[i]] = strategiesConsideredAndMultipliers[ quorumNumber @@ -206,7 +207,12 @@ contract VoteWeigherBase is VoteWeigherBaseStorage { "VoteWeigherBase._addStrategiesConsideredAndMultipliers: cannot add strategy with zero weight" ); strategiesConsideredAndMultipliers[quorumNumber].push(_newStrategiesConsideredAndMultipliers[i]); - emit StrategyAddedToQuorum(quorumNumber, _newStrategiesConsideredAndMultipliers[i].strategy, _newStrategiesConsideredAndMultipliers[i].multiplier); + emit StrategyAddedToQuorum(quorumNumber, _newStrategiesConsideredAndMultipliers[i].strategy); + emit StrategyMultiplierUpdated( + quorumNumber, + _newStrategiesConsideredAndMultipliers[i].strategy, + _newStrategiesConsideredAndMultipliers[i].multiplier + ); unchecked { ++i; }