Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
pcaversaccio authored Sep 14, 2023
2 parents e68a6e1 + 76a1eee commit df72ec2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion lib/create-util
2 changes: 1 addition & 1 deletion lib/openzeppelin-contracts
Submodule openzeppelin-contracts updated 53 files
+5 −0 .changeset/six-frogs-turn.md
+5 −0 .changeset/wet-bears-heal.md
+1 −1 .github/actions/setup/action.yml
+0 −14 certora/diff/token_ERC721_ERC721.sol.patch
+1 −2 certora/harnesses/AccessControlDefaultAdminRulesHarness.sol
+1 −2 certora/harnesses/AccessControlHarness.sol
+1 −2 certora/harnesses/DoubleEndedQueueHarness.sol
+1 −2 certora/harnesses/ERC20PermitHarness.sol
+12 −3 certora/harnesses/ERC20WrapperHarness.sol
+1 −1 certora/harnesses/ERC3156FlashBorrowerHarness.sol
+1 −5 certora/harnesses/ERC721Harness.sol
+1 −1 certora/harnesses/EnumerableMapHarness.sol
+1 −1 certora/harnesses/EnumerableSetHarness.sol
+9 −9 certora/harnesses/InitializableHarness.sol
+4 −3 certora/harnesses/Ownable2StepHarness.sol
+4 −3 certora/harnesses/OwnableHarness.sol
+1 −2 certora/harnesses/PausableHarness.sol
+2 −1 certora/harnesses/TimelockControllerHarness.sol
+7 −1 certora/run.js
+119 −126 certora/specs/AccessControl.spec
+28 −28 certora/specs/AccessControlDefaultAdminRules.spec
+39 −101 certora/specs/ERC20.spec
+24 −17 certora/specs/ERC20FlashMint.spec
+32 −32 certora/specs/ERC20Wrapper.spec
+220 −130 certora/specs/ERC721.spec
+32 −33 certora/specs/EnumerableMap.spec
+24 −25 certora/specs/EnumerableSet.spec
+19 −19 certora/specs/Initializable.spec
+77 −78 certora/specs/Ownable.spec
+108 −108 certora/specs/Ownable2Step.spec
+96 −96 certora/specs/Pausable.spec
+64 −65 certora/specs/TimelockController.spec
+6 −5 certora/specs/methods/IAccessControl.spec
+16 −16 certora/specs/methods/IAccessControlDefaultAdminRules.spec
+9 −9 certora/specs/methods/IERC20.spec
+3 −3 certora/specs/methods/IERC2612.spec
+0 −5 certora/specs/methods/IERC3156.spec
+3 −0 certora/specs/methods/IERC3156FlashBorrower.spec
+5 −0 certora/specs/methods/IERC3156FlashLender.spec
+1 −1 certora/specs/methods/IERC5313.spec
+12 −15 certora/specs/methods/IERC721.spec
+3 −0 certora/specs/methods/IERC721Receiver.spec
+3 −3 certora/specs/methods/IOwnable.spec
+5 −5 certora/specs/methods/IOwnable2Step.spec
+3 −3 contracts/governance/Governor.sol
+12 −5 contracts/governance/extensions/GovernorVotes.sol
+1 −1 contracts/governance/extensions/GovernorVotesQuorumFraction.sol
+1 −53 contracts/token/ERC20/ERC20.sol
+47 −9 package-lock.json
+1 −1 package.json
+1 −1 requirements.txt
+5 −1 scripts/upgradeable/transpile.sh
+0 −161 test/token/ERC20/ERC20.test.js
2 changes: 1 addition & 1 deletion lib/solady
Submodule solady updated 2 files
+10 −10 .gas-snapshot
+10 −14 src/utils/LibBit.sol
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
eslint-visitor-keys "^3.3.0"

"@eslint-community/regexpp@^4.6.1":
version "4.8.0"
resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.0.tgz#11195513186f68d42fbf449f9a7136b2c0c92005"
integrity sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==
version "4.8.1"
resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.1.tgz#8c4bb756cc2aa7eaf13cfa5e69c83afb3260c20c"
integrity sha512-PWiOzLIUAjN/w5K17PoF4n6sKBw0gqLHPhywmYHP4t1VFQQVYeb1yWsJwnMVEMl3tUHME7X/SJPZLmtG7XBDxQ==

"@eslint/eslintrc@^2.1.2":
version "2.1.2"
Expand Down Expand Up @@ -587,9 +587,9 @@ concat-map@0.0.1:
integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==

cosmiconfig@^8.0.0:
version "8.3.5"
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.5.tgz#3b3897ddd042d022d5a207d4c8832e54f5301977"
integrity sha512-A5Xry3xfS96wy2qbiLkQLAg4JUrR2wvfybxj6yqLmrUfMAvhS3MZxIP2oQn0grgYIvJqzpeTEWu4vK0t+12NNw==
version "8.3.6"
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3"
integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==
dependencies:
import-fresh "^3.3.0"
js-yaml "^4.1.0"
Expand Down

0 comments on commit df72ec2

Please sign in to comment.