Merge branch 'master' into modular-exponentiation-precompile-wrapper-O…

…penZeppelin#1985
mw2000 · Nov 8, 2023 · 988c950 · 988c950
2 parents 4ba0a29 + 74016c3
commit 988c950
Show file tree

Hide file tree

Showing 487 changed files with 28,261 additions and 29,189 deletions.
diff --git a/.changeset/angry-ties-switch.md b/.changeset/angry-ties-switch.md
diff --git a/.changeset/big-plums-cover.md b/.changeset/big-plums-cover.md
diff --git a/.changeset/blue-scissors-design.md b/.changeset/blue-scissors-design.md
diff --git a/.changeset/bright-tomatoes-sing.md b/.changeset/bright-tomatoes-sing.md
diff --git a/.changeset/chilled-spiders-attack.md b/.changeset/chilled-spiders-attack.md
diff --git a/.changeset/clever-pumas-beg.md b/.changeset/clever-pumas-beg.md
diff --git a/.changeset/dull-ghosts-sip.md b/.changeset/dull-ghosts-sip.md
@@ -0,0 +1,6 @@
+---
+'openzeppelin-solidity': patch
+---
+
+`AccessManager`, `AccessManaged`, `GovernorTimelockAccess`: Ensure that calldata shorter than 4 bytes is not padded to 4 bytes.
+pr: #4624
diff --git a/.changeset/eighty-crabs-listen.md b/.changeset/eighty-crabs-listen.md
diff --git a/.changeset/eleven-planets-relax.md b/.changeset/eleven-planets-relax.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': patch
+---
+
+`TransparentUpgradeableProxy`: Make internal `_proxyAdmin()` getter have `view` visibility.
diff --git a/.changeset/flat-bottles-wonder.md b/.changeset/flat-bottles-wonder.md
diff --git a/.changeset/four-adults-knock.md b/.changeset/four-adults-knock.md
diff --git a/.changeset/fresh-birds-kiss.md b/.changeset/fresh-birds-kiss.md
diff --git a/.changeset/grumpy-bulldogs-call.md b/.changeset/grumpy-bulldogs-call.md
diff --git a/.changeset/grumpy-poets-rush.md b/.changeset/grumpy-poets-rush.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+Upgradeable Contracts: No longer transpile interfaces, libraries, and stateless contracts.
diff --git a/.changeset/grumpy-worms-tease.md b/.changeset/grumpy-worms-tease.md
diff --git a/.changeset/happy-falcons-walk.md b/.changeset/happy-falcons-walk.md
diff --git a/.changeset/heavy-drinks-fail.md b/.changeset/heavy-drinks-fail.md
diff --git a/.changeset/hip-beds-provide.md b/.changeset/hip-beds-provide.md
diff --git a/.changeset/hot-coins-judge.md b/.changeset/hot-coins-judge.md
diff --git a/.changeset/hot-plums-approve.md b/.changeset/hot-plums-approve.md
diff --git a/.changeset/little-falcons-build.md b/.changeset/little-falcons-build.md
diff --git a/.changeset/lovely-geckos-hide.md b/.changeset/lovely-geckos-hide.md
diff --git a/.changeset/mean-walls-watch.md b/.changeset/mean-walls-watch.md
diff --git a/.changeset/mighty-donuts-smile.md b/.changeset/mighty-donuts-smile.md
diff --git a/.changeset/purple-squids-attend.md b/.changeset/purple-squids-attend.md
@@ -0,0 +1,6 @@
+---
+'openzeppelin-solidity': patch
+---
+
+`AccessManager`: Use named return parameters in functions that return multiple values.
+pr: #4624
diff --git a/.changeset/red-dots-fold.md b/.changeset/red-dots-fold.md
diff --git a/.changeset/rotten-insects-wash.md b/.changeset/rotten-insects-wash.md
diff --git a/.changeset/serious-books-lie.md b/.changeset/serious-books-lie.md
diff --git a/.changeset/short-eels-enjoy.md b/.changeset/short-eels-enjoy.md
diff --git a/.changeset/silly-bees-beam.md b/.changeset/silly-bees-beam.md
diff --git a/.changeset/slimy-penguins-attack.md b/.changeset/slimy-penguins-attack.md
diff --git a/.changeset/smooth-books-wink.md b/.changeset/smooth-books-wink.md
diff --git a/.changeset/spotty-hotels-type.md b/.changeset/spotty-hotels-type.md
diff --git a/.changeset/swift-bags-divide.md b/.changeset/swift-bags-divide.md
diff --git a/.changeset/tasty-tomatoes-turn.md b/.changeset/tasty-tomatoes-turn.md
diff --git a/.changeset/thin-camels-matter.md b/.changeset/thin-camels-matter.md
diff --git a/.changeset/thirty-drinks-happen.md b/.changeset/thirty-drinks-happen.md
@@ -0,0 +1,5 @@
+---
+'openzeppelin-solidity': major
+---
+
+`AccessManager`: Make `schedule` and `execute` more conservative when delay is 0.
diff --git a/.changeset/tough-drinks-hammer.md b/.changeset/tough-drinks-hammer.md
diff --git a/.changeset/violet-dancers-cough.md b/.changeset/violet-dancers-cough.md
diff --git a/.changeset/wild-windows-trade.md b/.changeset/wild-windows-trade.md
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -5,7 +5,7 @@ runs:
   steps:
     - uses: actions/setup-node@v3
       with:
