Skip to content

systemcontract: revert to abi.encode for compatibility and safety #221

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

Merged
txhsl merged 1 commit into from
May 30, 2024
Merged

systemcontract: revert to abi.encode for compatibility and safety #221

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion contracts/solidity/GovProxyAdmin.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ contract GovProxyAdmin is GovernanceVote {
bytes32(
0xe739b9109d83c1c6d0d640fe9ed476fc5862a6de5483b00678a3fffa7a2be2f6
),
keccak256(abi.encodePacked(proxy, newImplementation, data))
keccak256(abi.encode(proxy, newImplementation, data))
)
{
proxy.upgradeToAndCall{value: msg.value}(newImplementation, data);
Expand Down
8 changes: 4 additions & 4 deletions contracts/solidity/Policy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ contract Policy is GovernanceVote, UUPSUpgradeable {
bytes32(
0x4912b57f7ea75243ecaff76a75bdedbc13a6f58c1c967b0427b8aee0a276309e
),
keccak256(abi.encodePacked(_addr))
keccak256(abi.encode(_addr))
)
{
if (isBlackListed[_addr]) revert Errors.BlacklistExists();
Expand All @@ -74,7 +74,7 @@ contract Policy is GovernanceVote, UUPSUpgradeable {
bytes32(
0x310cc9bfce6443143f03d0cdc4d66afa0b3c689539eb3e65cb1820b56d672465
),
keccak256(abi.encodePacked(_addr))
keccak256(abi.encode(_addr))
)
{
if (!isBlackListed[_addr]) revert Errors.BlacklistNotExists();
Expand All @@ -91,7 +91,7 @@ contract Policy is GovernanceVote, UUPSUpgradeable {
bytes32(
0x089197e4f35b8ada456b5531e8c1759ee3fce703602a3a957b5c9d2831082156
),
keccak256(abi.encodePacked(_gasTipCap))
keccak256(abi.encode(_gasTipCap))
)
{
if (_gasTipCap <= 0) revert Errors.InvalidMinGasTipCap();
Expand All @@ -108,7 +108,7 @@ contract Policy is GovernanceVote, UUPSUpgradeable {
bytes32(
0x83113031fe9312a872d9176bc1a087dc38ca109c517a596998332e2fb8409acc
),
keccak256(abi.encodePacked(_baseFee))
keccak256(abi.encode(_baseFee))
)
{
if (_baseFee <= 0) revert Errors.InvalidBaseFee();
Expand Down
4 changes: 2 additions & 2 deletions contracts/solidity/test/MockGovVote.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ contract MockGovVote is GovernanceVote {
)
external
needVote(
keccak256(abi.encodePacked("changeV")),
keccak256(abi.encodePacked(newV))
keccak256(abi.encode("changeV")),
keccak256(abi.encode(newV))
)
{
v = newV;
Expand Down