Skip to content

Commit

Permalink
modify events for slightly more consistency
Browse files Browse the repository at this point in the history
remove multiplier from `StrategyAddedToQuorum` event and emit a `StrategyMultiplierUpdated` event when a strategy is added to a quorum / removed from a quorum
  • Loading branch information
ChaoticWalrus committed Oct 10, 2023
1 parent 1c8e062 commit f26ee27
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/contracts/interfaces/IVoteWeigher.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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]`
Expand Down
8 changes: 7 additions & 1 deletion src/contracts/middleware/VoteWeigherBase.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit f26ee27

Please sign in to comment.