Merge branch 'master' into next-v5.0

Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: ernestognw <ernestognw@gmail.com>

.changeset/angry-ties-switch.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`TimelockController`: Changed the role architecture to use `DEFAULT_ADMIN_ROLE` as the admin for all roles, instead of the bespoke `TIMELOCK_ADMIN_ROLE` that was used previously. This aligns with the general recommendation for `AccessControl` and makes the addition of new roles easier. Accordingly, the `admin` parameter and timelock will now be granted `DEFAULT_ADMIN_ROLE` instead of `TIMELOCK_ADMIN_ROLE`. ([#3799](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3799))

.changeset/beige-buses-drop.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`Initializable`: optimize `_disableInitializers` by using `!=` instead of `<`. ([#3787](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3787))

.changeset/beige-ducks-flow.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove deprecated GovernorProposalThreshold module.

.changeset/bright-tomatoes-sing.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`ERC20`, `ERC1155`: Deleted `_beforeTokenTransfer` and `_afterTokenTransfer` hooks, added a new internal `_update` function for customizations, and refactored all extensions using those hooks to use `_update` instead. ([#3838](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3838), [#3876](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3876))

.changeset/chilled-spiders-attack.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`ERC1155Supply`: add a `totalSupply()` function that returns the total amount of token circulating, this change will restrict the total tokens minted across all ids to 2\*\*256-1 .

.changeset/clever-pumas-beg.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`Ownable`: Add an `initialOwner` parameter to the constructor, making the ownership initialization explicit.

.changeset/curvy-shrimps-enjoy.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`ReentrancyGuard`: Add a `_reentrancyGuardEntered` function to expose the guard status. ([#3714](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3714))

.changeset/curvy-suns-sort.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`Ownable2Step`: make `acceptOwnership` public virtual to enable usecases that require overriding it. ([#3960](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3960))

.changeset/dirty-mangos-sort.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Removed presets in favor of [OpenZeppelin Contracts Wizard](https://wizard.openzeppelin.com/).

.changeset/early-oranges-raise.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`ERC721Wrapper`: add a new extension of the `ERC721` token which wraps an underlying token. Deposit and withdraw guarantee that the ownership of each token is backed by a corresponding underlying token with the same identifier.

.changeset/famous-rules-burn.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`EnumerableMap`: add a `keys()` function that returns an array containing all the keys. ([#3920](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3920))

.changeset/five-ducks-develop.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`UUPSUpgradeable.sol`: Change visibility to the functions `upgradeTo ` and `upgradeToAndCall ` from `external` to `public`.

.changeset/five-poets-mix.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`TimelockController`: Add the `CallSalt` event to emit on operation schedule.

.changeset/flat-deers-end.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`Governor`: add a public `cancel(uint256)` function.

.changeset/fluffy-gifts-build.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove ERC1820Implementer.

.changeset/four-bats-sniff.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`Governor`: Enable timestamp operation for blockchains without a stable block time. This is achieved by connecting a Governor's internal clock to match a voting token's EIP-6372 interface.

.changeset/fresh-birds-kiss.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`Checkpoints`: library moved from `utils` to `utils/structs`

.changeset/friendly-suits-camp.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove Checkpoints.History.

.changeset/funny-rockets-compete.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-Reformatted codebase with latest version of Prettier Solidity. ([#3898](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3898))

.changeset/gold-chicken-clean.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`Strings`: add `equal` method. ([#3774](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3774))

.changeset/happy-socks-travel.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`IERC5313`: Add an interface for EIP-5313 that is now final.

.changeset/healthy-squids-stare.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`Math`: optimize `log256` rounding check. ([#3745](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3745))

.changeset/hungry-impalas-perform.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`ERC165Storage`: Removed this contract in favor of inheritance based approach. ([#3880](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3880))

.changeset/lemon-dogs-kiss.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`ERC20Votes`: optimize by using unchecked arithmetic. ([#3748](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3748))

.changeset/little-kiwis-ring.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`Multicall`: annotate `multicall` function as upgrade safe to not raise a flag for its delegatecall. ([#3961](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3961))

.changeset/lovely-dragons-appear.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`IERC4906`: Add an interface for ERC-4906 that is now Final.

.changeset/many-panthers-hide.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`TransparentUpgradeableProxy`: support value passthrough for all ifAdmin function.

.changeset/mean-walls-watch.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`Nonces`: Added a new contract to keep track of user nonces. Used for signatures in `ERC20Permit`, `ERC20Votes`, and `ERC721Votes`. ([#3816](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3816))

.changeset/modern-games-exist.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`StorageSlot`: Add support for `string` and `bytes`.

.changeset/new-ways-own.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`ERC20Pausable`, `ERC721Pausable`, `ERC1155Pausable`: Add note regarding missing public pausing functionality

.changeset/ninety-hornets-kick.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`Votes`, `ERC20Votes`, `ERC721Votes`: support timestamp checkpointing using EIP-6372.

.changeset/perfect-insects-listen.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`ERC4626`: Add mitigation to the inflation attack through virtual shares and assets.

.changeset/pretty-hornets-play.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`Strings`: add `toString` method for signed integers. ([#3773](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3773))

.changeset/proud-comics-deliver.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`ERC20Wrapper`: Make the `underlying` variable private and add a public accessor.

.changeset/rotten-insects-wash.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`ProxyAdmin`: Removed `getProxyAdmin` and `getProxyImplementation` getters. ([#3820](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3820))

.changeset/selfish-queens-rest.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove PullPayment and Escrow contracts (Escrow, ConditionalEscrow, RefundEscrow).

.changeset/short-eels-enjoy.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Bump minimum compiler version required to 0.8.19

.changeset/short-roses-judge.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`EIP712`: add EIP-5267 support for better domain discovery.

.changeset/silent-dancers-type.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`AccessControlDefaultAdminRules`: Add an extension of `AccessControl` with additional security rules for the `DEFAULT_ADMIN_ROLE`.

.changeset/silly-bees-beam.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`ERC20Votes`: Changed internal vote accounting to reusable `Votes` module previously used by `ERC721Votes`. Removed implicit `ERC20Permit` inheritance. [#3816](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3816)

.changeset/slimy-knives-hug.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`SignatureChecker`: Add `isValidERC1271SignatureNow` for checking a signature directly against a smart contract using ERC-1271.

.changeset/slimy-penguins-attack.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`TransparentUpgradeableProxy`: Removed `admin` and `implementation` getters, which were only callable by the proxy owner and thus not very useful. ([#3820](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3820))

.changeset/small-cars-appear.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`ECDSA`: Add a function `toDataWithIntendedValidatorHash` that encodes data with version 0x00 following EIP-191.

.changeset/small-terms-sleep.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`SafeERC20`: Add a `forceApprove` function to improve compatibility with tokens behaving like USDT.

.changeset/smooth-books-wink.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`ERC1155`: Remove check for address zero in `balanceOf`.

.changeset/spicy-ducks-cough.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove the Timers library.

.changeset/spotty-hotels-type.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': patch
+---
+
+`ERC721Consecutive`: Add a `_firstConsecutiveId` internal function that can be overridden to change the id of the first token minted through `_mintConsecutive`.

.changeset/strong-bulldogs-buy.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`ERC1967Upgrade`: removed contract-wide `oz-upgrades-unsafe-allow delegatecall` annotation, replaced by granular annotation in `UUPSUpgradeable`.

.changeset/swift-berries-sort.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove ERC777 implementation.

.changeset/tame-geckos-search.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove SafeMath and SignedSafeMath libraries.

.changeset/tame-ladybugs-sit.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': patch
----
-
-`MerkleProof`: optimize by using unchecked arithmetic. ([#3745](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3745))

.changeset/thin-dragons-report.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`ECDSA`: optimize bytes32 computation by using assembly instead of `abi.encodePacked`.

.changeset/thirty-swans-exercise.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`ERC721URIStorage`: Emit ERC-4906 `MetadataUpdate` in `_setTokenURI`.

.changeset/three-weeks-double.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Remove CrossChain contracts, including AccessControlCrossChain and all the vendored bridge interfaces.

.changeset/unlucky-snakes-drive.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': patch
+---
+
+`Address`: Removed `isContract` because of its ambiguous nature and potential for misuse.

.changeset/violet-frogs-hide.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`ShortStrings`: Added a library for handling short strings in a gas efficient way, with fallback to storage for longer strings.

.changeset/warm-masks-obey.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`SignatureChecker`: Allow return data length greater than 32 from EIP-1271 signers.

.changeset/wild-windows-trade.md

@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`SafeERC20`: Refactor `safeDecreaseAllowance` and `safeIncreaseAllowance` to support USDT-like tokens.

.changeset/yellow-swans-cover.md

@@ -1,5 +0,0 @@
----
-'openzeppelin-solidity': minor
----
-
-`UUPSUpgradeable`: added granular `oz-upgrades-unsafe-allow-reachable` annotation to improve upgrade safety checks on latest version of the Upgrades Plugins (starting with `@openzeppelin/upgrades-core@1.21.0`).

.github/workflows/checks.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - next-v*
       - release-v*
   pull_request: {}
   workflow_dispatch: {}
@@ -14,7 +15,6 @@ concurrency:
 
 jobs:
   lint:
-    if: github.repository != 'OpenZeppelin/openzeppelin-contracts-upgradeable'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -37,19 +37,36 @@ jobs:
       - name: Check linearisation of the inheritance graph
         run: npm run test:inheritance
       - name: Check proceduraly generated contracts are up-to-date
-        if: github.repository != 'OpenZeppelin/openzeppelin-contracts-upgradeable'
         run: npm run test:generation
       - name: Compare gas costs
         uses: ./.github/actions/gas-compare
         with:
           token: ${{ github.token }}
+
+  tests-upgradeable:
+    runs-on: ubuntu-latest
+    env:
+      FORCE_COLOR: 1
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0 # Include history so patch conflicts are resolved automatically
+      - name: Set up environment
+        uses: ./.github/actions/setup
+      - name: Transpile to upgradeable
+        run: bash scripts/upgradeable/transpile.sh
+      - name: Run tests
+        run: npm run test
+        env:
+          NODE_OPTIONS: --max_old_space_size=4096
+      - name: Check linearisation of the inheritance graph
+        run: npm run test:inheritance
       - name: Check storage layout
         uses: ./.github/actions/storage-layout
         with:
           token: ${{ github.token }}
 
-  foundry-tests:
-    if: github.repository != 'OpenZeppelin/openzeppelin-contracts-upgradeable'
+  tests-foundry:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -63,7 +80,6 @@ jobs:
         run: forge test -vv
 
   coverage:
-    if: github.repository != 'OpenZeppelin/openzeppelin-contracts-upgradeable'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -73,9 +89,10 @@ jobs:
         env:
           NODE_OPTIONS: --max_old_space_size=4096
       - uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   slither:
-    if: github.repository != 'OpenZeppelin/openzeppelin-contracts-upgradeable'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -83,14 +100,16 @@ jobs:
         uses: ./.github/actions/setup
       - run: rm foundry.toml
       - uses: crytic/slither-action@v0.3.0
+        with:
+          node-version: 18.15
 
   codespell:
-    if: github.repository != 'OpenZeppelin/openzeppelin-contracts-upgradeable'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Run CodeSpell
-        uses: codespell-project/actions-codespell@v1.0
+        uses: codespell-project/actions-codespell@v2.0
         with:
+          check_hidden: true
           check_filenames: true
           skip: package-lock.json,*.pdf

.github/workflows/formal-verifiation.yml

@@ -1,55 +0,0 @@
-name: Formal verification
-
-on:
-  push:
-    branches:
-      - master
-      - release-v*
-      - formal-verification
-  pull_request: {}
-  workflow_dispatch: {}
-
-jobs:
-  list-scripts:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v2
-      - id: set-matrix
-        run: echo ::set-output name=matrix::$(ls certora/scripts/{,**}/*.sh | grep -v '\WnoCI\W' | jq -Rsc 'split("\n")[:-1]')
-
-  verify:
-    runs-on: ubuntu-latest
-    needs: list-scripts
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.10'
-          cache: 'pip'
-      - name: Install java
-        uses: actions/setup-java@v1
-        with:
-          java-version: '11'
-          java-package: 'jre'
-      - name: Install certora
-        run: pip install certora-cli
-      - name: Install solc
-        run: |
-          wget https://github.com/ethereum/solidity/releases/download/v0.8.19/solc-static-linux
-          sudo mv solc-static-linux /usr/local/bin/solc
-          chmod +x /usr/local/bin/solc
-      - name: Verify rule ${{ matrix.params }}
-        run: |
-          touch certora/applyHarness.patch
-          make -C certora munged
-          bash ${{ matrix.params }}
-        env:
-          CERTORAKEY: ${{ secrets.CERTORAKEY }}
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        params: ${{ fromJson(needs.list-scripts.outputs.matrix) }}

.github/workflows/formal-verification.yml

@@ -0,0 +1,68 @@
+name: formal verification
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - labeled
+  workflow_dispatch: {}
+
+env:
+  PIP_VERSION: '3.10'
+  JAVA_VERSION: '11'
+  SOLC_VERSION: '0.8.19'
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  apply-diff:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Apply patches
+        run: make -C certora apply
+
+  verify:
+    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'formal-verification')
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set up environment
+        uses: ./.github/actions/setup
+      - name: identify specs that need to be run
+        id: arguments
+        run: |
+          if [[ ${{ github.event_name }} = 'pull_request' ]];
+          then
+            RESULT=$(git diff ${{ github.event.pull_request.head.sha }}..${{ github.event.pull_request.base.sha }} --name-only certora/specs/*.spec | while IFS= read -r file; do [[ -f $file ]] && basename "${file%.spec}"; done | tr "\n" " ")
+          else
+            RESULT='--all'
+          fi
+          echo "result=$RESULT" >> "$GITHUB_OUTPUT"
+      - name: Install python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.PIP_VERSION }}
+          cache: 'pip'
+      - name: Install python packages
+        run: pip install -r requirements.txt
+      - name: Install java
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: ${{ env.JAVA_VERSION }}
+      - name: Install solc
+        run: |
+          wget https://github.com/ethereum/solidity/releases/download/v${{ env.SOLC_VERSION }}/solc-static-linux
+          sudo mv solc-static-linux /usr/local/bin/solc
+          chmod +x /usr/local/bin/solc
+      - name: Verify specification
+        run: |
+          make -C certora apply
+          node certora/run.js ${{ steps.arguments.outputs.result }} >> "$GITHUB_STEP_SUMMARY"
+        env:
+          CERTORAKEY: ${{ secrets.CERTORAKEY }}

.github/workflows/upgradeable.yml

@@ -1,4 +1,4 @@
-name: Upgradeable Trigger
+name: transpile upgradeable
 
 on:
   push:
@@ -7,17 +7,24 @@ on:
       - release-v*
 
 jobs:
-  trigger:
+  transpile:
+    environment: push-upgradeable
     runs-on: ubuntu-latest
     steps:
-      - id: app
-        uses: getsentry/action-github-app-token@v2
+      - uses: actions/checkout@v3
         with:
-          app_id: ${{ secrets.UPGRADEABLE_APP_ID }}
-          private_key: ${{ secrets.UPGRADEABLE_APP_PK }}
-      - run: |
-          curl -X POST \
-            https://api.github.com/repos/OpenZeppelin/openzeppelin-contracts-upgradeable/dispatches \
-            -H 'Accept: application/vnd.github.v3+json' \
-            -H 'Authorization: token ${{ steps.app.outputs.token }}' \
-            -d '{ "event_type": "Update", "client_payload": { "ref": "${{ github.ref }}" } }'
+          repository: OpenZeppelin/openzeppelin-contracts-upgradeable
+          fetch-depth: 0
+          token: ${{ secrets.GH_TOKEN_UPGRADEABLE }}
+      - name: Fetch current non-upgradeable branch
+        run: |
+          git fetch "https://github.com/${{ github.repository }}.git" "$REF"
+          git checkout FETCH_HEAD
+        env:
+          REF: ${{ github.ref }}
+      - name: Set up environment
+        uses: ./.github/actions/setup
+      - run: bash scripts/git-user-config.sh
+      - name: Transpile to upgradeable
+        run: bash scripts/upgradeable/transpile-onto.sh ${{ github.ref_name }} origin/${{ github.ref_name }}
+      - run: git push origin ${{ github.ref_name }}

.gitignore

@@ -68,4 +68,4 @@ contracts-exposed
 .certora*
 .last_confs
 certora_*
-resource_errors.json
+.zip-output-url.txt

.gitmodules

@@ -1,4 +1,5 @@
 [submodule "lib/forge-std"]
+	branch = v1
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
 [submodule "lib/erc4626-tests"]

CHANGELOG.md

@@ -1,5 +1,86 @@
 # Changelog
 
+### Removals
+
+The following contracts were removed:
+
+- `ERC20Snapshot`
+- `ERC20VotesComp`
+- `GovernorVotesComp`
+- `PaymentSplitter`
+- `TokenTimelock` (removed in favor of `VestingWallet`)
+
+### How to upgrade from 4.x
+
+#### ERC20, ERC721, and ERC1155
+
+These breaking changes will require modifications to ERC20, ERC721, and ERC1155 contracts, since the `_afterTokenTransfer` and `_beforeTokenTransfer` functions were removed. Any customization made through those hooks should now be done overriding the new `_update` function instead.
+
+Minting and burning are implemented by `_update` and customizations should be done by overriding this function as well. `_mint` and `_burn` are no longer virtual (meaning they are not overridable) to guard against possible inconsistencies.
+
+For example, a contract using `ERC20`'s `_beforeTokenTransfer` hook would have to be changed in the following way.
+
+```diff
+- function _beforeTokenTransfer(
++ function _update(
+      address from,
+      address to,
+      uint256 amount
+  ) internal virtual override {
+-     super._beforeTokenTransfer(from, to, amount);
+      require(!condition(), "ERC20: wrong condition");
++     super._update(from, to, amount);
+  }
+```
+
+#### ERC165Storage
+
+Users that were registering EIP-165 interfaces with `_registerInterface` from `ERC165Storage` should instead do so so by overriding the `supportsInterface` function as seen below:
+
+```solidity
+function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
+    return interfaceId == type(MyInterface).interfaceId || super.supportsInterface(interfaceId);
+}
+```
+
+## 4.9.0 (2023-05-23)
+
+- `ReentrancyGuard`: Add a `_reentrancyGuardEntered` function to expose the guard status. ([#3714](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3714))
+- `ERC721Wrapper`: add a new extension of the `ERC721` token which wraps an underlying token. Deposit and withdraw guarantee that the ownership of each token is backed by a corresponding underlying token with the same identifier. ([#3863](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3863))
+- `EnumerableMap`: add a `keys()` function that returns an array containing all the keys. ([#3920](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3920))
+- `Governor`: add a public `cancel(uint256)` function. ([#3983](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3983))
+- `Governor`: Enable timestamp operation for blockchains without a stable block time. This is achieved by connecting a Governor's internal clock to match a voting token's EIP-6372 interface. ([#3934](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3934))
+- `Strings`: add `equal` method. ([#3774](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3774))
+- `IERC5313`: Add an interface for EIP-5313 that is now final. ([#4013](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4013))
+- `IERC4906`: Add an interface for ERC-4906 that is now Final. ([#4012](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4012))
+- `StorageSlot`: Add support for `string` and `bytes`. ([#4008](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4008))
+- `Votes`, `ERC20Votes`, `ERC721Votes`: support timestamp checkpointing using EIP-6372. ([#3934](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3934))
+- `ERC4626`: Add mitigation to the inflation attack through virtual shares and assets. ([#3979](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3979))
+- `Strings`: add `toString` method for signed integers. ([#3773](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3773))
+- `ERC20Wrapper`: Make the `underlying` variable private and add a public accessor. ([#4029](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4029))
+- `EIP712`: add EIP-5267 support for better domain discovery. ([#3969](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3969))
+- `AccessControlDefaultAdminRules`: Add an extension of `AccessControl` with additional security rules for the `DEFAULT_ADMIN_ROLE`. ([#4009](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4009))
+- `SignatureChecker`: Add `isValidERC1271SignatureNow` for checking a signature directly against a smart contract using ERC-1271. ([#3932](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3932))
+- `SafeERC20`: Add a `forceApprove` function to improve compatibility with tokens behaving like USDT. ([#4067](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4067))
+- `ERC1967Upgrade`: removed contract-wide `oz-upgrades-unsafe-allow delegatecall` annotation, replaced by granular annotation in `UUPSUpgradeable`. ([#3971](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3971))
+- `ERC20Wrapper`: self wrapping and deposit by the wrapper itself are now explicitly forbidden. ([#4100](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4100))
+- `ECDSA`: optimize bytes32 computation by using assembly instead of `abi.encodePacked`. ([#3853](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3853))
+- `ERC721URIStorage`: Emit ERC-4906 `MetadataUpdate` in `_setTokenURI`. ([#4012](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4012))
+- `ShortStrings`: Added a library for handling short strings in a gas efficient way, with fallback to storage for longer strings. ([#4023](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4023))
+- `SignatureChecker`: Allow return data length greater than 32 from EIP-1271 signers. ([#4038](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4038))
+- `UUPSUpgradeable`: added granular `oz-upgrades-unsafe-allow-reachable` annotation to improve upgrade safety checks on latest version of the Upgrades Plugins (starting with `@openzeppelin/upgrades-core@1.21.0`). ([#3971](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3971))
+- `Initializable`: optimize `_disableInitializers` by using `!=` instead of `<`. ([#3787](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3787))
+- `Ownable2Step`: make `acceptOwnership` public virtual to enable usecases that require overriding it. ([#3960](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3960))
+- `UUPSUpgradeable.sol`: Change visibility to the functions `upgradeTo ` and `upgradeToAndCall ` from `external` to `public`. ([#3959](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3959))
+- `TimelockController`: Add the `CallSalt` event to emit on operation schedule. ([#4001](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4001))
+- Reformatted codebase with latest version of Prettier Solidity. ([#3898](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3898))
+- `Math`: optimize `log256` rounding check. ([#3745](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3745))
+- `ERC20Votes`: optimize by using unchecked arithmetic. ([#3748](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3748))
+- `Multicall`: annotate `multicall` function as upgrade safe to not raise a flag for its delegatecall. ([#3961](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3961))
+- `ERC20Pausable`, `ERC721Pausable`, `ERC1155Pausable`: Add note regarding missing public pausing functionality ([#4007](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4007))
+- `ECDSA`: Add a function `toDataWithIntendedValidatorHash` that encodes data with version 0x00 following EIP-191. ([#4063](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4063))
+- `MerkleProof`: optimize by using unchecked arithmetic. ([#3745](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3745))
+
 ### Breaking changes
 
 - `EIP712`: Addition of ERC5267 support requires support for user defined value types, which was released in Solidity version 0.8.8. This requires a pragma change from `^0.8.0` to `^0.8.8`.
@@ -12,6 +93,19 @@
 - `ERC777`: The `ERC777` token standard is no longer supported by OpenZeppelin. Our implementation is now deprecated and will be removed in the next major release. The corresponding standard interfaces remain available. ([#4066](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4066))
 - `ERC1820Implementer`: The `ERC1820` pseudo-introspection mechanism is no longer supported by OpenZeppelin. Our implementation is now deprecated and will be removed in the next major release. The corresponding standard interfaces remain available. ([#4066](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4066))
 
+## 4.8.3 (2023-04-13)
+
+- `GovernorCompatibilityBravo`: Fix encoding of proposal data when signatures are missing.
+- `TransparentUpgradeableProxy`: Fix transparency in case of selector clash with non-decodable calldata or payable mutability. ([#4154](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/4154))
+
+## 4.8.2 (2023-03-02)
+
+- `ERC721Consecutive`: Fixed a bug when `_mintConsecutive` is used for batches of size 1 that could lead to balance overflow. Refer to the breaking changes section in the changelog for a note on the behavior of `ERC721._beforeTokenTransfer`.
+
+### Breaking changes
+
+- `ERC721`: The internal function `_beforeTokenTransfer` no longer updates balances, which it previously did when `batchSize` was greater than 1. This change has no consequence unless a custom ERC721 extension is explicitly invoking `_beforeTokenTransfer`. Balance updates in extensions must now be done explicitly using `__unsafe_increaseBalance`, with a name that indicates that there is an invariant that has to be manually verified.
+
 ## 4.8.1 (2023-01-12)
 
 - `ERC4626`: Use staticcall instead of call when fetching underlying ERC-20 decimals. ([#3943](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3943))

README.md

@@ -1,3 +1,6 @@
+> **Warning**
+> Version 5.0 is under active development. The code in this branch is not recommended for use.
+
 # <img src="logo.svg" alt="OpenZeppelin" height="40px">
 
 [![NPM Package](https://img.shields.io/npm/v/@openzeppelin/contracts.svg)](https://www.npmjs.org/package/@openzeppelin/contracts)
@@ -33,7 +36,7 @@ An alternative to npm is to use the GitHub repository (`openzeppelin/openzeppeli
 Once installed, you can use the contracts in the library by importing them:
 
 ```solidity
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.19;
 
 import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 
@@ -73,7 +76,7 @@ The engineering guidelines we follow to promote project quality can be found in
 
 Past audits can be found in [`audits/`](./audits).
 
-Smart contracts are a nascent techology and carry a high level of technical risk and uncertainty. Although OpenZeppelin is well known for its security audits, using OpenZeppelin Contracts is not a substitute for a security audit.
+Smart contracts are a nascent technology and carry a high level of technical risk and uncertainty. Although OpenZeppelin is well known for its security audits, using OpenZeppelin Contracts is not a substitute for a security audit.
 
 OpenZeppelin Contracts is made available under the MIT License, which disclaims all warranties in relation to the project and which limits the liability of those that contribute and maintain the project, including OpenZeppelin. As set out further in the Terms, you acknowledge that you are solely responsible for any use of OpenZeppelin Contracts and you assume all risks associated with any such use.
 

audits/README.md

@@ -2,6 +2,7 @@
 
 | Date         | Version | Commit    | Auditor      | Scope                | Links                                                       |
 | ------------ | ------- | --------- | ------------ | -------------------- | ----------------------------------------------------------- |
+| May 2023     | v4.9.0  | `91df66c` | OpenZeppelin | v4.9 Changes         | [🔗](./2023-05-v4.9.pdf)                                    |
 | October 2022 | v4.8.0  | `14f98db` | OpenZeppelin | ERC4626, Checkpoints | [🔗](./2022-10-ERC4626.pdf) [🔗](./2022-10-Checkpoints.pdf) |
 | October 2018 | v2.0.0  | `dac5bcc` | LevelK       | Everything           | [🔗](./2018-10.pdf)                                         |
 | March 2017   | v1.0.4  | `9c5975a` | New Alchemy  | Everything           | [🔗](./2017-03.md)                                          |

certora/.gitignore

@@ -1 +1 @@
-munged
+patched

certora/Makefile

@@ -1,25 +1,54 @@
 default: help
 
-PATCH         = applyHarness.patch
-CONTRACTS_DIR = ../contracts
-MUNGED_DIR    = munged
+SRC   := ../contracts
+DST   := patched
+DIFF  := diff
+SRCS  := $(shell find $(SRC) -type f)
+DSTS  := $(shell find $(DST) -type f)
+DIFFS := $(shell find $(DIFF) -type f)
 
+###############################################################################
+# Apply all patches in the $DIFF folder to the $DST folder
+apply: $(DST) $(patsubst $(DIFF)/%.patch,$(DST)/%,$(subst _,/,$(DIFFS)))
+
+# Reset the $DST folder
+$(DST): FORCE
+	@rm -rf $@
+	@cp -r $(SRC) $@
+
+# Update a solidity file in the $DST directory using the corresponding patch
+$(DST)/%.sol: FORCE
+	@echo Applying patch to $@
+	@patch -p0 -d $(DST) < $(patsubst $(DST)_%,$(DIFF)/%.patch,$(subst /,_,$@))
+
+###############################################################################
+# Record all difference between $SRC and $DST in patches
+record: $(DIFF) $(patsubst %,$(DIFF)/%.patch,$(subst /,_,$(subst $(SRC)/,,$(SRCS)) $(subst $(DST)/,,$(DSTS))))
+
+# Create the $DIFF folder
+$(DIFF): FORCE
+	@rm -rf $@
+	@mkdir $@
+
+# Create the patch file by comparing the source and the destination
+$(DIFF)/%.patch: FORCE
+	@echo Generating patch $@
+	@diff -ruN \
+		$(patsubst $(DIFF)/%.patch,$(SRC)/%,$(subst _,/,$@)) \
+		$(patsubst $(DIFF)/%.patch,$(DST)/%,$(subst _,/,$@)) \
+		| sed 's+$(SRC)/++g' \
+		| sed 's+$(DST)/++g' \
+		> $@
+	@[ -s $@ ] || rm $@
+
+###############################################################################
 help:
 	@echo "usage:"
+	@echo "  make apply:  create $(DST) directory by applying the patches to $(SRC)"
+	@echo "  make record: record the patches capturing the differences between $(SRC) and $(DST)"
 	@echo "  make clean:  remove all generated files (those ignored by git)"
-	@echo "  make $(MUNGED_DIR): create $(MUNGED_DIR) directory by applying the patch file to $(CONTRACTS_DIR)"
-	@echo "  make record: record a new patch file capturing the differences between $(CONTRACTS_DIR) and $(MUNGED_DIR)"
-
-munged:  $(wildcard $(CONTRACTS_DIR)/*.sol) $(PATCH)
-	rm -rf $@
-	cp -r $(CONTRACTS_DIR) $@
-	patch -p0 -d $@ < $(PATCH)
-
-record:
-	diff -druN $(CONTRACTS_DIR) $(MUNGED_DIR) | sed 's+../contracts/++g' | sed 's+munged/++g' > $(PATCH)
-
-refresh: munged record
 
 clean:
 	git clean -fdX
-	touch $(PATCH)
+
+FORCE: ;

certora/README.md

@@ -1,56 +1,60 @@
 # Running the certora verification tool
 
-These instructions detail the process for running CVT on the OpenZeppelin (Wizard/Governor) contracts.
+These instructions detail the process for running Certora Verification Tool on OpenZeppelin Contracts.
 
-Documentation for CVT and the specification language are available
-[here](https://certora.atlassian.net/wiki/spaces/CPD/overview)
+Documentation for CVT and the specification language are available [here](https://certora.atlassian.net/wiki/spaces/CPD/overview).
+
+## Prerequisites
+
+Follow the [Certora installation guide](https://docs.certora.com/en/latest/docs/user-guide/getting-started/install.html) in order to get the Certora Prover Package and the `solc` executable folder in your path.
+
+> **Note**
+> An API Key is required for local testing. Although the prover will run on a Github Actions' CI environment on selected Pull Requests.
 
 ## Running the verification
 
-The scripts in the `certora/scripts` directory are used to submit verification
-jobs to the Certora verification service. After the job is complete, the results will be available on
-[the Certora portal](https://vaas-stg.certora.com/).
+The Certora Verification Tool proves specs for contracts, which are defined by the `./specs.json` file along with their pre-configured options.
 
-These scripts should be run from the root directory; for example by running
+The verification script `./run.js` is used to submit verification jobs to the Certora Verification service.
 
-```
-sh certora/scripts/verifyAll.sh <meaningful comment>
+You can run it from the root of the repository with the following command:
+
+```bash
+node certora/run.js [[CONTRACT_NAME:]SPEC_NAME] [OPTIONS...]
 ```
 
-The most important of these is `verifyAll.sh`, which checks
-all of the harnessed contracts (`certora/harness/Wizard*.sol`) against all of
-the specifications (`certora/spec/*.spec`).
+Where:
 
-The other scripts run a subset of the specifications or the contracts.  You can
-verify different contracts or specifications by changing the `--verify` option,
-and you can run a single rule or method with the `--rule` or `--method` option.
+- `CONTRACT_NAME` matches the `contract` key in the `./spec.json` file and may be empty. It will run all matching contracts if not provided.
+- `SPEC_NAME` refers to a `spec` key from the `./specs.json` file. It will run every spec if not provided.
+- `OPTIONS` extend the [Certora Prover CLI options](https://docs.certora.com/en/latest/docs/prover/cli/options.html#certora-prover-cli-options) and will respect the preconfigured options in the `specs.json` file.
 
-For example, to verify the `WizardFirstPriority` contract against the
-`GovernorCountingSimple` specification, you could change the `--verify` line of
-the `WizardControlFirstPriortity.sh` script to:
+> **Note**
+> A single spec may be configured to run for multiple contracts, whereas a single contract may run multiple specs.
 
-```
---verify WizardFirstPriority:certora/specs/GovernorCountingSimple.spec \
+Example usage:
+
+```bash
+node certora/run.js AccessControl # Run the AccessControl spec against every contract implementing it
 ```
 
 ## Adapting to changes in the contracts
 
-Some of our rules require the code to be simplified in various ways. Our
-primary tool for performing these simplifications is to run verification on a
-contract that extends the original contracts and overrides some of the methods.
-These "harness" contracts can be found in the `certora/harness` directory.
+Some of our rules require the code to be simplified in various ways. Our primary tool for performing these simplifications is to run verification on a contract that extends the original contracts and overrides some of the methods. These "harness" contracts can be found in the `certora/harness` directory.
 
-This pattern does require some modifications to the original code: some methods
-need to be made virtual or public, for example. These changes are handled by
-applying a patch to the code before verification.
+This pattern does require some modifications to the original code: some methods need to be made virtual or public, for example. These changes are handled by applying a patch
+to the code before verification by running:
 
-When one of the `verify` scripts is executed, it first applies the patch file
-`certora/applyHarness.patch` to the `contracts` directory, placing the output
-in the `certora/munged` directory. We then verify the contracts in the
-`certora/munged` directory.
+```bash
+make -C certora apply
+```
 
-If the original contracts change, it is possible to create a conflict with the
-patch. In this case, the verify scripts will report an error message and output
-rejected changes in the `munged` directory. After merging the changes, run
-`make record` in the `certora` directory; this will regenerate the patch file,
-which can then be checked into git.
+Before running the `certora/run.js` script, it's required to apply the corresponding patches to the `contracts` directory, placing the output in the `certora/patched` directory. Then, the contracts are verified by running the verification for the `certora/patched` directory.
+
+If the original contracts change, it is possible to create a conflict with the patch. In this case, the verify scripts will report an error message and output rejected changes in the `patched` directory. After merging the changes, run `make record` in the `certora` directory; this will regenerate the patch file, which can then be checked into git.
+
+For more information about the `make` scripts available, run:
+
+```bash
+make -C certora help
+```

certora/applyHarness.patch

@@ -1,408 +0,0 @@
-diff -druN governance/extensions/GovernorCountingSimple.sol governance/extensions/GovernorCountingSimple.sol
---- governance/extensions/GovernorCountingSimple.sol	2023-02-27 10:59:32.652558153 +0100
-+++ governance/extensions/GovernorCountingSimple.sol	2023-02-28 16:49:10.417726143 +0100
-@@ -27,7 +27,7 @@
-         mapping(address => bool) hasVoted;
-     }
- 
--    mapping(uint256 => ProposalVote) private _proposalVotes;
-+    mapping(uint256 => ProposalVote) internal _proposalVotes; // HARNESS: private -> internal
- 
-     /**
-      * @dev See {IGovernor-COUNTING_MODE}.
-diff -druN governance/extensions/GovernorPreventLateQuorum.sol governance/extensions/GovernorPreventLateQuorum.sol
---- governance/extensions/GovernorPreventLateQuorum.sol	2023-02-27 10:59:32.652558153 +0100
-+++ governance/extensions/GovernorPreventLateQuorum.sol	2023-02-28 16:49:10.417726143 +0100
-@@ -20,10 +20,10 @@
- abstract contract GovernorPreventLateQuorum is Governor {
-     using SafeCast for uint256;
- 
--    uint64 private _voteExtension;
-+    uint64 internal _voteExtension; // HARNESS: private -> internal
- 
-     /// @custom:oz-retyped-from mapping(uint256 => Timers.BlockNumber)
--    mapping(uint256 => uint64) private _extendedDeadlines;
-+    mapping(uint256 => uint64) internal _extendedDeadlines; // HARNESS: private -> internal
- 
-     /// @dev Emitted when a proposal deadline is pushed back due to reaching quorum late in its voting period.
-     event ProposalExtended(uint256 indexed proposalId, uint64 extendedDeadline);
-diff -druN governance/extensions/GovernorVotesQuorumFraction.sol governance/extensions/GovernorVotesQuorumFraction.sol
---- governance/extensions/GovernorVotesQuorumFraction.sol	2023-02-27 10:59:32.655891529 +0100
-+++ governance/extensions/GovernorVotesQuorumFraction.sol	2023-02-28 16:49:10.417726143 +0100
-@@ -17,10 +17,10 @@
-     using SafeCast for *;
-     using Checkpoints for Checkpoints.Trace224;
- 
--    uint256 private _quorumNumerator; // DEPRECATED in favor of _quorumNumeratorHistory
-+    uint256 internal _quorumNumerator; // DEPRECATED // MUNGED private => internal
- 
-     /// @custom:oz-retyped-from Checkpoints.History
--    Checkpoints.Trace224 private _quorumNumeratorHistory;
-+    Checkpoints.Trace224 internal _quorumNumeratorHistory; // MUNGED private => internal
- 
-     event QuorumNumeratorUpdated(uint256 oldQuorumNumerator, uint256 newQuorumNumerator);
- 
-diff -druN governance/Governor.sol governance/Governor.sol
---- governance/Governor.sol	2023-02-27 10:59:32.652558153 +0100
-+++ governance/Governor.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -51,7 +51,7 @@
-     string private _name;
- 
-     /// @custom:oz-retyped-from mapping(uint256 => Governor.ProposalCore)
--    mapping(uint256 => ProposalCore) private _proposals;
-+    mapping(uint256 => ProposalCore) internal _proposals; // HARNESS: private -> internal
- 
-     // This queue keeps track of the governor operating on itself. Calls to functions protected by the
-     // {onlyGovernance} modifier needs to be whitelisted in this queue. Whitelisting is set in {_beforeExecute},
-diff -druN governance/TimelockController.sol governance/TimelockController.sol
---- governance/TimelockController.sol	2023-02-27 10:59:32.652558153 +0100
-+++ governance/TimelockController.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -28,10 +28,10 @@
-     bytes32 public constant PROPOSER_ROLE = keccak256("PROPOSER_ROLE");
-     bytes32 public constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE");
-     bytes32 public constant CANCELLER_ROLE = keccak256("CANCELLER_ROLE");
--    uint256 internal constant _DONE_TIMESTAMP = uint256(1);
-+    uint256 public constant _DONE_TIMESTAMP = uint256(1); // HARNESS: internal -> public
- 
-     mapping(bytes32 => uint256) private _timestamps;
--    uint256 private _minDelay;
-+    uint256 public _minDelay; // HARNESS: private -> public
- 
-     /**
-      * @dev Emitted when a call is scheduled as part of operation `id`.
-diff -druN governance/utils/Votes.sol governance/utils/Votes.sol
---- governance/utils/Votes.sol	2023-02-27 10:59:32.655891529 +0100
-+++ governance/utils/Votes.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -35,7 +35,25 @@
-     bytes32 private constant _DELEGATION_TYPEHASH =
-         keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");
- 
--    mapping(address => address) private _delegation;
-+    // HARNESS : Hooks cannot access any information from Checkpoints yet, so I am also updating votes and fromBlock in this struct
-+    struct Ckpt {
-+        uint32 fromBlock;
-+        uint224 votes;
-+    }
-+    mapping(address => Ckpt) public _checkpoints;
-+
-+    // HARNESSED getters
-+    function numCheckpoints(address account) public view returns (uint32) {
-+        return SafeCast.toUint32(_delegateCheckpoints[account]._checkpoints.length);
-+    }
-+    function ckptFromBlock(address account, uint32 pos) public view returns (uint32) {
-+        return _delegateCheckpoints[account]._checkpoints[pos]._key;
-+    }
-+    function ckptVotes(address account, uint32 pos) public view returns (uint224) {
-+        return _delegateCheckpoints[account]._checkpoints[pos]._value;
-+    }
-+
-+    mapping(address => address) public _delegation; // HARNESS: private -> public
- 
-     /// @custom:oz-retyped-from mapping(address => Checkpoints.History)
-     mapping(address => Checkpoints.Trace224) private _delegateCheckpoints;
-@@ -240,5 +258,5 @@
-     /**
-      * @dev Must return the voting units held by an account.
-      */
--    function _getVotingUnits(address) internal view virtual returns (uint256);
-+    function _getVotingUnits(address) public view virtual returns (uint256); // HARNESS: internal -> public
- }
-diff -druN proxy/utils/Initializable.sol proxy/utils/Initializable.sol
---- proxy/utils/Initializable.sol	2023-02-27 10:59:32.655891529 +0100
-+++ proxy/utils/Initializable.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -60,12 +60,12 @@
-      * @dev Indicates that the contract has been initialized.
-      * @custom:oz-retyped-from bool
-      */
--    uint8 private _initialized;
-+    uint8 internal _initialized; // HARNESS: private -> internal
- 
-     /**
-      * @dev Indicates that the contract is in the process of being initialized.
-      */
--    bool private _initializing;
-+    bool internal _initializing; // HARNESS: private -> internal
- 
-     /**
-      * @dev Triggered when the contract has been initialized or reinitialized.
-diff -druN token/ERC1155/ERC1155.sol token/ERC1155/ERC1155.sol
---- token/ERC1155/ERC1155.sol	2023-02-27 10:59:32.655891529 +0100
-+++ token/ERC1155/ERC1155.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -21,7 +21,7 @@
-     using Address for address;
- 
-     // Mapping from token ID to account balances
--    mapping(uint256 => mapping(address => uint256)) private _balances;
-+    mapping(uint256 => mapping(address => uint256)) internal _balances; // HARNESS: private -> internal
- 
-     // Mapping from account to operator approvals
-     mapping(address => mapping(address => bool)) private _operatorApprovals;
-@@ -451,7 +451,7 @@
-         uint256 id,
-         uint256 amount,
-         bytes memory data
--    ) private {
-+    ) public { // HARNESS: private -> public
-         if (to.isContract()) {
-             try IERC1155Receiver(to).onERC1155Received(operator, from, id, amount, data) returns (bytes4 response) {
-                 if (response != IERC1155Receiver.onERC1155Received.selector) {
-@@ -472,7 +472,7 @@
-         uint256[] memory ids,
-         uint256[] memory amounts,
-         bytes memory data
--    ) private {
-+    ) public { // HARNESS: private -> public
-         if (to.isContract()) {
-             try IERC1155Receiver(to).onERC1155BatchReceived(operator, from, ids, amounts, data) returns (
-                 bytes4 response
-diff -druN token/ERC20/ERC20.sol token/ERC20/ERC20.sol
---- token/ERC20/ERC20.sol	2023-02-27 10:59:32.655891529 +0100
-+++ token/ERC20/ERC20.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -248,7 +248,7 @@
-      *
-      * - `account` cannot be the zero address.
-      */
--    function _mint(address account, uint256 amount) internal virtual {
-+    function _mint(address account, uint256 amount) public virtual { // HARNESS: internal -> public
-         require(account != address(0), "ERC20: mint to the zero address");
- 
-         _beforeTokenTransfer(address(0), account, amount);
-@@ -274,7 +274,7 @@
-      * - `account` cannot be the zero address.
-      * - `account` must have at least `amount` tokens.
-      */
--    function _burn(address account, uint256 amount) internal virtual {
-+    function _burn(address account, uint256 amount) public virtual { // HARNESS: internal -> public
-         require(account != address(0), "ERC20: burn from the zero address");
- 
-         _beforeTokenTransfer(account, address(0), amount);
-diff -druN token/ERC20/extensions/ERC20Capped.sol token/ERC20/extensions/ERC20Capped.sol
---- token/ERC20/extensions/ERC20Capped.sol	2023-02-22 15:43:36.624717708 +0100
-+++ token/ERC20/extensions/ERC20Capped.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -30,7 +30,7 @@
-     /**
-      * @dev See {ERC20-_mint}.
-      */
--    function _mint(address account, uint256 amount) internal virtual override {
-+    function _mint(address account, uint256 amount) public virtual override { // HARNESS: internal -> public
-         require(ERC20.totalSupply() + amount <= cap(), "ERC20Capped: cap exceeded");
-         super._mint(account, amount);
-     }
-diff -druN token/ERC20/extensions/ERC20FlashMint.sol token/ERC20/extensions/ERC20FlashMint.sol
---- token/ERC20/extensions/ERC20FlashMint.sol	2023-02-27 10:59:32.655891529 +0100
-+++ token/ERC20/extensions/ERC20FlashMint.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -53,9 +53,11 @@
-         // silence warning about unused variable without the addition of bytecode.
-         token;
-         amount;
--        return 0;
-+        return fee; // HARNESS: made "return" nonzero
-     }
- 
-+    uint256 public fee; // HARNESS: added it to simulate random fee amount
-+
-     /**
-      * @dev Returns the receiver address of the flash fee. By default this
-      * implementation returns the address(0) which means the fee amount will be burnt.
-diff -druN token/ERC20/extensions/ERC20Votes.sol token/ERC20/extensions/ERC20Votes.sol
---- token/ERC20/extensions/ERC20Votes.sol	2023-02-27 10:59:32.655891529 +0100
-+++ token/ERC20/extensions/ERC20Votes.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -33,8 +33,8 @@
-     bytes32 private constant _DELEGATION_TYPEHASH =
-         keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)");
- 
--    mapping(address => address) private _delegates;
--    mapping(address => Checkpoint[]) private _checkpoints;
-+    mapping(address => address) public _delegates; // HARNESS: private -> public
-+    mapping(address => Checkpoint[]) public _checkpoints;  // HARNESS: private -> public
-     Checkpoint[] private _totalSupplyCheckpoints;
- 
-     /**
-@@ -186,27 +186,27 @@
-     /**
-      * @dev Maximum token supply. Defaults to `type(uint224).max` (2^224^ - 1).
-      */
--    function _maxSupply() internal view virtual returns (uint224) {
-+    function _maxSupply() public view virtual returns (uint224) {  // HARNESS: internal -> public
-         return type(uint224).max;
-     }
- 
-     /**
-      * @dev Snapshots the totalSupply after it has been increased.
-      */
--    function _mint(address account, uint256 amount) internal virtual override {
-+    function _mint(address account, uint256 amount) public virtual override { // HARNESS: internal -> public
-         super._mint(account, amount);
-         require(totalSupply() <= _maxSupply(), "ERC20Votes: total supply risks overflowing votes");
- 
--        _writeCheckpoint(_totalSupplyCheckpoints, _add, amount);
-+        _writeCheckpointAdd(_totalSupplyCheckpoints, amount); // HARNESS: new version without pointer
-     }
- 
-     /**
-      * @dev Snapshots the totalSupply after it has been decreased.
-      */
--    function _burn(address account, uint256 amount) internal virtual override {
-+    function _burn(address account, uint256 amount) public virtual override { // HARNESS: internal -> public (to comply with the ERC20 harness)
-         super._burn(account, amount);
- 
--        _writeCheckpoint(_totalSupplyCheckpoints, _subtract, amount);
-+        _writeCheckpointSub(_totalSupplyCheckpoints, amount); // HARNESS: new version without pointer
-     }
- 
-     /**
-@@ -225,7 +225,7 @@
-      *
-      * Emits events {IVotes-DelegateChanged} and {IVotes-DelegateVotesChanged}.
-      */
--    function _delegate(address delegator, address delegatee) internal virtual {
-+    function _delegate(address delegator, address delegatee) public virtual { // HARNESS: internal -> public
-         address currentDelegate = delegates(delegator);
-         uint256 delegatorBalance = balanceOf(delegator);
-         _delegates[delegator] = delegatee;
-@@ -238,35 +238,60 @@
-     function _moveVotingPower(address src, address dst, uint256 amount) private {
-         if (src != dst && amount > 0) {
-             if (src != address(0)) {
--                (uint256 oldWeight, uint256 newWeight) = _writeCheckpoint(_checkpoints[src], _subtract, amount);
-+                (uint256 oldWeight, uint256 newWeight) = _writeCheckpointSub(_checkpoints[src], amount); // HARNESS: new version without pointer
-                 emit DelegateVotesChanged(src, oldWeight, newWeight);
-             }
- 
-             if (dst != address(0)) {
--                (uint256 oldWeight, uint256 newWeight) = _writeCheckpoint(_checkpoints[dst], _add, amount);
-+                (uint256 oldWeight, uint256 newWeight) = _writeCheckpointAdd(_checkpoints[dst], amount); // HARNESS: new version without pointer
-                 emit DelegateVotesChanged(dst, oldWeight, newWeight);
-             }
-         }
-     }
- 
--    function _writeCheckpoint(
--        Checkpoint[] storage ckpts,
--        function(uint256, uint256) view returns (uint256) op,
--        uint256 delta
--    ) private returns (uint256 oldWeight, uint256 newWeight) {
-+    // HARNESS: split _writeCheckpoint() to two functions as a workaround for function pointers that cannot be managed by the tool
-+    // function _writeCheckpoint(
-+    //     Checkpoint[] storage ckpts,
-+    //     function(uint256, uint256) view returns (uint256) op,
-+    //     uint256 delta
-+    // ) private returns (uint256 oldWeight, uint256 newWeight) {
-+    //     uint256 pos = ckpts.length;
-+
-+    //     unchecked {
-+    //         Checkpoint memory oldCkpt = pos == 0 ? Checkpoint(0, 0) : _unsafeAccess(ckpts, pos - 1);
-+
-+    //         oldWeight = oldCkpt.votes;
-+    //         newWeight = op(oldWeight, delta);
-+
-+    //         if (pos > 0 && oldCkpt.fromBlock == clock()) {
-+    //             _unsafeAccess(ckpts, pos - 1).votes = SafeCast.toUint224(newWeight);
-+    //         } else {
-+    //             ckpts.push(Checkpoint({fromBlock: SafeCast.toUint32(clock()), votes: SafeCast.toUint224(newWeight)}));
-+    //         }
-+    //     }
-+    // }
-+
-+    function _writeCheckpointAdd(Checkpoint[] storage ckpts, uint256 delta) private returns (uint256 oldWeight, uint256 newWeight) {
-         uint256 pos = ckpts.length;
-+        oldWeight = pos == 0 ? 0 : ckpts[pos - 1].votes;
-+        newWeight = _add(oldWeight, delta);
- 
--        unchecked {
--            Checkpoint memory oldCkpt = pos == 0 ? Checkpoint(0, 0) : _unsafeAccess(ckpts, pos - 1);
-+        if (pos > 0 && ckpts[pos - 1].fromBlock == clock()) {
-+            ckpts[pos - 1].votes = SafeCast.toUint224(newWeight);
-+        } else {
-+            ckpts.push(Checkpoint({fromBlock: SafeCast.toUint32(clock()), votes: SafeCast.toUint224(newWeight)}));
-+        }
-+    }
- 
--            oldWeight = oldCkpt.votes;
--            newWeight = op(oldWeight, delta);
-+    function _writeCheckpointSub(Checkpoint[] storage ckpts, uint256 delta) private returns (uint256 oldWeight, uint256 newWeight) {
-+        uint256 pos = ckpts.length;
-+        oldWeight = pos == 0 ? 0 : ckpts[pos - 1].votes;
-+        newWeight = _subtract(oldWeight, delta);
- 
--            if (pos > 0 && oldCkpt.fromBlock == clock()) {
--                _unsafeAccess(ckpts, pos - 1).votes = SafeCast.toUint224(newWeight);
--            } else {
--                ckpts.push(Checkpoint({fromBlock: SafeCast.toUint32(clock()), votes: SafeCast.toUint224(newWeight)}));
--            }
-+        if (pos > 0 && ckpts[pos - 1].fromBlock == clock()) {
-+            ckpts[pos - 1].votes = SafeCast.toUint224(newWeight);
-+        } else {
-+            ckpts.push(Checkpoint({fromBlock: SafeCast.toUint32(clock()), votes: SafeCast.toUint224(newWeight)}));
-         }
-     }
- 
-diff -druN token/ERC20/extensions/ERC20Wrapper.sol token/ERC20/extensions/ERC20Wrapper.sol
---- token/ERC20/extensions/ERC20Wrapper.sol	2023-02-27 10:59:32.655891529 +0100
-+++ token/ERC20/extensions/ERC20Wrapper.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -62,7 +62,7 @@
-      * @dev Mint wrapped token to cover any underlyingTokens that would have been transferred by mistake. Internal
-      * function that can be exposed with access control if desired.
-      */
--    function _recover(address account) internal virtual returns (uint256) {
-+    function _recover(address account) public virtual returns (uint256) { // HARNESS: internal -> public
-         uint256 value = _underlying.balanceOf(address(this)) - totalSupply();
-         _mint(account, value);
-         return value;
-diff -druN token/ERC721/extensions/ERC721Votes.sol token/ERC721/extensions/ERC721Votes.sol
---- token/ERC721/extensions/ERC721Votes.sol	2023-02-27 10:59:32.655891529 +0100
-+++ token/ERC721/extensions/ERC721Votes.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -35,7 +35,7 @@
-     /**
-      * @dev Returns the balance of `account`.
-      */
--    function _getVotingUnits(address account) internal view virtual override returns (uint256) {
-+    function _getVotingUnits(address account) public view virtual override returns (uint256) { // HARNESS: internal -> public
-         return balanceOf(account);
-     }
- }
-diff -druN utils/Address.sol utils/Address.sol
---- utils/Address.sol	2023-02-27 10:59:32.659224903 +0100
-+++ utils/Address.sol	2023-02-28 16:49:10.421059488 +0100
-@@ -197,7 +197,7 @@
-         bool success,
-         bytes memory returndata,
-         string memory errorMessage
--    ) internal view returns (bytes memory) {
-+    ) internal view returns (bytes memory val) { // MUNGED undeterministic return causes error for Prover
-         if (success) {
-             if (returndata.length == 0) {
-                 // only check isContract if the call was successful and the return data is empty
-@@ -220,7 +220,7 @@
-         bool success,
-         bytes memory returndata,
-         string memory errorMessage
--    ) internal pure returns (bytes memory) {
-+    ) internal pure returns (bytes memory val) { // MUNGED undeterministic return causes error for Prover
-         if (success) {
-             return returndata;
-         } else {
-diff -druN utils/Checkpoints.sol utils/Checkpoints.sol
---- utils/Checkpoints.sol	2023-02-27 10:59:32.659224903 +0100
-+++ utils/Checkpoints.sol	2023-02-28 16:49:10.424392833 +0100
-@@ -84,13 +84,13 @@
-      *
-      * Returns previous value and new value.
-      */
--    function push(
--        History storage self,
--        function(uint256, uint256) view returns (uint256) op,
--        uint256 delta
--    ) internal returns (uint256, uint256) {
--        return push(self, op(latest(self), delta));
--    }
-+    // function push(
-+    //     History storage self,
-+    //     function(uint256, uint256) view returns (uint256) op,
-+    //     uint256 delta
-+    // ) internal returns (uint256, uint256) {
-+    //     return push(self, op(latest(self), delta));
-+    // }
- 
-     /**
-      * @dev Returns the value in the most recent checkpoint, or zero if there are no checkpoints.

certora/diff/token_ERC721_ERC721.sol.patch

@@ -0,0 +1,14 @@
+--- token/ERC721/ERC721.sol	2023-03-07 10:48:47.736822221 +0100
++++ token/ERC721/ERC721.sol	2023-03-09 19:49:39.669338673 +0100
+@@ -199,6 +199,11 @@
+         return _owners[tokenId];
+     }
+ 
++    // FV
++    function _getApproved(uint256 tokenId) internal view returns (address) {
++        return _tokenApprovals[tokenId];
++    }
++
+     /**
+      * @dev Returns whether `tokenId` exists.
+      *

certora/harnesses/AccessControlDefaultAdminRulesHarness.sol

@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.19;
+
+import "../patched/access/AccessControlDefaultAdminRules.sol";
+
+contract AccessControlDefaultAdminRulesHarness is AccessControlDefaultAdminRules {
+    uint48 private _delayIncreaseWait;
+
+    constructor(
+        uint48 initialDelay,
+        address initialDefaultAdmin,
+        uint48 delayIncreaseWait
+    ) AccessControlDefaultAdminRules(initialDelay, initialDefaultAdmin) {
+        _delayIncreaseWait = delayIncreaseWait;
+    }
+
+    // FV
+    function pendingDefaultAdmin_() external view returns (address) {
+        (address newAdmin, ) = pendingDefaultAdmin();
+        return newAdmin;
+    }
+
+    function pendingDefaultAdminSchedule_() external view returns (uint48) {
+        (, uint48 schedule) = pendingDefaultAdmin();
+        return schedule;
+    }
+
+    function pendingDelay_() external view returns (uint48) {
+        (uint48 newDelay, ) = pendingDefaultAdminDelay();
+        return newDelay;
+    }
+
+    function pendingDelaySchedule_() external view returns (uint48) {
+        (, uint48 schedule) = pendingDefaultAdminDelay();
+        return schedule;
+    }
+
+    function delayChangeWait_(uint48 newDelay) external view returns (uint48) {
+        return _delayChangeWait(newDelay);
+    }
+
+    // Overrides
+    function defaultAdminDelayIncreaseWait() public view override returns (uint48) {
+        return _delayIncreaseWait;
+    }
+}

certora/harnesses/AccessControlHarness.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts (last updated v4.5.0) (access/AccessControl.sol)
 
-pragma solidity ^0.8.0;
+pragma solidity ^0.8.19;
 
-import "../munged/access/AccessControl.sol";
+import "../patched/access/AccessControl.sol";
 
 contract AccessControlHarness is AccessControl {}

certora/harnesses/DoubleEndedQueueHarness.sol

@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.19;
+
+import "../patched/utils/structs/DoubleEndedQueue.sol";
+
+contract DoubleEndedQueueHarness {
+    using DoubleEndedQueue for DoubleEndedQueue.Bytes32Deque;
+
+    DoubleEndedQueue.Bytes32Deque private _deque;
+
+    function pushFront(bytes32 value) external {
+        _deque.pushFront(value);
+    }
+
+    function pushBack(bytes32 value) external {
+        _deque.pushBack(value);
+    }
+
+    function popFront() external returns (bytes32 value) {
+        return _deque.popFront();
+    }
+
+    function popBack() external returns (bytes32 value) {
+        return _deque.popBack();
+    }
+
+    function clear() external {
+        _deque.clear();
+    }
+
+    function begin() external view returns (int128) {
+        return _deque._begin;
+    }
+
+    function end() external view returns (int128) {
+        return _deque._end;
+    }
+
+    function length() external view returns (uint256) {
+        return _deque.length();
+    }
+
+    function empty() external view returns (bool) {
+        return _deque.empty();
+    }
+
+    function front() external view returns (bytes32 value) {
+        return _deque.front();
+    }
+
+    function back() external view returns (bytes32 value) {
+        return _deque.back();
+    }
+
+    function at_(uint256 index) external view returns (bytes32 value) {
+        return _deque.at(index);
+    }
+}

certora/harnesses/ERC1155/ERC1155BurnableHarness.sol

@@ -1,5 +0,0 @@
-import "../../munged/token/ERC1155/extensions/ERC1155Burnable.sol";
-
-contract ERC1155BurnableHarness is ERC1155Burnable {
-    constructor(string memory uri_) ERC1155(uri_) {}
-}

certora/harnesses/ERC1155/ERC1155Harness.sol

@@ -1,41 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.2;
-import "../../munged/token/ERC1155/ERC1155.sol";
-
-contract ERC1155Harness is ERC1155 {
-    constructor(string memory uri_) ERC1155(uri_) {}
-
-    function burn(
-        address from,
-        uint256 id,
-        uint256 amount
-    ) public virtual {
-        _burn(from, id, amount);
-    }
-
-    function burnBatch(
-        address from,
-        uint256[] memory ids,
-        uint256[] memory amounts
-    ) public virtual {
-        _burnBatch(from, ids, amounts);
-    }
-
-    function mint(
-        address to,
-        uint256 id,
-        uint256 amount,
-        bytes memory data
-    ) public virtual {
-        _mint(to, id, amount, data);
-    }
-
-    function mintBatch(
-        address to,
-        uint256[] memory ids,
-        uint256[] memory amounts,
-        bytes memory data
-    ) public virtual {
-        _mintBatch(to, ids, amounts, data);
-    }
-}

certora/harnesses/ERC1155/ERC1155PausableHarness.sol

@@ -1,17 +0,0 @@
-import "../../munged/token/ERC1155/extensions/ERC1155Pausable.sol";
-
-contract ERC1155PausableHarness is ERC1155Pausable {
-    constructor(string memory uri_) ERC1155(uri_) {}
-
-    function pause() public {
-        _pause();
-    }
-
-    function unpause() public {
-        _unpause();
-    }
-
-    function onlyWhenPausedMethod() public whenPaused {}
-
-    function onlyWhenNotPausedMethod() public whenNotPaused {}
-}

certora/harnesses/ERC1155/ERC1155SupplyHarness.sol

@@ -1,65 +0,0 @@
-import "../../munged/token/ERC1155/extensions/ERC1155Supply.sol";
-
-contract ERC1155SupplyHarness is ERC1155Supply {
-    address public owner;
-
-    constructor(string memory uri_) ERC1155(uri_) {
-        owner = msg.sender;
-    }
-
-    // workaround for problem caused by `exists` being a CVL keyword
-    function exists_wrapper(uint256 id) public view virtual returns (bool) {
-        return exists(id);
-    }
-
-    // These rules were not implemented in the base but there are changes in supply
-    // that are affected by the internal contracts so we implemented them. We assume
-    // only the owner can call any of these functions to be able to test them but also
-    // limit false positives.
-
-    modifier onlyOwner() {
-        require(msg.sender == owner);
-        _;
-    }
-
-    function burn(
-        address from,
-        uint256 id,
-        uint256 amount
-    ) public virtual onlyOwner {
-        _burn(from, id, amount);
-    }
-
-    function burnBatch(
-        address from,
-        uint256[] memory ids,
-        uint256[] memory amounts
-    ) public virtual onlyOwner {
-        _burnBatch(from, ids, amounts);
-    }
-
-    function mint(
-        address to,
-        uint256 id,
-        uint256 amount,
-        bytes memory data
-    ) public virtual onlyOwner {
-        _mint(to, id, amount, data);
-    }
-
-    function mintBatch(
-        address to,
-        uint256[] memory ids,
-        uint256[] memory amounts,
-        bytes memory data
-    ) public virtual onlyOwner {
-        _mintBatch(to, ids, amounts, data);
-    }
-
-    // In order to check the invariant that zero address never holds any tokens, we need to remove the require
-    // from this function.
-    function balanceOf(address account, uint256 id) public view virtual override returns (uint256) {
-        // require(account != address(0), "ERC1155: address zero is not a valid owner");
-        return _balances[id][account];
-    }
-}

certora/harnesses/ERC20FlashMintHarness.sol

@@ -1,5 +1,36 @@
-import "../munged/token/ERC20/extensions/ERC20FlashMint.sol";
+// SPDX-License-Identifier: MIT
 
-contract ERC20FlashMintHarness is ERC20FlashMint {
-    constructor(string memory name, string memory symbol) ERC20(name, symbol) {}
+pragma solidity ^0.8.19;
+
+import "../patched/token/ERC20/ERC20.sol";
+import "../patched/token/ERC20/extensions/ERC20Permit.sol";
+import "../patched/token/ERC20/extensions/ERC20FlashMint.sol";
+
+contract ERC20FlashMintHarness is ERC20, ERC20Permit, ERC20FlashMint {
+    uint256 someFee;
+    address someFeeReceiver;
+
+    constructor(string memory name, string memory symbol) ERC20(name, symbol) ERC20Permit(name) {}
+
+    function mint(address account, uint256 amount) external {
+        _mint(account, amount);
+    }
+
+    function burn(address account, uint256 amount) external {
+        _burn(account, amount);
+    }
+
+    // public accessor
+    function flashFeeReceiver() public view returns (address) {
+        return someFeeReceiver;
+    }
+
+    // internal hook
+    function _flashFee(address, uint256) internal view override returns (uint256) {
+        return someFee;
+    }
+
+    function _flashFeeReceiver() internal view override returns (address) {
+        return someFeeReceiver;
+    }
 }

certora/harnesses/ERC20PermitHarness.sol

@@ -1,5 +1,17 @@
-import "../munged/token/ERC20/extensions/draft-ERC20Permit.sol";
+// SPDX-License-Identifier: MIT
 
-contract ERC20PermitHarness is ERC20, ERC20Permit {
+pragma solidity ^0.8.19;
+
+import "../patched/token/ERC20/extensions/ERC20Permit.sol";
+
+contract ERC20PermitHarness is ERC20Permit {
     constructor(string memory name, string memory symbol) ERC20(name, symbol) ERC20Permit(name) {}
+
+    function mint(address account, uint256 amount) external {
+        _mint(account, amount);
+    }
+
+    function burn(address account, uint256 amount) external {
+        _burn(account, amount);
+    }
 }

certora/harnesses/ERC20VotesHarness.sol

@@ -1,26 +0,0 @@
-import "../munged/token/ERC20/extensions/ERC20Votes.sol";
-
-contract ERC20VotesHarness is ERC20Votes {
-    constructor(string memory name, string memory symbol) ERC20(name, symbol) ERC20Permit(name) {}
-
-    function ckptFromBlock(address account, uint32 pos) public view returns (uint32) {
-        return _checkpoints[account][pos].fromBlock;
-    }
-
-    function ckptVotes(address account, uint32 pos) public view returns (uint224) {
-        return _checkpoints[account][pos].fromBlock;
-    }
-
-    function unsafeNumCheckpoints(address account) public view returns (uint256) {
-        return _checkpoints[account].length;
-    }
-
-    function delegateBySig(
-        address delegatee,
-        uint256 nonce,
-        uint256 expiry,
-        uint8 v,
-        bytes32 r,
-        bytes32 s
-    ) public virtual override {}
-}

certora/harnesses/ERC20WrapperHarness.sol

@@ -1,11 +1,11 @@
-import "../munged/token/ERC20/extensions/ERC20Wrapper.sol";
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.19;
+
+import "../patched/token/ERC20/extensions/ERC20Wrapper.sol";
 
 contract ERC20WrapperHarness is ERC20Wrapper {
-    constructor(
-        IERC20 _underlying,
-        string memory _name,
-        string memory _symbol
-    ) ERC20(_name, _symbol) ERC20Wrapper(_underlying) {}
+    constructor(IERC20 _underlying, string memory _name, string memory _symbol) ERC20(_name, _symbol) ERC20Wrapper(_underlying) {}
 
     function underlyingTotalSupply() public view returns (uint256) {
         return underlying().totalSupply();
@@ -14,4 +14,12 @@ contract ERC20WrapperHarness is ERC20Wrapper {
     function underlyingBalanceOf(address account) public view returns (uint256) {
         return underlying().balanceOf(account);
     }
+
+    function underlyingAllowanceToThis(address account) public view returns (uint256) {
+        return underlying().allowance(account, address(this));
+    }
+
+    function recover(address account) public returns (uint256) {
+        return _recover(account);
+    }
 }

certora/harnesses/ERC3156FlashBorrowerHarness.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+
+import "../patched/interfaces/IERC3156FlashBorrower.sol";
+
+pragma solidity ^0.8.19;
+
+contract ERC3156FlashBorrowerHarness is IERC3156FlashBorrower {
+    bytes32 somethingToReturn;
+
+    function onFlashLoan(address, address, uint256, uint256, bytes calldata) external view override returns (bytes32) {
+        return somethingToReturn;
+    }
+}

certora/harnesses/ERC721Harness.sol

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.19;
+
+import "../patched/token/ERC721/ERC721.sol";
+
+contract ERC721Harness is ERC721 {
+    constructor(string memory name, string memory symbol) ERC721(name, symbol) {}
+
+    function mint(address account, uint256 tokenId) external {
+        _mint(account, tokenId);
+    }
+
+    function safeMint(address to, uint256 tokenId) external {
+        _safeMint(to, tokenId);
+    }
+
+    function safeMint(address to, uint256 tokenId, bytes memory data) external {
+        _safeMint(to, tokenId, data);
+    }
+
+    function burn(uint256 tokenId) external {
+        _burn(tokenId);
+    }
+
+    function tokenExists(uint256 tokenId) external view returns (bool) {
+        return _exists(tokenId);
+    }
+
+    function unsafeOwnerOf(uint256 tokenId) external view returns (address) {
+        return _ownerOf(tokenId);
+    }
+
+    function unsafeGetApproved(uint256 tokenId) external view returns (address) {
+        return _getApproved(tokenId);
+    }
+}

certora/harnesses/ERC721ReceiverHarness.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.19;
+
+import "../patched/interfaces/IERC721Receiver.sol";
+
+contract ERC721ReceiverHarness is IERC721Receiver {
+    function onERC721Received(address, address, uint256, bytes calldata) external pure returns (bytes4) {
+        return this.onERC721Received.selector;
+    }
+}

certora/harnesses/ERC721VotesHarness.sol

@@ -1,26 +0,0 @@
-pragma solidity ^0.8.0;
-
-import "../munged/token/ERC721/extensions/draft-ERC721Votes.sol";
-
-contract ERC721VotesHarness is ERC721Votes {
-    constructor(string memory name, string memory symbol) ERC721(name, symbol) EIP712(name, symbol) {}
-
-    function delegateBySig(
-        address delegatee,
-        uint256 nonce,
-        uint256 expiry,
-        uint8 v,
-        bytes32 r,
-        bytes32 s
-    ) public virtual override {
-        assert(true);
-    }
-
-    function mint(address account, uint256 tokenID) public {
-        _mint(account, tokenID);
-    }
-
-    function burn(uint256 tokenID) public {
-        _burn(tokenID);
-    }
-}

certora/harnesses/EnumerableMapHarness.sol

@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.19;
+
+import "../patched/utils/structs/EnumerableMap.sol";
+
+contract EnumerableMapHarness {
+    using EnumerableMap for EnumerableMap.Bytes32ToBytes32Map;
+
+    EnumerableMap.Bytes32ToBytes32Map private _map;
+
+    function set(bytes32 key, bytes32 value) public returns (bool) {
+        return _map.set(key, value);
+    }
+
+    function remove(bytes32 key) public returns (bool) {
+        return _map.remove(key);
+    }
+
+    function contains(bytes32 key) public view returns (bool) {
+        return _map.contains(key);
+    }
+
+    function length() public view returns (uint256) {
+        return _map.length();
+    }
+
+    function key_at(uint256 index) public view returns (bytes32) {
+        (bytes32 key,) = _map.at(index);
+        return key;
+    }
+
+    function value_at(uint256 index) public view returns (bytes32) {
+        (,bytes32 value) = _map.at(index);
+        return value;
+    }
+
+    function tryGet_contains(bytes32 key) public view returns (bool) {
+        (bool contained,) = _map.tryGet(key);
+        return contained;
+    }
+
+    function tryGet_value(bytes32 key) public view returns (bytes32) {
+        (,bytes32 value) = _map.tryGet(key);
+        return value;
+    }
+
+    function get(bytes32 key) public view returns (bytes32) {
+        return _map.get(key);
+    }
+
+    function _indexOf(bytes32 key) public view returns (uint256) {
+        return _map._keys._inner._indexes[key];
+    }
+}

certora/harnesses/EnumerableSetHarness.sol

@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.19;
+
+import "../patched/utils/structs/EnumerableSet.sol";
+
+contract EnumerableSetHarness {
+    using EnumerableSet for EnumerableSet.Bytes32Set;
+
+    EnumerableSet.Bytes32Set private _set;
+
+    function add(bytes32 value) public returns (bool) {
+        return _set.add(value);
+    }
+
+    function remove(bytes32 value) public returns (bool) {
+        return _set.remove(value);
+    }
+
+    function contains(bytes32 value) public view returns (bool) {
+        return _set.contains(value);
+    }
+
+    function length() public view returns (uint256) {
+        return _set.length();
+    }
+
+    function at_(uint256 index) public view returns (bytes32) {
+        return _set.at(index);
+    }
+
+    function _indexOf(bytes32 value) public view returns (uint256) {
+        return _set._inner._indexes[value];
+    }
+}

certora/harnesses/GovernorFullHarness.sol

@@ -1,206 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.2;
-
-import "../munged/governance/Governor.sol";
-import "../munged/governance/extensions/GovernorCountingSimple.sol";
-import "../munged/governance/extensions/GovernorPreventLateQuorum.sol";
-import "../munged/governance/extensions/GovernorTimelockControl.sol";
-import "../munged/governance/extensions/GovernorVotes.sol";
-import "../munged/governance/extensions/GovernorVotesQuorumFraction.sol";
-import "../munged/token/ERC20/extensions/ERC20Votes.sol";
-
-contract GovernorFullHarness is
-    Governor,
-    GovernorCountingSimple,
-    GovernorTimelockControl,
-    GovernorPreventLateQuorum,
-    GovernorVotes,
-    GovernorVotesQuorumFraction
-{
-    using Checkpoints for Checkpoints.Trace224;
-
-    constructor(
-        IVotes _token,
-        TimelockController _timelock,
-        uint64 initialVoteExtension,
-        uint256 quorumNumeratorValue
-    )
-        Governor("Harness")
-        GovernorPreventLateQuorum(initialVoteExtension)
-        GovernorTimelockControl(_timelock)
-        GovernorVotes(_token)
-        GovernorVotesQuorumFraction(quorumNumeratorValue)
-    {}
-
-    mapping(uint256 => uint256) public ghost_sum_vote_power_by_id;
-
-    // Harness from Votes //
-
-    function getPastTotalSupply(uint256 blockNumber) public view returns(uint256) {
-        return token.getPastTotalSupply(blockNumber);
-    }
-    // Harness from GovernorVotesQuorumFraction //
-
-    function getQuorumNumeratorLength() public view returns(uint256) {
-        return _quorumNumeratorHistory._checkpoints.length;
-    }
-
-    function getQuorumNumeratorLatest() public view returns(uint256) {
-        return _quorumNumeratorHistory.latest();
-    }
-
-    function getDeprecatedQuorumNumerator() public view returns(uint256) {
-        return _quorumNumerator;
-    }
-
-    // Harness from GovernorPreventLateQuorum //
-
-    function getVoteExtension() public view returns (uint64) {
-        return _voteExtension;
-    }
-
-    function getExtendedDeadline(uint256 proposalId) public view returns (uint64) {
-        return _extendedDeadlines[proposalId];
-    }
-
-    // Harness from GovernorCountingSimple //
-
-    function getAgainstVotes(uint256 proposalId) public view returns (uint256) {
-        ProposalVote storage proposalvote = _proposalVotes[proposalId];
-        return proposalvote.againstVotes;
-    }
-
-    function getAbstainVotes(uint256 proposalId) public view returns (uint256) {
-        ProposalVote storage proposalvote = _proposalVotes[proposalId];
-        return proposalvote.abstainVotes;
-    }
-
-    function getForVotes(uint256 proposalId) public view returns (uint256) {
-        ProposalVote storage proposalvote = _proposalVotes[proposalId];
-        return proposalvote.forVotes;
-    }
-
-    function quorumReached(uint256 proposalId) public view returns (bool) {
-        return _quorumReached(proposalId);
-    }
-
-    function voteSucceeded(uint256 proposalId) public view returns (bool) {
-        return _voteSucceeded(proposalId);
-    }
-
-    // Harness from Governor //
-
-    function getExecutor() public view returns (address) {
-        return _executor();
-    }
-
-    function proposalProposer(uint256 proposalId) public view returns (address) {
-        return _proposalProposer(proposalId);
-    }
-
-    function isExecuted(uint256 proposalId) public view returns (bool) {
-        return _proposals[proposalId].executed;
-    }
-
-    function isCanceled(uint256 proposalId) public view returns (bool) {
-        return _proposals[proposalId].canceled;
-    }
-
-    // The following functions are overrides required by Solidity added by Certora. //
-
-    function proposalDeadline(uint256 proposalId)
-        public
-        view
-        virtual
-        override(Governor, GovernorPreventLateQuorum, IGovernor)
-        returns (uint256)
-    {
-        return super.proposalDeadline(proposalId);
-    }
-
-    function _castVote(
-        uint256 proposalId,
-        address account,
-        uint8 support,
-        string memory reason,
-        bytes memory params
-    ) internal virtual override(Governor, GovernorPreventLateQuorum) returns (uint256) {
-        // added to run GovernorCountingSimple.spec
-        uint256 deltaWeight = super._castVote(proposalId, account, support, reason, params);
-        ghost_sum_vote_power_by_id[proposalId] += deltaWeight;
-
-        return deltaWeight;
-    }
-
-    function lateQuorumVoteExtension() public view virtual override returns (uint64) {
-        return super.lateQuorumVoteExtension();
-    }
-
-    function setLateQuorumVoteExtension(uint64 newVoteExtension) public virtual override onlyGovernance {
-        super.setLateQuorumVoteExtension(newVoteExtension);
-    }
-
-    // The following functions are overrides required by Solidity added by OZ Wizard. //
-
-    function votingDelay() public pure override returns (uint256) {
-        return 1; // 1 block
-    }
-
-    function votingPeriod() public pure override returns (uint256) {
-        return 45818; // 1 week
-    }
-
-    function quorum(uint256 blockNumber)
-        public
-        view
-        override(IGovernor, GovernorVotesQuorumFraction)
-        returns (uint256)
-    {
-        return super.quorum(blockNumber);
-    }
-
-    function state(uint256 proposalId) public view override(Governor, GovernorTimelockControl) returns (ProposalState) {
-        return super.state(proposalId);
-    }
-
-    function propose(
-        address[] memory targets,
-        uint256[] memory values,
-        bytes[] memory calldatas,
-        string memory description
-    ) public override(Governor, IGovernor) returns (uint256) {
-        return super.propose(targets, values, calldatas, description);
-    }
-
-    function _execute(
-        uint256 proposalId,
-        address[] memory targets,
-        uint256[] memory values,
-        bytes[] memory calldatas,
-        bytes32 descriptionHash
-    ) internal override(Governor, GovernorTimelockControl) {
-        super._execute(proposalId, targets, values, calldatas, descriptionHash);
-    }
-
-    function _cancel(
-        address[] memory targets,
-        uint256[] memory values,
-        bytes[] memory calldatas,
-        bytes32 descriptionHash
-    ) internal override(Governor, GovernorTimelockControl) returns (uint256) {
-        return super._cancel(targets, values, calldatas, descriptionHash);
-    }
-
-    function _executor() internal view override(Governor, GovernorTimelockControl) returns (address) {
-        return super._executor();
-    }
-
-    function supportsInterface(bytes4 interfaceId)
-        public
-        view
-        override(Governor, GovernorTimelockControl)
-        returns (bool)
-    {
-        return super.supportsInterface(interfaceId);
-    }
-}

certora/harnesses/GovernorHarness.sol

@@ -1,154 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.2;
-
-import "../munged/governance/Governor.sol";
-import "../munged/governance/extensions/GovernorCountingSimple.sol";
-import "../munged/governance/extensions/GovernorTimelockControl.sol";
-import "../munged/governance/extensions/GovernorVotes.sol";
-import "../munged/governance/extensions/GovernorVotesQuorumFraction.sol";
-import "../munged/token/ERC20/extensions/ERC20Votes.sol";
-
-contract GovernorHarness is
-    Governor,
-    GovernorCountingSimple,
-    GovernorVotes,
-    GovernorVotesQuorumFraction,
-    GovernorTimelockControl
-{
-    constructor(
-        IVotes _token,
-        TimelockController _timelock,
-        uint64 initialVoteExtension,
-        uint256 quorumNumeratorValue
-    )
-        Governor("Harness")
-        GovernorVotes(_token)
-        GovernorVotesQuorumFraction(quorumNumeratorValue)
-        GovernorTimelockControl(_timelock)
-    {}
-
-    mapping(uint256 => uint256) public ghost_sum_vote_power_by_id;
-
-    // Harness from GovernorCountingSimple //
-
-    function getAgainstVotes(uint256 proposalId) public view returns (uint256) {
-        ProposalVote storage proposalvote = _proposalVotes[proposalId];
-        return proposalvote.againstVotes;
-    }
-
-    function getAbstainVotes(uint256 proposalId) public view returns (uint256) {
-        ProposalVote storage proposalvote = _proposalVotes[proposalId];
-        return proposalvote.abstainVotes;
-    }
-
-    function getForVotes(uint256 proposalId) public view returns (uint256) {
-        ProposalVote storage proposalvote = _proposalVotes[proposalId];
-        return proposalvote.forVotes;
-    }
-
-    function quorumReached(uint256 proposalId) public view returns (bool) {
-        return _quorumReached(proposalId);
-    }
-
-    function voteSucceeded(uint256 proposalId) public view returns (bool) {
-        return _voteSucceeded(proposalId);
-    }
-
-    // Harness from Governor //
-
-    function getExecutor() public view returns (address) {
-        return _executor();
-    }
-
-    function proposalProposer(uint256 proposalId) public view returns (address) {
-        return _proposalProposer(proposalId);
-    }
-
-    function isExecuted(uint256 proposalId) public view returns (bool) {
-        return _proposals[proposalId].executed;
-    }
-
-    function isCanceled(uint256 proposalId) public view returns (bool) {
-        return _proposals[proposalId].canceled;
-    }
-
-    // The following functions are overrides required by Solidity added by Certora. //
-
-    function _castVote(
-        uint256 proposalId,
-        address account,
-        uint8 support,
-        string memory reason,
-        bytes memory params
-    ) internal virtual override returns (uint256) {
-        // added to run GovernorCountingSimple.spec
-        uint256 deltaWeight = super._castVote(proposalId, account, support, reason, params);
-        ghost_sum_vote_power_by_id[proposalId] += deltaWeight;
-
-        return deltaWeight;
-    }
-
-    // The following functions are overrides required by Solidity added by OZ Wizard. //
-
-    function votingDelay() public pure override returns (uint256) {
-        return 1; // 1 block
-    }
-
-    function votingPeriod() public pure override returns (uint256) {
-        return 45818; // 1 week
-    }
-
-    function quorum(uint256 blockNumber)
-        public
-        view
-        override(IGovernor, GovernorVotesQuorumFraction)
-        returns (uint256)
-    {
-        return super.quorum(blockNumber);
-    }
-
-    function state(uint256 proposalId) public view override(Governor, GovernorTimelockControl) returns (ProposalState) {
-        return super.state(proposalId);
-    }
-
-    function propose(
-        address[] memory targets,
-        uint256[] memory values,
-        bytes[] memory calldatas,
-        string memory description
-    ) public override(Governor, IGovernor) returns (uint256) {
-        return super.propose(targets, values, calldatas, description);
-    }
-
-    function _execute(
-        uint256 proposalId,
-        address[] memory targets,
-        uint256[] memory values,
-        bytes[] memory calldatas,
-        bytes32 descriptionHash
-    ) internal override(Governor, GovernorTimelockControl) {
-        super._execute(proposalId, targets, values, calldatas, descriptionHash);
-    }
-
-    function _cancel(
-        address[] memory targets,
-        uint256[] memory values,
-        bytes[] memory calldatas,
-        bytes32 descriptionHash
-    ) internal override(Governor, GovernorTimelockControl) returns (uint256) {
-        return super._cancel(targets, values, calldatas, descriptionHash);
-    }
-
-    function _executor() internal view override(Governor, GovernorTimelockControl) returns (address) {
-        return super._executor();
-    }
-
-    function supportsInterface(bytes4 interfaceId)
-        public
-        view
-        override(Governor, GovernorTimelockControl)
-        returns (bool)
-    {
-        return super.supportsInterface(interfaceId);
-    }
-}

certora/harnesses/IERC3156FlashBorrowerHarness.sol

@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.1 (interfaces/IERC3156FlashBorrower.sol)
-
-import "../munged/interfaces/IERC3156FlashBorrower.sol";
-
-pragma solidity ^0.8.0;
-
-contract IERC3156FlashBorrowerHarness is IERC3156FlashBorrower {
-    bytes32 somethingToReturn;
-
-    function onFlashLoan(
-        address initiator,
-        address token,
-        uint256 amount,
-        uint256 fee,
-        bytes calldata data
-    ) external override returns (bytes32) {
-        return somethingToReturn;
-    }
-}

certora/harnesses/InitializableBasicHarness.sol

@@ -1,80 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.2;
-
-import "../munged/proxy/utils/Initializable.sol";
-
-contract InitializableBasicHarness is Initializable {
-    uint256 public val;
-    uint256 public a;
-    uint256 public b;
-
-    modifier version1() {
-        require(_initialized == 1);
-        _;
-    }
-
-    modifier versionN(uint8 n) {
-        require(_initialized == n);
-        _;
-    }
-
-    function initialize(
-        uint256 _val,
-        uint256 _a,
-        uint256 _b
-    ) public initializer {
-        a = _a;
-        b = _b;
-        val = _val;
-    }
-
-    function reinitialize(
-        uint256 _val,
-        uint256 _a,
-        uint256 _b,
-        uint8 n
-    ) public reinitializer(n) {
-        a = _a;
-        b = _b;
-        val = _val;
-    }
-
-    // Versioned return functions for testing
-
-    function returnsV1() public view version1 returns (uint256) {
-        return val;
-    }
-
-    function returnsVN(uint8 n) public view versionN(n) returns (uint256) {
-        return val;
-    }
-
-    function returnsAV1() public view version1 returns (uint256) {
-        return a;
-    }
-
-    function returnsAVN(uint8 n) public view versionN(n) returns (uint256) {
-        return a;
-    }
-
-    function returnsBV1() public view version1 returns (uint256) {
-        return b;
-    }
-
-    function returnsBVN(uint8 n) public view versionN(n) returns (uint256) {
-        return b;
-    }
-
-    // Harness //
-    function initialized() public view returns (uint8) {
-        return _initialized;
-    }
-
-    function initializing() public view returns (bool) {
-        return _initializing;
-    }
-
-    function thisIsContract() public view returns (bool) {
-        return !Address.isContract(address(this));
-    }
-}

certora/harnesses/InitializableComplexHarness.sol

@@ -1,92 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.2;
-
-import "../munged/proxy/utils/Initializable.sol";
-
-contract InitializableA is Initializable {
-    uint256 public a;
-
-    modifier version1() {
-        require(_initialized == 1);
-        _;
-    }
-
-    modifier versionN(uint8 n) {
-        require(_initialized == n);
-        _;
-    }
-
-    function __InitializableA_init(uint256 _a) internal onlyInitializing {
-        a = _a;
-    }
-
-    function returnsAV1() public view version1 returns (uint256) {
-        return a;
-    }
-
-    function returnsAVN(uint8 n) public view versionN(n) returns (uint256) {
-        return a;
-    }
-}
-
-contract InitializableB is Initializable, InitializableA {
-    uint256 public b;
-
-    function __InitializableB_init(uint256 _b) internal onlyInitializing {
-        b = _b;
-    }
-
-    function returnsBV1() public view version1 returns (uint256) {
-        return b;
-    }
-
-    function returnsBVN(uint8 n) public view versionN(n) returns (uint256) {
-        return b;
-    }
-}
-
-contract InitializableComplexHarness is Initializable, InitializableB {
-    uint256 public val;
-
-    function initialize(
-        uint256 _val,
-        uint256 _a,
-        uint256 _b
-    ) public initializer {
-        val = _val;
-        __InitializableA_init(_a);
-        __InitializableB_init(_b);
-    }
-
-    function reinitialize(
-        uint256 _val,
-        uint256 _a,
-        uint256 _b,
-        uint8 n
-    ) public reinitializer(n) {
-        val = _val;
-        __InitializableA_init(_a);
-        __InitializableB_init(_b);
-    }
-
-    function returnsV1() public view version1 returns (uint256) {
-        return val;
-    }
-
-    function returnsVN(uint8 n) public view versionN(n) returns (uint256) {
-        return val;
-    }
-
-    // Harness //
-    function initialized() public view returns (uint8) {
-        return _initialized;
-    }
-
-    function initializing() public view returns (bool) {
-        return _initializing;
-    }
-
-    function thisIsContract() public view returns (bool) {
-        return !Address.isContract(address(this));
-    }
-}

certora/harnesses/InitializableHarness.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.19;
+
+import "../patched/proxy/utils/Initializable.sol";
+
+contract InitializableHarness is Initializable {
+    function initialize()          public initializer      {}
+    function reinitialize(uint8 n) public reinitializer(n) {}
+    function disable()             public { _disableInitializers(); }
+
+    function nested_init_init()                     public initializer      { initialize();    }
+    function nested_init_reinit(uint8 m)            public initializer      { reinitialize(m); }
+    function nested_reinit_init(uint8 n)            public reinitializer(n) { initialize();    }
+    function nested_reinit_reinit(uint8 n, uint8 m) public reinitializer(n) { reinitialize(m); }
+
+    function version() public view returns (uint8) {
+        return _getInitializedVersion();
+    }
+
+    function initializing() public view returns (bool) {
+        return _isInitializing();
+    }
+}

certora/harnesses/Ownable2StepHarness.sol

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.19;
+
+import "../patched/access/Ownable2Step.sol";
+
+contract Ownable2StepHarness is Ownable2Step {
+  function restricted() external onlyOwner {}
+}

certora/harnesses/OwnableHarness.sol

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.19;
+
+import "../patched/access/Ownable.sol";
+
+contract OwnableHarness is Ownable {
+  function restricted() external onlyOwner {}
+}