Bump pragmas to 0.8.20 (#54)

- Bump pragmas to 0.8.20 - Add keys to mappings
ScopeLift · Sep 20, 2023 · b6af8d4 · b6af8d4
1 parent 66a5841
commit b6af8d4
Show file tree

Hide file tree

Showing 29 changed files with 34 additions and 32 deletions.
diff --git a/foundry.toml b/foundry.toml
@@ -1,4 +1,5 @@
 [profile.default]
+  evm_version = "paris"
   fs_permissions = [{ access = "read", path = "./broadcast" }]
   optimizer = true
   optimizer_runs = 10_000_000
@@ -7,7 +8,7 @@
     "openzeppelin/=lib/openzeppelin-contracts/contracts",
     "openzeppelin-flexible-voting/=lib/flexible-voting/lib/openzeppelin-contracts/contracts/",
   ]
-  solc_version = "0.8.16"
+  solc_version = "0.8.20"
   verbosity = 3
 
 [profile.ci]

diff --git a/script/DeployFakeERC20.s.sol b/script/DeployFakeERC20.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {Script} from "forge-std/Script.sol";
 import {FakeERC20} from "src/FakeERC20.sol";

diff --git a/script/WormholeDeploy.s.sol b/script/WormholeDeploy.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {Script, stdJson} from "forge-std/Script.sol";
 import {IGovernor} from "openzeppelin/governance/Governor.sol";

diff --git a/script/WormholeDeployGovernorMetadata.s.sol b/script/WormholeDeployGovernorMetadata.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {Script, stdJson} from "forge-std/Script.sol";
 import {IGovernor} from "openzeppelin/governance/Governor.sol";

diff --git a/script/WormholeDeployVoteAggregator.s.sol b/script/WormholeDeployVoteAggregator.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {Script, stdJson} from "forge-std/Script.sol";
 

diff --git a/script/WormholeMintOnL2.s.sol b/script/WormholeMintOnL2.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {Script, stdJson} from "forge-std/Script.sol";
 import {IERC20Mint} from "src/interfaces/IERC20Mint.sol";

diff --git a/script/WormholeSendProposalToL2.s.sol b/script/WormholeSendProposalToL2.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {Script, stdJson} from "forge-std/Script.sol";
 import {IL1GovernorMetadataBridge} from "src/interfaces/IL1GovernorMetadataBridge.sol";

diff --git a/src/FakeERC20.sol b/src/FakeERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {ERC20VotesComp} from "openzeppelin/token/ERC20/extensions/ERC20VotesComp.sol";
 import {ERC20Permit} from "openzeppelin/token/ERC20/extensions/ERC20Permit.sol";

diff --git a/src/L1Block.sol b/src/L1Block.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {SafeCast} from "openzeppelin/utils/math/SafeCast.sol";
 import {IL1Block} from "src/interfaces/IL1Block.sol";

diff --git a/src/L2GovernorMetadata.sol b/src/L2GovernorMetadata.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 /// @notice This contract is used by an L2VoteAggregator to store proposal metadata.
 /// It expects to receive proposal metadata from a valid L1 source.
@@ -12,7 +12,7 @@ abstract contract L2GovernorMetadata {
   }
 
   /// @notice The id of the proposal mapped to the proposal metadata.
-  mapping(uint256 => Proposal) _proposals;
+  mapping(uint256 proposalId => Proposal) _proposals;
 
   /// @notice Add proposal to internal storage.
   /// @param proposalId The id of the proposal.

diff --git a/src/L2VoteAggregator.sol b/src/L2VoteAggregator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {ERC20Votes} from "openzeppelin/token/ERC20/extensions/ERC20Votes.sol";
 import {SafeCast} from "openzeppelin/utils/math/SafeCast.sol";
