Move everything over to hardhat (#208)

* Got hardhat to work * Fix build structure * Fix build process, hopefully
ethereum-optimism · Feb 2, 2021 · 007e106 · 007e106
1 parent a30b120
commit 007e106
Show file tree

Hide file tree

Showing 113 changed files with 1,721 additions and 1,004 deletions.
diff --git a/buidler-env.d.ts b/buidler-env.d.ts
diff --git a/buidler.config.ts b/buidler.config.ts
diff --git a/contracts/optimistic-ethereum/OVM/accounts/OVM_ECDSAContractAccount.sol b/contracts/optimistic-ethereum/OVM/accounts/OVM_ECDSAContractAccount.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Interface Imports */

diff --git a/contracts/optimistic-ethereum/OVM/accounts/OVM_ProxyEOA.sol b/contracts/optimistic-ethereum/OVM/accounts/OVM_ProxyEOA.sol
@@ -1,4 +1,5 @@
-pragma solidity ^0.7.0;
+// SPDX-License-Identifier: MIT
+pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
 import { Lib_BytesUtils } from "../../libraries/utils/Lib_BytesUtils.sol";
@@ -19,7 +20,9 @@ contract OVM_ProxyEOA {
 
     constructor(
         address _implementation
-    ) {
+    )
+        public
+    {
         _setImplementation(_implementation);
     }
 

diff --git a/contracts/optimistic-ethereum/OVM/bridge/OVM_BaseCrossDomainMessenger.sol b/contracts/optimistic-ethereum/OVM/bridge/OVM_BaseCrossDomainMessenger.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 

diff --git a/contracts/optimistic-ethereum/OVM/bridge/OVM_L1CrossDomainMessenger.sol b/contracts/optimistic-ethereum/OVM/bridge/OVM_L1CrossDomainMessenger.sol
@@ -31,6 +31,7 @@ contract OVM_L1CrossDomainMessenger is iOVM_L1CrossDomainMessenger, OVM_BaseCros
      * Pass a default zero address to the address resolver. This will be updated when initialized.
      */
     constructor()
+        public
         Lib_AddressResolver(address(0))
     {}
 

diff --git a/contracts/optimistic-ethereum/OVM/bridge/OVM_L2CrossDomainMessenger.sol b/contracts/optimistic-ethereum/OVM/bridge/OVM_L2CrossDomainMessenger.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 

diff --git a/contracts/optimistic-ethereum/OVM/chain/OVM_CanonicalTransactionChain.sol b/contracts/optimistic-ethereum/OVM/chain/OVM_CanonicalTransactionChain.sol
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+// @unsupported: ovm
+pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
@@ -57,6 +58,7 @@ contract OVM_CanonicalTransactionChain is iOVM_CanonicalTransactionChain, Lib_Ad
         uint256 _forceInclusionPeriodBlocks,
         uint256 _maxTransactionGasLimit
     )
+        public
         Lib_AddressResolver(_libAddressManager)
     {
         forceInclusionPeriodSeconds = _forceInclusionPeriodSeconds;

diff --git a/contracts/optimistic-ethereum/OVM/chain/OVM_ChainStorageContainer.sol b/contracts/optimistic-ethereum/OVM/chain/OVM_ChainStorageContainer.sol
@@ -1,4 +1,5 @@
-pragma solidity ^0.7.0;
+// SPDX-License-Identifier: MIT
+pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
 import { Lib_RingBuffer } from "../../libraries/utils/Lib_RingBuffer.sol";
@@ -39,6 +40,7 @@ contract OVM_ChainStorageContainer is iOVM_ChainStorageContainer, Lib_AddressRes
         address _libAddressManager,
         string memory _owner
     )
+        public
         Lib_AddressResolver(_libAddressManager)
     {
         owner = _owner;

diff --git a/contracts/optimistic-ethereum/OVM/chain/OVM_StateCommitmentChain.sol b/contracts/optimistic-ethereum/OVM/chain/OVM_StateCommitmentChain.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
@@ -42,6 +42,7 @@ contract OVM_StateCommitmentChain is iOVM_StateCommitmentChain, Lib_AddressResol
         uint256 _fraudProofWindow,
         uint256 _sequencerPublishWindow
     )
+        public
         Lib_AddressResolver(_libAddressManager)
     {
         FRAUD_PROOF_WINDOW = _fraudProofWindow;

diff --git a/contracts/optimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol b/contracts/optimistic-ethereum/OVM/execution/OVM_ExecutionManager.sol
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+// @unsupported: ovm
+pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
@@ -66,6 +67,7 @@ contract OVM_ExecutionManager is iOVM_ExecutionManager, Lib_AddressResolver {
         GasMeterConfig memory _gasMeterConfig,
         GlobalContext memory _globalContext
     )
+        public
         Lib_AddressResolver(_libAddressManager)
     {
         ovmSafetyChecker = iOVM_SafetyChecker(resolve("OVM_SafetyChecker"));

diff --git a/contracts/optimistic-ethereum/OVM/execution/OVM_SafetyChecker.sol b/contracts/optimistic-ethereum/OVM/execution/OVM_SafetyChecker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 
 /* Interface Imports */
 import { iOVM_SafetyChecker } from "../../iOVM/execution/iOVM_SafetyChecker.sol";

diff --git a/contracts/optimistic-ethereum/OVM/execution/OVM_StateManager.sol b/contracts/optimistic-ethereum/OVM/execution/OVM_StateManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
@@ -51,7 +51,9 @@ contract OVM_StateManager is iOVM_StateManager {
      */
     constructor(
         address _owner
-    ) {
+    )
+        public
+    {
         owner = _owner;
     }
 

diff --git a/contracts/optimistic-ethereum/OVM/execution/OVM_StateManagerFactory.sol b/contracts/optimistic-ethereum/OVM/execution/OVM_StateManagerFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 
 /* Interface Imports */
 import { iOVM_StateManager } from "../../iOVM/execution/iOVM_StateManager.sol";

diff --git a/contracts/optimistic-ethereum/OVM/precompiles/OVM_DeployerWhitelist.sol b/contracts/optimistic-ethereum/OVM/precompiles/OVM_DeployerWhitelist.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
 import { Lib_Bytes32Utils } from "../../libraries/utils/Lib_Bytes32Utils.sol";

diff --git a/contracts/optimistic-ethereum/OVM/precompiles/OVM_ETH.sol b/contracts/optimistic-ethereum/OVM/precompiles/OVM_ETH.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */

diff --git a/contracts/optimistic-ethereum/OVM/precompiles/OVM_L1MessageSender.sol b/contracts/optimistic-ethereum/OVM/precompiles/OVM_L1MessageSender.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 
 /* Interface Imports */
 import { iOVM_L1MessageSender } from "../../iOVM/precompiles/iOVM_L1MessageSender.sol";

diff --git a/contracts/optimistic-ethereum/OVM/precompiles/OVM_L2ToL1MessagePasser.sol b/contracts/optimistic-ethereum/OVM/precompiles/OVM_L2ToL1MessagePasser.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 
 /* Interface Imports */

diff --git a/contracts/optimistic-ethereum/OVM/precompiles/OVM_ProxySequencerEntrypoint.sol b/contracts/optimistic-ethereum/OVM/precompiles/OVM_ProxySequencerEntrypoint.sol
@@ -1,4 +1,5 @@
-pragma solidity ^0.7.0;
+// SPDX-License-Identifier: MIT
+pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
 import { Lib_SafeExecutionManagerWrapper } from "../../libraries/wrappers/Lib_SafeExecutionManagerWrapper.sol";

diff --git a/contracts/optimistic-ethereum/OVM/precompiles/OVM_SequencerEntrypoint.sol b/contracts/optimistic-ethereum/OVM/precompiles/OVM_SequencerEntrypoint.sol
@@ -1,4 +1,5 @@
-pragma solidity ^0.7.0;
+// SPDX-License-Identifier: MIT
+pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
 import { Lib_BytesUtils } from "../../libraries/utils/Lib_BytesUtils.sol";

diff --git a/contracts/optimistic-ethereum/OVM/verification/OVM_BondManager.sol b/contracts/optimistic-ethereum/OVM/verification/OVM_BondManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
 import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";
@@ -53,7 +53,11 @@ contract OVM_BondManager is iOVM_BondManager, Lib_AddressResolver {
 
     /// Initializes with a ERC20 token to be used for the fidelity bonds
     /// and with the Address Manager
-    constructor(ERC20 _token, address _libAddressManager)
+    constructor(
+        ERC20 _token,
+        address _libAddressManager
+    )
+        public
         Lib_AddressResolver(_libAddressManager)
     {
         token = _token;

diff --git a/contracts/optimistic-ethereum/OVM/verification/OVM_FraudContributor.sol b/contracts/optimistic-ethereum/OVM/verification/OVM_FraudContributor.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 
 import { iOVM_BondManager } from "../../iOVM/verification/iOVM_BondManager.sol";
 import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";

diff --git a/contracts/optimistic-ethereum/OVM/verification/OVM_FraudVerifier.sol b/contracts/optimistic-ethereum/OVM/verification/OVM_FraudVerifier.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
@@ -36,6 +36,7 @@ contract OVM_FraudVerifier is Lib_AddressResolver, OVM_FraudContributor, iOVM_Fr
     constructor(
         address _libAddressManager
     )
+        public
         Lib_AddressResolver(_libAddressManager)
     {}
 

diff --git a/contracts/optimistic-ethereum/OVM/verification/OVM_StateTransitioner.sol b/contracts/optimistic-ethereum/OVM/verification/OVM_StateTransitioner.sol
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+// @unsupported: ovm
+pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 
 /* Library Imports */
@@ -80,6 +81,7 @@ contract OVM_StateTransitioner is Lib_AddressResolver, OVM_FraudContributor, iOV
         bytes32 _preStateRoot,
         bytes32 _transactionHash
     )
+        public
         Lib_AddressResolver(_libAddressManager)
     {
         stateTransitionIndex = _stateTransitionIndex;

diff --git a/contracts/optimistic-ethereum/OVM/verification/OVM_StateTransitionerFactory.sol b/contracts/optimistic-ethereum/OVM/verification/OVM_StateTransitionerFactory.sol
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+// @unsupported: ovm
+pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
 import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";
@@ -17,8 +18,12 @@ import { OVM_StateTransitioner } from "./OVM_StateTransitioner.sol";
  */
 contract OVM_StateTransitionerFactory is iOVM_StateTransitionerFactory, Lib_AddressResolver {
 
-    constructor( address _libAddressManager)
-        Lib_AddressResolver(_libAddressManager){}
+    constructor(
+        address _libAddressManager
+    )
+        public
+        Lib_AddressResolver(_libAddressManager)
+    {}
 
     /***************************************
      * Public Functions: Contract Creation *

diff --git a/contracts/optimistic-ethereum/iOVM/bridge/iOVM_BaseCrossDomainMessenger.sol b/contracts/optimistic-ethereum/iOVM/bridge/iOVM_BaseCrossDomainMessenger.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 

diff --git a/contracts/optimistic-ethereum/iOVM/bridge/iOVM_L2CrossDomainMessenger.sol b/contracts/optimistic-ethereum/iOVM/bridge/iOVM_L2CrossDomainMessenger.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 pragma experimental ABIEncoderV2;
 

diff --git a/contracts/optimistic-ethereum/iOVM/chain/iOVM_ChainStorageContainer.sol b/contracts/optimistic-ethereum/iOVM/chain/iOVM_ChainStorageContainer.sol
@@ -1,4 +1,5 @@
-pragma solidity ^0.7.0;
+// SPDX-License-Identifier: MIT
+pragma solidity >0.5.0 <0.8.0;
 
 /**
  * @title iOVM_ChainStorageContainer

diff --git a/contracts/optimistic-ethereum/iOVM/execution/iOVM_SafetyChecker.sol b/contracts/optimistic-ethereum/iOVM/execution/iOVM_SafetyChecker.sol
@@ -10,5 +10,5 @@ interface iOVM_SafetyChecker {
      * Public Functions *
      ********************/
 
-    function isBytecodeSafe(bytes calldata _bytecode) external view returns (bool);
+    function isBytecodeSafe(bytes calldata _bytecode) external pure returns (bool);
 }
diff --git a/contracts/optimistic-ethereum/iOVM/execution/iOVM_StateManager.sol b/contracts/optimistic-ethereum/iOVM/execution/iOVM_StateManager.sol
@@ -66,7 +66,7 @@ interface iOVM_StateManager {
 
     function putContractStorage(address _contract, bytes32 _key, bytes32 _value) external;
     function getContractStorage(address _contract, bytes32 _key) external view returns (bytes32 _value);
-    function hasContractStorage(address _contract, bytes32 _key) external returns (bool _exists);
+    function hasContractStorage(address _contract, bytes32 _key) external view returns (bool _exists);
     function testAndSetContractStorageLoaded(address _contract, bytes32 _key) external returns (bool _wasContractStorageAlreadyLoaded);
     function testAndSetContractStorageChanged(address _contract, bytes32 _key) external returns (bool _wasContractStorageAlreadyChanged);
     function commitContractStorage(address _contract, bytes32 _key) external returns (bool _wasContractStorageCommitted);

diff --git a/contracts/optimistic-ethereum/iOVM/precompiles/iOVM_ERC20.sol b/contracts/optimistic-ethereum/iOVM/precompiles/iOVM_ERC20.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 
 /**

diff --git a/contracts/optimistic-ethereum/iOVM/precompiles/iOVM_L1MessageSender.sol b/contracts/optimistic-ethereum/iOVM/precompiles/iOVM_L1MessageSender.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 
 /**
@@ -11,5 +10,5 @@ interface iOVM_L1MessageSender {
      * Public Functions *
      ********************/
 
-    function getL1MessageSender() external returns (address _l1MessageSender);
+    function getL1MessageSender() external view returns (address _l1MessageSender);
 }
diff --git a/contracts/optimistic-ethereum/iOVM/precompiles/iOVM_L2ToL1MessagePasser.sol b/contracts/optimistic-ethereum/iOVM/precompiles/iOVM_L2ToL1MessagePasser.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 
 /**

diff --git a/contracts/optimistic-ethereum/libraries/resolver/Lib_AddressManager.sol b/contracts/optimistic-ethereum/libraries/resolver/Lib_AddressManager.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 
 /* Contract Imports */

diff --git a/contracts/optimistic-ethereum/libraries/resolver/Lib_AddressResolver.sol b/contracts/optimistic-ethereum/libraries/resolver/Lib_AddressResolver.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */

diff --git a/contracts/optimistic-ethereum/libraries/resolver/Lib_Ownable.sol b/contracts/optimistic-ethereum/libraries/resolver/Lib_Ownable.sol
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: MIT
-// +build ovm
 pragma solidity >0.5.0 <0.8.0;
 
 /**

diff --git a/contracts/optimistic-ethereum/libraries/resolver/Lib_ResolvedDelegateProxy.sol b/contracts/optimistic-ethereum/libraries/resolver/Lib_ResolvedDelegateProxy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 
 /* Library Imports */
 import { Lib_AddressManager } from "./Lib_AddressManager.sol";
@@ -38,6 +38,7 @@ contract Lib_ResolvedDelegateProxy {
         address _libAddressManager,
         string memory _implementationName
     )
+        public
     {
         addressManager[address(this)] = Lib_AddressManager(_libAddressManager);
         implementationName[address(this)] = _implementationName;

diff --git a/contracts/optimistic-ethereum/libraries/rlp/Lib_RLPReader.sol b/contracts/optimistic-ethereum/libraries/rlp/Lib_RLPReader.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.7.0;
+pragma solidity >0.5.0 <0.8.0;
 
 /**
  * @title Lib_RLPReader