Merge branch 'main' into modules

pcaversaccio · Mar 18, 2024 · dbaabe3 · dbaabe3
2 parents ba6b53c + bc63370
commit dbaabe3
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 32 deletions.
diff --git a/lib/create-util b/lib/create-util
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/solady b/lib/solady
diff --git a/package.json b/package.json
@@ -45,6 +45,6 @@
     "merkletreejs": "^0.3.11",
     "prettier": "^3.2.5",
     "prettier-plugin-solidity": "^1.3.1",
-    "solhint": "^4.1.1"
+    "solhint": "^4.5.2"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/governance/mocks/CallReceiverMock.sol b/test/governance/mocks/CallReceiverMock.sol
@@ -70,15 +70,15 @@ contract CallReceiverMock {
      * @dev Reverts with an empty reason.
      */
     function mockFunctionRevertsWithEmptyReason() public payable {
-        // solhint-disable-next-line reason-string, custom-errors
+        // solhint-disable-next-line reason-string, gas-custom-errors
         revert();
     }
 
     /**
      * @dev Reverts with a non-empty reason.
      */
     function mockFunctionRevertsWithReason() public payable {
-        // solhint-disable-next-line custom-errors
+        // solhint-disable-next-line gas-custom-errors
         revert("CallReceiverMock: reverting");
     }
 

diff --git a/test/tokens/mocks/ERC1155ReceiverMock.sol b/test/tokens/mocks/ERC1155ReceiverMock.sol
@@ -66,7 +66,7 @@ contract ERC1155ReceiverMock is ERC165, IERC1155Receiver {
         uint256 amount,
         bytes memory data
     ) external returns (bytes4) {
-        // solhint-disable-next-line reason-string, custom-errors
+        // solhint-disable-next-line reason-string, gas-custom-errors
         require(!recReverts, "ERC1155ReceiverMock: reverting on receive");
         emit Received(operator, from, id, amount, data);
         return recRetval;
@@ -92,7 +92,7 @@ contract ERC1155ReceiverMock is ERC165, IERC1155Receiver {
         uint256[] memory amounts,
         bytes memory data
     ) external returns (bytes4) {
-        // solhint-disable-next-line reason-string, custom-errors
+        // solhint-disable-next-line reason-string, gas-custom-errors
         require(!batReverts, "ERC1155ReceiverMock: reverting on batch receive");
         emit BatchReceived(operator, from, ids, amounts, data);
         return batRetval;

diff --git a/test/tokens/mocks/ERC721ReceiverMock.sol b/test/tokens/mocks/ERC721ReceiverMock.sol
@@ -45,10 +45,10 @@ contract ERC721ReceiverMock is IERC721Receiver {
         bytes memory data
     ) public override returns (bytes4) {
         if (_ERROR == Error.RevertWithMessage) {
-            // solhint-disable-next-line custom-errors
+            // solhint-disable-next-line gas-custom-errors
             revert("ERC721ReceiverMock: reverting");
         } else if (_ERROR == Error.RevertWithoutMessage) {
-            // solhint-disable-next-line reason-string, custom-errors
+            // solhint-disable-next-line reason-string, gas-custom-errors
             revert();
         } else if (_ERROR == Error.Panic) {
             uint256 a = uint256(0) / uint256(0);
+53 −6		hardhat.config.ts
+9 −7		package.json
+362 −903		pnpm-lock.yaml
+1 −1		foundry.toml
+1 −1		src/StdChains.sol
+4 −1		src/Test.sol
+2 −2		test/StdChains.t.sol
+5 −0		.changeset/yellow-moles-hammer.md
+6 −4		contracts/utils/cryptography/SignatureChecker.sol
+1 −1		docs/modules/ROOT/pages/access-control.adoc
+4 −4		docs/modules/ROOT/pages/utilities.adoc
+3 −0		hardhat/async-test-sanity.js
+7 −8		test/access/AccessControl.behavior.js
+1 −1		test/access/Ownable2Step.test.js
+29 −29		test/access/manager/AccessManager.test.js
+3 −3		test/governance/TimelockController.test.js
+2 −2		test/governance/extensions/GovernorTimelockAccess.test.js
+2 −1		test/proxy/Proxy.behaviour.js
+5 −3		test/proxy/beacon/BeaconProxy.test.js
+1 −1		test/proxy/beacon/UpgradeableBeacon.test.js
+2 −2		test/token/ERC1155/ERC1155.behavior.js
+1 −1		test/token/ERC1155/extensions/ERC1155Supply.test.js
+2 −2		test/token/ERC20/extensions/ERC4626.test.js
+6 −6		test/token/ERC721/ERC721.behavior.js
+425 −425		.gas-snapshot
+1 −0		.github/workflows/ci-all-via-ir.yml
+5 −5		.github/workflows/ci.yml
+1 −1		README.md
+2 −2		foundry.toml
+1 −1		package.json
+2 −2		src/accounts/ERC6551.sol
+4 −4		src/tokens/ERC1155.sol
+20 −25		test/LibString.t.sol