celo-org · martinvol · Sep 15, 2023 · Jul 21, 2023 · Jul 21, 2023 · Jul 24, 2023
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -202,7 +202,7 @@ jobs:
   general-test:
     <<: *defaults
     # XXX (soloseng): Increased size because this test was hitting the ram limit and failing
-    resource_class: xlarge
+    resource_class: large
     steps:
       - attach_workspace:
           at: ~/app

diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml
@@ -8,12 +8,10 @@ on:
   push:
     branches:
       - master
-      # TODO (soloseng): remove before merge
-      - pahor/0.8_from_Seb 
-  # TODO(jcortejoso): Replace by pull_request
-  pull_request_target:
+  pull_request:
     branches:
       - master
+      - martinvol/CR10Release
 
 concurrency:
   group: circle-ci-${{ github.ref }}
@@ -291,7 +289,7 @@ jobs:
     # Keeping name short because GitHub UI does not handle long names well 
     name: ${{ matrix.name }}
     runs-on: ["self-hosted", "monorepo-node18"]
-    timeout-minutes: 60
+    timeout-minutes: 120
     needs: [install-dependencies, lint-checks]
     if: |
       contains(needs.install-dependencies.outputs.all_modified_files, 'packages/protocol') ||
@@ -351,14 +349,12 @@ jobs:
           yarn --cwd packages/protocol build
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
-        timeout-minutes: 20
-        if: contains(matrix.command, 'common/') && false
-        with:
-          limit-access-to-actor: true
+        if: false
+        timeout-minutes: 120
       - name: Execute matrix command for test
         uses: nick-fields/retry@v2
         with:
-          timeout_minutes: 30
+          timeout_minutes: 60
           max_attempts: 3
           command: |
             ${{ matrix.command }}
@@ -646,10 +642,12 @@ jobs:
               ./ci_test_validator_order.sh checkout ${CELO_BLOCKCHAIN_BRANCH_TO_TEST}
           - name: CIP35 eth compatibility test
             command: |
-              set -e
-              export PATH="/usr/local/go/bin:$HOME/.cargo/bin:${PATH}"
-              cd packages/celotool
-              ./ci_test_cip35.sh checkout ${CELO_BLOCKCHAIN_BRANCH_TO_TEST}
+              echo "Test skipped, see issue https://github.com/celo-org/celo-monorepo/issues/10556"
+
+              # set -e
+              # export PATH="/usr/local/go/bin:$HOME/.cargo/bin:${PATH}"
+              # cd packages/celotool
+              # ./ci_test_cip35.sh checkout ${CELO_BLOCKCHAIN_BRANCH_TO_TEST}
     steps:
       - uses: actions/cache/restore@v3
         id: cache_git
@@ -666,14 +664,14 @@ jobs:
           rebuild-package: 'true'
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
-        timeout-minutes: 20
-        if: contains(matrix.command, 'ci_test_transfers.sh') && false
+        timeout-minutes: 120
+        if: contains(matrix.command, 'ci_test_cip35.sh')
         with:
           limit-access-to-actor: true
       - name: Execute matrix command for test
         uses: nick-fields/retry@v2
         with:
-          timeout_minutes: 30
+          timeout_minutes: 60
           max_attempts: 3
           command: |
             ${{ matrix.command }}

diff --git a/package.json b/package.json
@@ -88,3 +88,4 @@
     "bignumber.js": "9.0.0"
   }
 }
+
@@ -213,7 +213,7 @@ function gethRepositoryFromFlags() {
 }
 
 export function getHooks(gethConfig: GethRunConfig) {
-  return getContext(gethConfig).hooks
+  return getContext(gethConfig, true).hooks
 }
 
 export function getContext(gethConfig: GethRunConfig, verbose: boolean = verboseOutput) {

diff --git a/packages/cli/src/commands/releasegold/withdraw.test.ts b/packages/cli/src/commands/releasegold/withdraw.test.ts
@@ -28,7 +28,7 @@ testWithGanache('releasegold:withdraw cmd', (web3: Web3) => {
   test('can withdraw released gold to beneficiary', async () => {
     await testLocally(SetLiquidityProvision, ['--contract', contractAddress, '--yesreally'])
     // ReleasePeriod of default contract
-    await timeTravel(100000000, web3)
+    await timeTravel(300000000, web3)
     const releaseGoldWrapper = new ReleaseGoldWrapper(
       kit.connection,
       newReleaseGold(web3, contractAddress),
@@ -47,7 +47,7 @@ testWithGanache('releasegold:withdraw cmd', (web3: Web3) => {
   test("can't withdraw the whole balance if there is a cUSD balance", async () => {
     await testLocally(SetLiquidityProvision, ['--contract', contractAddress, '--yesreally'])
     // ReleasePeriod of default contract
-    await timeTravel(100000000, web3)
+    await timeTravel(300000000, web3)
     const releaseGoldWrapper = new ReleaseGoldWrapper(
       kit.connection,
       newReleaseGold(web3, contractAddress),

@@ -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',
 }
@@ -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);
   }
 
   /**

@@ -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