Removed versions for UsingRegistry and patch tooling (#9866)

celo-org · Sep 20, 2022 · 4bf959b · 4bf959b
1 parent d90181f
commit 4bf959b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/packages/protocol/contracts/common/UsingRegistryV2.sol b/packages/protocol/contracts/common/UsingRegistryV2.sol
@@ -79,14 +79,6 @@ contract UsingRegistryV2 {
     _;
   }
 
-  /**
-   * @notice Returns the storage, major, minor, and patch version of the contract.
-   * @return The storage, major, minor, and patch version of the contract.
-   */
-  function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
-    return (1, 1, 1, 0);
-  }
-
   function getAccounts() internal view returns (IAccounts) {
     return IAccounts(registryContract.getAddressForOrDie(ACCOUNTS_REGISTRY_ID));
   }

diff --git a/packages/protocol/contracts/common/UsingRegistryV2BackwardsCompatible.sol b/packages/protocol/contracts/common/UsingRegistryV2BackwardsCompatible.sol
@@ -7,11 +7,4 @@ contract UsingRegistryV2BackwardsCompatible is UsingRegistryV2 {
   // without breaking release tooling.
   // Use `registryContract` (in UsingRegistryV2) for the actual registry address.
   IRegistry public registry;
-  /**
-   * @notice Returns the storage, major, minor, and patch version of the contract.
-   * @return The storage, major, minor, and patch version of the contract.
-   */
-  function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
-    return (1, 1, 0, 0);
-  }
 }
diff --git a/packages/protocol/scripts/bash/check-versions.sh b/packages/protocol/scripts/bash/check-versions.sh
@@ -28,9 +28,7 @@ done
 [ -z "$OLD_BRANCH" ] && echo "Need to set the old branch via the -a flag" && exit 1;
 [ -z "$NEW_BRANCH" ] && echo "Need to set the new branch via the -b flag" && exit 1;
 
-# Exclude test contracts, mock contracts, contract interfaces, Proxy contracts, inlined libraries,
-# MultiSig contracts, and the ReleaseGold contract.
-CONTRACT_EXCLUSION_REGEX=".*Test|Mock.*|I[A-Z].*|.*Proxy|MultiSig.*|ReleaseGold|SlasherUtil|UsingPrecompiles"
+source scripts/bash/contract-exclusion-regex.sh
 
 REPORT_FLAG=""
 if [ ! -z "$REPORT" ]; then

diff --git a/packages/protocol/scripts/bash/contract-exclusion-regex.sh b/packages/protocol/scripts/bash/contract-exclusion-regex.sh
@@ -0,0 +1,11 @@
+# Exclude test contracts, mock contracts, contract interfaces, Proxy contracts, inlined libraries,
+# MultiSig contracts, and the ReleaseGold contract.
+CONTRACT_EXCLUSION_REGEX=".*Test|Mock.*|I[A-Z].*|.*Proxy|MultiSig.*|ReleaseGold|SlasherUtil|UsingPrecompiles"
+
+# Before CR7, UsingRegistry and UsingRegistryV2 had been deployed, they need to keep getting deployed to keep the release reports without changes.
+VERSION_NUMBER=$(echo "$OLD_BRANCH" | tr -dc '0-9')
+
+if [ $VERSION_NUMBER -gt 6 ]
+  then
+  CONTRACT_EXCLUSION_REGEX="$CONTRACT_EXCLUSION_REGEX|^UsingRegistry"
+fi
diff --git a/packages/protocol/scripts/bash/release-on-devchain.sh b/packages/protocol/scripts/bash/release-on-devchain.sh
@@ -47,7 +47,8 @@ yarn run truffle exec ./scripts/truffle/verify-bytecode.js --network development
 
 echo "- Check versions of current branch"
 # From check-versions.sh
-CONTRACT_EXCLUSION_REGEX=".*Test|Mock.*|I[A-Z].*|.*Proxy|MultiSig.*|ReleaseGold|SlasherUtil|UsingPrecompiles"
+OLD_BRANCH=$BUILD_DIR
+source scripts/bash/contract-exclusion-regex.sh
 yarn ts-node scripts/check-backward.ts sem_check --old_contracts $BUILD_DIR/contracts --new_contracts build/contracts --exclude $CONTRACT_EXCLUSION_REGEX --output_file report.json
 
 # From make-release.sh