Skip to content

Replace address with Address #191

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

Draft
byshape wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Replace address with Address #191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions contracts/CrosschainWhitelistRegistry.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pragma solidity 0.8.23;

import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { Address } from "@1inch/solidity-utils/contracts/libraries/AddressLib.sol";
import { UniERC20 } from "@1inch/solidity-utils/contracts/libraries/UniERC20.sol";
import { WhitelistRegistry } from "./WhitelistRegistry.sol";

Expand All @@ -18,9 +19,9 @@ contract CrosschainWhitelistRegistry is Ownable {
error SamePromotee();

/// @notice Emitted when a new worker for a resolver is set.
event Promotion(address promoter, uint256 chainId, address promotee);
event Promotion(address promoter, uint256 chainId, Address promotee);

mapping(address promoter => mapping(uint256 chainId => address promotee)) public promotions;
mapping(address promoter => mapping(uint256 chainId => Address promotee)) public promotions;

WhitelistRegistry public immutable WHITELIST_REGISTRY;

Expand All @@ -42,8 +43,8 @@ contract CrosschainWhitelistRegistry is Ownable {
* @param chainId The chain ID where the worker will assigned.
* @param promotee The worker's address.
*/
function promote(uint256 chainId, address promotee) external {
if (promotions[msg.sender][chainId] == promotee) revert SamePromotee();
function promote(uint256 chainId, Address promotee) external {
if (Address.unwrap(promotions[msg.sender][chainId]) == Address.unwrap(promotee)) revert SamePromotee();
promotions[msg.sender][chainId] = promotee;
emit Promotion(msg.sender, chainId, promotee);
}
Expand All @@ -53,12 +54,12 @@ contract CrosschainWhitelistRegistry is Ownable {
* @param chainId The chain ID to get the promoted addresses for.
* @return promotees A list of worker addresses.
*/
function getPromotees(uint256 chainId) external view returns (address[] memory promotees) {
promotees = WHITELIST_REGISTRY.getWhitelist();
function getPromotees(uint256 chainId) external view returns (Address[] memory promotees) {
address[] memory whitelistPromotees = WHITELIST_REGISTRY.getWhitelist();
unchecked {
uint256 len = promotees.length;
uint256 len = whitelistPromotees.length;
for (uint256 i = 0; i < len; ++i) {
promotees[i] = promotions[promotees[i]][chainId];
promotees[i] = promotions[whitelistPromotees[i]][chainId];
}
}
}
Expand Down