Martinvol/isolate 0.8 artifacts for gasPriceMinimum

packages/protocol/contractPackages.ts

@@ -1,12 +1,19 @@
 export interface ContractPackage {
   path?: string
+  folderPath?: string
   name?: string
+  contracstFolder: string
   contracts: string[]
   proxyContracts?: string[]
+  truffleConfig: string
+  solidityVersion?: string
+  proxiesPath?: string
 }
 
 export const MENTO_PACKAGE: ContractPackage = {
   path: 'mento-core',
+  contracstFolder: 'contracts',
+  folderPath: 'lib',
   name: 'mento',
   contracts: [
     'Exchange',
@@ -30,4 +37,22 @@ export const MENTO_PACKAGE: ContractPackage = {
     'StableTokenEURProxy',
     'StableTokenProxy',
   ],
+  truffleConfig: 'truffle-config.js',
+}
+
+export const SOLIDITY_08_PACKAGE: ContractPackage = {
+  path: 'contracts-0.8',
+  contracstFolder: '',
+  folderPath: '',
+  name: '0.8',
+  proxiesPath: '/', // Proxies are still with 0.8 contracts
+  contracts: [
+    // TODO make this automatic?
+    'GasPriceMinimum',
+  ],
+  proxyContracts: [
+    // TODO make this automatic?
+    'GasPriceMinimumProxy',
+  ],
+  truffleConfig: 'truffle-config0.8.js',
 }

packages/protocol/contracts/common/GasPriceMinimum.sol → packages/protocol/contracts-0.8/common/GasPriceMinimum.sol

@@ -3,12 +3,12 @@ pragma solidity >=0.8.7 <0.8.20;
 
 import "@openzeppelin/contracts8/access/Ownable.sol";
 
-import "./CalledByVm.sol";
-import "./Initializable.sol";
-import "./interfaces/ICeloVersionedContract.sol";
-import "./FixidityLib0.8.sol";
-import "./UsingRegistry8.sol";
-import "../stability/interfaces/ISortedOracles.sol";
+import "../../contracts/common/CalledByVm.sol";
+import "../../contracts/common/Initializable.sol";
+import "../../contracts/common/interfaces/ICeloVersionedContract.sol";
+import "../../contracts/common/FixidityLib.sol";
+import "./UsingRegistry.sol";
+import "../../contracts/stability/interfaces/ISortedOracles.sol";
 
 /**
  * @title Stores and provides gas price minimum for various currencies.
@@ -17,7 +17,7 @@ contract GasPriceMinimum is
   ICeloVersionedContract,
   Ownable,
   Initializable,
-  UsingRegistry8,
+  UsingRegistry,
   CalledByVm
 {
   using FixidityLib for FixidityLib.Fraction;
@@ -53,7 +53,7 @@ contract GasPriceMinimum is
    * @return Patch version of the contract.
    */
   function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
-    return (1, 1, 1, 0);
+    return (1, 2, 0, 0);
   }
 
   /**

packages/protocol/contracts/common/UsingRegistry8.sol → packages/protocol/contracts-0.8/common/UsingRegistry.sol

@@ -1,12 +1,15 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity >=0.8.0 <0.8.20;
 
+// Note: This is not an exact copy of UsingRegistry or UsingRegistryV2 in the contract's folder
+// because Mento's interfaces still don't support Solidity 0.8
+
 import "@openzeppelin/contracts8/access/Ownable.sol";
 import "@openzeppelin/contracts8/token/ERC20/IERC20.sol";
 
-import "./interfaces/IRegistry.sol";
+import "../../contracts/common/interfaces/IRegistry.sol";
 
-contract UsingRegistry8 is Ownable {
+contract UsingRegistry is Ownable {
   event RegistrySet(address indexed registryAddress);
 
   // solhint-disable state-visibility

packages/protocol/contracts/common/UsingRegistry.sol

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: LGPL-3.0-only
 pragma solidity ^0.5.13;
 
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";