@@ -60,10 +60,11 @@ abstract contract L2VoteAggregator {
 
   /// @notice A mapping of proposal to a mapping of voter address to boolean indicating whether a
   /// voter has voted or not.
-  mapping(uint256 => mapping(address => bool)) private _proposalVotersHasVoted;
+  mapping(uint256 proposalId => mapping(address voterAddress => bool)) private
+    _proposalVotersHasVoted;
 
   /// @notice A mapping of proposal id to proposal vote totals.
-  mapping(uint256 => ProposalVote) public proposalVotes;
+  mapping(uint256 proposalId => ProposalVote) public proposalVotes;
 
   /// @dev Emitted when a vote is cast on L2.
   event VoteCast(address indexed voter, uint256 proposalId, uint8 support, uint256 weight);

diff --git a/src/WormholeBase.sol b/src/WormholeBase.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {IWormholeRelayer} from "wormhole/interfaces/relayer/IWormholeRelayer.sol";
 

diff --git a/src/WormholeL1ERC20Bridge.sol b/src/WormholeL1ERC20Bridge.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.20;
 
 import {SafeERC20} from "openzeppelin/token/ERC20/utils/SafeERC20.sol";
 import {ERC20Votes} from "openzeppelin/token/ERC20/extensions/ERC20Votes.sol";

diff --git a/src/WormholeL1GovernorMetadataBridge.sol b/src/WormholeL1GovernorMetadataBridge.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {IGovernor} from "openzeppelin/governance/Governor.sol";
 import {WormholeSender} from "src/WormholeSender.sol";

diff --git a/src/WormholeL2ERC20.sol b/src/WormholeL2ERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {ERC20} from "openzeppelin/token/ERC20/ERC20.sol";
 import {ERC20Votes} from "openzeppelin/token/ERC20/extensions/ERC20Votes.sol";

diff --git a/src/WormholeL2GovernorMetadata.sol b/src/WormholeL2GovernorMetadata.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {WormholeReceiver} from "src/WormholeReceiver.sol";
 import {WormholeBase} from "src/WormholeBase.sol";

diff --git a/src/WormholeL2VoteAggregator.sol b/src/WormholeL2VoteAggregator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {L2GovernorMetadata} from "src/WormholeL2GovernorMetadata.sol";
 import {L2VoteAggregator} from "src/L2VoteAggregator.sol";

diff --git a/src/WormholeReceiver.sol b/src/WormholeReceiver.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {Ownable} from "openzeppelin/access/Ownable.sol";
 

diff --git a/src/WormholeSender.sol b/src/WormholeSender.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {WormholeBase} from "src/WormholeBase.sol";
 

diff --git a/src/interfaces/IL1Block.sol b/src/interfaces/IL1Block.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.0;
 
 // interface is for contract defined at
 // https://github.com/ethereum-optimism/optimism/blob/develop/packages/contracts-bedrock/contracts/L2/L1Block.sol

diff --git a/test/WormholeBase.t.sol b/test/WormholeBase.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 

diff --git a/test/WormholeL1ERC20Bridge.t.sol b/test/WormholeL1ERC20Bridge.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 import {IGovernor} from "openzeppelin/governance/Governor.sol";

diff --git a/test/WormholeL1GovernorMetadataBridge.t.sol b/test/WormholeL1GovernorMetadataBridge.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 import {Governor, IGovernor} from "openzeppelin/governance/Governor.sol";

diff --git a/test/WormholeL1VotePool.t.sol b/test/WormholeL1VotePool.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.20;
 
 import {Vm, Test} from "forge-std/Test.sol";
 import {WormholeRelayerBasicTest} from "wormhole-solidity-sdk/testing/WormholeRelayerTest.sol";

diff --git a/test/WormholeL2ERC20.t.sol b/test/WormholeL2ERC20.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 import {IGovernor} from "openzeppelin/governance/Governor.sol";

diff --git a/test/WormholeL2GovernorMetadata.t.sol b/test/WormholeL2GovernorMetadata.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 

diff --git a/test/WormholeL2VoteAggregator.t.sol b/test/WormholeL2VoteAggregator.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.16;
+pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 import {WormholeRelayerBasicTest} from "wormhole-solidity-sdk/testing/WormholeRelayerTest.sol";

diff --git a/test/WormholeReceiver.t.sol b/test/WormholeReceiver.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 

diff --git a/test/WormholeSender.t.sol b/test/WormholeSender.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.20;
 
 import {Test} from "forge-std/Test.sol";
 import {IWormholeRelayer} from "wormhole/interfaces/relayer/IWormholeRelayer.sol";