certusone
/
trustless-generic-relayer
mirror of https://github.com/certusone/trustless-generic-relayer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make refund and reward addresses `payable`.

This commit is contained in:
Sebastián Claudio Nale 2023-02-17 13:12:05 -03:00 committed by scnale
parent 9acc9fcbd6
commit a5427bb177
7 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethereum/contracts/interfaces/IRelayProvider.sol
View File

@ -26,7 +26,7 @@ interface IRelayProvider {
//Otherwise, the delivery on the target chain (msg.sender) must equal this address.
function getDeliveryAddress(uint16 targetChain) external view returns (bytes32 whAddress);
function getRewardAddress() external view returns (address rewardAddress);
function getRewardAddress() external view returns (address payable rewardAddress);
function getConsistencyLevel() external view returns (uint8 consistencyLevel);
}

2
ethereum/contracts/relayProvider/RelayProvider.sol
View File

@ -52,7 +52,7 @@ contract RelayProvider is RelayProviderGovernance, IRelayProvider {
}
//Returns the address on this chain that rewards should be sent to
function getRewardAddress() public view override returns (address) {
function getRewardAddress() public view override returns (address payable) {
return rewardAddress();
}

2
ethereum/contracts/relayProvider/RelayProviderGetters.sol
View File

@ -52,7 +52,7 @@ contract RelayProviderGetters is RelayProviderState {
return _state.wormholeFee[targetChainId];
}
function rewardAddress() public view returns (address) {
function rewardAddress() public view returns (address payable) {
return _state.rewardAddress;
}

2
ethereum/contracts/relayProvider/RelayProviderGovernance.sol
View File

@ -40,7 +40,7 @@ abstract contract RelayProviderGovernance is RelayProviderGetters, RelayProvider
emit ApprovedSenderUpdated(sender, approved);
}
function updateRewardAddress(address newAddress) public onlyOwner {
function updateRewardAddress(address payable newAddress) public onlyOwner {
setRewardAddress(newAddress);
emit RewardAddressUpdated(newAddress);
}

2
ethereum/contracts/relayProvider/RelayProviderSetters.sol
View File

@ -40,7 +40,7 @@ contract RelayProviderSetters is Context, RelayProviderState {
_state.wormholeFee[chainId] = wormholeFee;
}
function setRewardAddress(address rewardAddress) internal {
function setRewardAddress(address payable rewardAddress) internal {
_state.rewardAddress = rewardAddress;
}

2
ethereum/contracts/relayProvider/RelayProviderState.sol
View File

@ -42,7 +42,7 @@ contract RelayProviderStorage {
// Dictionary of wormhole chain id -> assetConversionBufferDenominator
mapping(uint16 => uint16) assetConversionBufferDenominator;
// Reward address for the relayer. The CoreRelayer contract transfers the reward for relaying messages here.
address rewardAddress;
address payable rewardAddress;
}
}

10
ethereum/forge-test/CoreRelayer.t.sol
View File

@ -220,8 +220,8 @@ contract TestCoreRelayer is Test {
CoreRelayer coreRelayerFull;
MockRelayerIntegration integration;
address relayer;
address rewardAddress;
address refundAddress;
address payable rewardAddress;
address payable refundAddress;
uint16 chainId;
}
@ -236,8 +236,10 @@ contract TestCoreRelayer is Test {
mapEntry.coreRelayerFull = CoreRelayer(address(mapEntry.coreRelayer));
mapEntry.integration = new MockRelayerIntegration(address(mapEntry.wormhole), address(mapEntry.coreRelayer));
mapEntry.relayer = address(uint160(uint256(keccak256(abi.encodePacked(bytes("relayer"), i)))));
mapEntry.refundAddress = address(uint160(uint256(keccak256(abi.encodePacked(bytes("refundAddress"), i)))));
mapEntry.rewardAddress = address(uint160(uint256(keccak256(abi.encodePacked(bytes("rewardAddress"), i)))));
mapEntry.refundAddress =
payable(address(uint160(uint256(keccak256(abi.encodePacked(bytes("refundAddress"), i))))));
mapEntry.rewardAddress =
payable(address(uint160(uint256(keccak256(abi.encodePacked(bytes("rewardAddress"), i))))));
mapEntry.chainId = i;
map[i] = mapEntry;
}