add @celo/dev-utils as dev dependency (#10962)

* ++ @celo/dev-utils to dev dependencies * - updated to use CR 11 instead of 10 - removed general test * Bump lockedGold contract version * revert version ∆ * removed unused env var * bump contract versions
celo-org · Apr 19, 2024 · 7962dc5 · 7962dc5
1 parent c71bada
commit 7962dc5
Show file tree

Hide file tree

Showing 10 changed files with 341 additions and 55 deletions.
diff --git a/.github/workflows/celo-monorepo.yml b/.github/workflows/celo-monorepo.yml
@@ -28,8 +28,7 @@ env:
   TERM: dumb
   GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError"'
   # Git Tag for contract release to use
-  #RELEASE_TAG: ganache-v7-core-contracts.v9
-  RELEASE_TAG: core-contracts.v10
+  RELEASE_TAG: core-contracts.v11
   # CELO_BLOCKCHAIN_BRANCH_TO_TEST: master
   CELO_BLOCKCHAIN_BRANCH_TO_TEST: release/1.7.x
 
@@ -151,33 +150,6 @@ jobs:
           artifacts_to_cache: ${{ needs.install-dependencies.outputs.artifacts_to_cache }}
       - run: yarn run prettify:diff
       - run: yarn run lint
-  general_test:
-    name: General jest test
-    runs-on: ['self-hosted', 'monorepo-node18']
-    needs: install-dependencies
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Sync workspace
-        uses: ./.github/actions/sync-workspace
-        with:
-          artifacts_to_cache: ${{ needs.install-dependencies.outputs.artifacts_to_cache }}
-      - name: Run Jest Tests
-        run: |
-          mkdir -p test-results/jest
-          # Skipping packages that are tested in a specific job below
-          yarn run lerna \
-            --ignore @celo/protocol \
-            --ignore @celo/celotool \
-            --ignore @celo/env-tests \
-            run test
-      - name: Upload Jest Test Results
-        uses: actions/upload-artifact@v4
-        with:
-          name: Jest Test Results
-          path: test-results/jest
-
 
   protocol-test-release:
     name: Protocol Test Release

diff --git a/.github/workflows/protocol-devchain.yml b/.github/workflows/protocol-devchain.yml
@@ -18,7 +18,7 @@ jobs:
         include:
           - tag: core-contracts.v9
             node-version: 12
-          - tag: core-contracts.v10
+          - tag: core-contracts.v11
             node-version: 18
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/protocol_tests.yml b/.github/workflows/protocol_tests.yml
@@ -48,10 +48,6 @@ jobs:
         # can't use gas limit because some setUp function use more than the limit
         run: forge test -vvv --match-path "test-sol/common/*" # --block-gas-limit 50000000 
 
-      - name: Run tests compatibility
-        if: success() || failure()
-        run: forge test -vvv --block-gas-limit 50000000 --match-path "test-sol/compatibility/*"
-
       - name: Run tests governance/network
         if: success() || failure()
         run: forge test -vvv --block-gas-limit 50000000 --match-path "test-sol/governance/network/*"

diff --git a/package.json b/package.json
@@ -69,4 +69,4 @@
     "@types/bn.js": "4.11.6",
     "bignumber.js": "9.0.0"
   }
-}
+}
diff --git a/packages/celotool/package.json b/packages/celotool/package.json
@@ -50,6 +50,7 @@
   },
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.3",
+    "@celo/dev-utils":"^0.0.3",
     "@celo/protocol": "1.0.2",
     "@types/bunyan": "1.8.8",
     "@types/chai": "^4.1.3",

diff --git a/packages/celotool/src/cmds/local_testnet.ts b/packages/celotool/src/cmds/local_testnet.ts
@@ -24,6 +24,7 @@ Examples:
 * local-testnet --validators 5 --proxies 3 --bootnode
 * local-testnet --tx-nodes 2 --light-clients 3
 * local-testnet --migrate-to 19 --migration-override '{ "lockedGold": { "unlockingPeriod": 30 } }'
+* local-testnet --migrate-to 19 --migration-override ../../node_modules/@celo/dev-utils/lib/migration-override.json
 * local-testnet --no-migrate --genesis-override '{ "blockTime": 3, "epoch": 50 }'
 
 Network makeup is configured the --validators, --tx-nodes, --light-clients, and --lightest-client

diff --git a/packages/protocol/contracts/governance/Governance.sol b/packages/protocol/contracts/governance/Governance.sol
@@ -225,7 +225,7 @@ contract Governance is
    * @return Patch version of the contract.
    */
   function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
-    return (1, 4, 1, 0);
+    return (1, 4, 1, 1);
   }
 
   /**

diff --git a/packages/protocol/contracts/governance/LockedGold.sol b/packages/protocol/contracts/governance/LockedGold.sol
@@ -122,7 +122,7 @@ contract LockedGold is
   * @return Patch version of the contract.
   */
   function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
-    return (1, 1, 4, 0);
+    return (1, 1, 5, 0);
   }
 
   /**

diff --git a/packages/protocol/package.json b/packages/protocol/package.json
@@ -112,6 +112,7 @@
   },
   "devDependencies": {
     "@tsconfig/recommended": "^1.0.3",
+    "@celo/dev-utils":"^0.0.3",
     "@celo/odis-identifiers": "^1.0.0",
     "@celo/typechain-target-web3-v1-celo": "^1.0.0",
     "@celo/typescript": "0.0.1",
@@ -142,4 +143,4 @@
     "typechain-target-ethers-v5": "^5.0.1",
     "yargs": "^14.0.0"
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,4 +69,4 @@ @@
         "@types/bn.js": "4.11.6",
         "bignumber.js": "9.0.0"
       }
-    }
+    }