-        node-version: 14.x
+        node-version: 16.x
     - uses: actions/cache@v3
       id: cache
       with:
@@ -15,5 +15,7 @@ runs:
       run: npm ci
       shell: bash
       if: steps.cache.outputs.cache-hit != 'true'
-      env:
-        SKIP_COMPILE: true
+    - name: Install Foundry
+      uses: foundry-rs/foundry-toolchain@v1
+      with:
+        version: nightly
diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml
@@ -9,7 +9,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Add problem matchers
         run: |
           # https://github.com/rhysd/actionlint/blob/3a2f2c7/docs/usage.md#problem-matchers

diff --git a/.github/workflows/changeset.yml b/.github/workflows/changeset.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'ignore-changeset') }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Include history so Changesets finds merge-base
       - name: Set up environment

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -20,7 +20,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
       - run: npm run lint
@@ -31,9 +31,11 @@ jobs:
       FORCE_COLOR: 1
       GAS: true
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Compile contracts # TODO: Remove after migrating tests to ethers
+        run: npm run compile
       - name: Run tests and generate gas report
         run: npm run test
       - name: Check linearisation of the inheritance graph
@@ -42,6 +44,7 @@ jobs:
         run: npm run test:generation
       - name: Compare gas costs
         uses: ./.github/actions/gas-compare
+        if: github.base_ref == 'master'
         with:
           token: ${{ github.token }}
 
@@ -50,50 +53,59 @@ jobs:
     env:
       FORCE_COLOR: 1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Include history so patch conflicts are resolved automatically
       - name: Set up environment
         uses: ./.github/actions/setup
+      - name: Copy non-upgradeable contracts as dependency
+        run: |
+          mkdir -p lib/openzeppelin-contracts
+          cp -rnT contracts lib/openzeppelin-contracts/contracts
       - name: Transpile to upgradeable
         run: bash scripts/upgradeable/transpile.sh
+      - name: Compile contracts # TODO: Remove after migrating tests to ethers
+        run: npm run compile
       - name: Run tests
         run: npm run test
       - name: Check linearisation of the inheritance graph
         run: npm run test:inheritance
       - name: Check storage layout
         uses: ./.github/actions/storage-layout
+        if: github.base_ref == 'master'
+        continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'breaking change') }}
         with:
           token: ${{ github.token }}
 
   tests-foundry:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
+      - name: Set up environment
+        uses: ./.github/actions/setup
       - name: Run tests
         run: forge test -vv
 
   coverage:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
-      - run: npm run coverage
+      - name: Compile contracts # TODO: Remove after migrating tests to ethers
+        run: npm run compile
+      - name: Run coverage
+        run: npm run coverage
       - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
   slither:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
       - run: rm foundry.toml
@@ -104,7 +116,7 @@ jobs:
   codespell:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run CodeSpell
         uses: codespell-project/[email protected]
         with:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -11,7 +11,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
       - run: bash scripts/git-user-config.sh