Skip to content
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.

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

chore: adding unit types and ids into dev incentives event #175

Merged
merged 1 commit into from
Jul 19, 2024
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions contracts/Dispenser.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.25;

Check warning on line 2 in contracts/Dispenser.sol

View workflow job for this annotation

GitHub Actions / build

Found more than One contract per file. 6 contracts found!

// Deposit Processor interface
interface IDepositProcessor {
Expand Down Expand Up @@ -267,7 +267,7 @@
event TreasuryUpdated(address indexed treasury);
event VoteWeightingUpdated(address indexed voteWeighting);
event StakingParamsUpdated(uint256 maxNumClaimingEpochs, uint256 maxNumStakingTargets);
event IncentivesClaimed(address indexed owner, uint256 reward, uint256 topUp);
event IncentivesClaimed(address indexed owner, uint256 reward, uint256 topUp, uint256[] unitTypes, uint256[] unitIds);
event StakingIncentivesClaimed(address indexed account, uint256 chainId, bytes32 stakingTarget,
uint256 stakingIncentive, uint256 transferAmount, uint256 returnAmount);
event StakingIncentivesBatchClaimed(address indexed account, uint256[] chainIds, bytes32[][] stakingTargets,
Expand All @@ -282,14 +282,14 @@

// Maximum chain Id as per EVM specs
uint256 public constant MAX_EVM_CHAIN_ID = type(uint64).max / 2 - 36;
uint256 public immutable defaultMinStakingWeight;

Check warning on line 285 in contracts/Dispenser.sol

View workflow job for this annotation

GitHub Actions / build

Immutable variables name are set to be in capitalized SNAKE_CASE
uint256 public immutable defaultMaxStakingIncentive;

Check warning on line 286 in contracts/Dispenser.sol

View workflow job for this annotation

GitHub Actions / build

Immutable variables name are set to be in capitalized SNAKE_CASE
// OLAS token address
address public immutable olas;

Check warning on line 288 in contracts/Dispenser.sol

View workflow job for this annotation

GitHub Actions / build

Immutable variables name are set to be in capitalized SNAKE_CASE
// Retainer address in bytes32 form
bytes32 public immutable retainer;

Check warning on line 290 in contracts/Dispenser.sol

View workflow job for this annotation

GitHub Actions / build

Immutable variables name are set to be in capitalized SNAKE_CASE
// Retainer hash of a Nominee struct composed of retainer address with block.chainid
bytes32 public immutable retainerHash;

Check warning on line 292 in contracts/Dispenser.sol

View workflow job for this annotation

GitHub Actions / build

Immutable variables name are set to be in capitalized SNAKE_CASE

// Max number of epochs to claim staking incentives for
uint256 public maxNumClaimingEpochs;
Expand Down Expand Up @@ -877,7 +877,7 @@
revert ClaimIncentivesFailed(msg.sender, reward, topUp);
}

emit IncentivesClaimed(msg.sender, reward, topUp);
emit IncentivesClaimed(msg.sender, reward, topUp, unitTypes, unitIds);

_locked = 1;
}
Expand Down
Loading