Merge branch 'main' into ci/add-venom-tests

pcaversaccio · Sep 17, 2024 · b9e5f12 · b9e5f12
2 parents 4a14f8c + 7f2aef7
commit b9e5f12
Show file tree

Hide file tree

Showing 72 changed files with 869 additions and 845 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
diff --git a/foundry.toml b/foundry.toml
@@ -8,7 +8,7 @@ cache = true                                                     # Enable cachin
 cache_path = "cache"                                             # Set the path to the cache.
 force = false                                                    # Do not ignore the cache.
 skip = ["src/snekmate/**/*[!c][!k].vy", "src/snekmate/**/*.vyi"] # Skip the compilation of non-mock and interface files.
-solc_version = "0.8.26"                                          # Set the Solidity compiler version.
+solc_version = "0.8.27"                                          # Set the Solidity compiler version.
 evm_version = "cancun"                                           # Set the EVM target version.
 optimizer = true                                                 # Enable the Solidity compiler optimiser.
 optimizer_runs = 200                                             # Configure the number of optimiser runs.

diff --git a/lib/create-util b/lib/create-util
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/halmos-cheatcodes b/lib/halmos-cheatcodes
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/solady b/lib/solady
diff --git a/lib/utils/VyperDeployer.sol b/lib/utils/VyperDeployer.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: WTFPL
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 import {Create} from "create-util/Create.sol";
 import {console, StdStyle} from "forge-std/Test.sol";

diff --git a/package.json b/package.json
@@ -37,9 +37,9 @@
     "CHANGELOG.md"
   ],
   "devDependencies": {
-    "@eslint/js": "^9.9.1",
+    "@eslint/js": "^9.10.0",
     "@openzeppelin/merkle-tree": "^1.0.7",
-    "eslint": "^9.9.1",
+    "eslint": "^9.10.0",
     "eslint-config-prettier": "^9.1.0",
     "ethers": "^6.13.2",
     "keccak256": "^1.0.6",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/snekmate/extensions/erc2981.vy b/src/snekmate/extensions/erc2981.vy
@@ -182,6 +182,11 @@ def royaltyInfo(token_id: uint256, sale_price: uint256) -> (address, uint256):
          on a sale price that may be denominated in any unit
          of exchange. The royalty amount is denominated and
          should be paid in that same unit of exchange.
+    @notice The ERC-2981 allows the royalty to be set at 100%
+            of the price. In that case, the entire price would
+            be transferred to the royalty receiver and `0` tokens
+            to the seller. Hence, for contracts involving royalty
+            payments, empty transfers should be taken into account.
     @param token_id The 32-byte identifier of the token.
     @param sale_price The 32-byte sale price of the NFT asset
            specified by `token_id`.

diff --git a/src/snekmate/extensions/interfaces/IERC2981.vyi b/src/snekmate/extensions/interfaces/IERC2981.vyi
@@ -47,6 +47,11 @@ def royaltyInfo(_tokenId: uint256, _salePrice: uint256) -> (address, uint256):
          on a sale price that may be denominated in any unit
          of exchange. The royalty amount is denominated and
          should be paid in that same unit of exchange.
+    @notice The ERC-2981 allows the royalty to be set at 100%
+            of the price. In that case, the entire price would
+            be transferred to the royalty receiver and `0` tokens
+            to the seller. Hence, for contracts involving royalty
+            payments, empty transfers should be taken into account.
     @param _tokenId The 32-byte identifier of the token.
     @param _salePrice The 32-byte sale price of the NFT asset
            specified by `_tokenId`.

diff --git a/test/auth/AccessControl.t.sol b/test/auth/AccessControl.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: WTFPL
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 import {Test} from "forge-std/Test.sol";
 import {VyperDeployer} from "utils/VyperDeployer.sol";

diff --git a/test/auth/Ownable.t.sol b/test/auth/Ownable.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: WTFPL
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 import {Test} from "forge-std/Test.sol";
 import {VyperDeployer} from "utils/VyperDeployer.sol";

diff --git a/test/auth/Ownable2Step.t.sol b/test/auth/Ownable2Step.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: WTFPL
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 import {Test} from "forge-std/Test.sol";
 import {VyperDeployer} from "utils/VyperDeployer.sol";

diff --git a/test/auth/interfaces/IAccessControlExtended.sol b/test/auth/interfaces/IAccessControlExtended.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: WTFPL
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 import {IERC165} from "openzeppelin/utils/introspection/IERC165.sol";
 import {IAccessControl} from "openzeppelin/access/IAccessControl.sol";

diff --git a/test/auth/interfaces/IOwnable.sol b/test/auth/interfaces/IOwnable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: WTFPL
-pragma solidity ^0.8.26;
+pragma solidity ^0.8.27;
 
 interface IOwnable {
     event OwnershipTransferred(
+35 −1		hardhat.config.ts
+12 −10		package.json
+282 −273		pnpm-lock.yaml
+4 −0		src/StdChains.sol
+17 −0		src/Vm.sol
+2 −0		test/StdChains.t.sol
+2 −2		test/Vm.t.sol
+5 −0		.changeset/four-chairs-help.md
+7 −0		GUIDELINES.md
+1 −1		contracts/governance/Governor.sol
+3 −0		contracts/governance/IGovernor.sol
+1 −1		contracts/interfaces/IERC1363Receiver.sol
+3 −0		contracts/interfaces/IERC2981.sol
+1 −1		contracts/metatx/ERC2771Forwarder.sol
+141 −0		contracts/proxy/Clones.sol
+2 −2		contracts/token/ERC1155/utils/ERC1155Utils.sol
+1 −1		contracts/token/ERC20/extensions/draft-ERC20TemporaryApproval.sol
+1 −0		contracts/utils/Base64.sol
+4 −4		contracts/utils/cryptography/MerkleProof.sol
+19 −18		contracts/utils/cryptography/P256.sol
+3 −3		contracts/utils/cryptography/RSA.sol
+1 −1		contracts/utils/introspection/ERC165Checker.sol
+1 −1		contracts/utils/structs/CircularBuffer.sol
+4 −4		contracts/utils/structs/Heap.sol
+2 −2		scripts/generate/templates/Heap.js
+1 −1		scripts/generate/templates/MerkleProof.js
+34 −2		test/proxy/Clones.t.sol
+151 −71		test/proxy/Clones.test.js
+11 −11		test/utils/structs/MerkleTree.test.js
+657 −648		.gas-snapshot
+1 −0		.github/workflows/ci-all-via-ir.yml
+4 −3		.github/workflows/ci.yml
+2 −1		README.md
+1 −1		foundry.toml
+1 −1		package.json
+1 −0		src/Milady.sol
+24 −9		src/accounts/Receiver.sol
+513 −0		src/utils/DynamicArrayLib.sol
+410 −74		src/utils/DynamicBufferLib.sol
+98 −0		src/utils/EnumerableSetLib.sol
+12 −12		src/utils/LibRLP.sol
+91 −112		src/utils/LibSort.sol
+59 −49		src/utils/Multicallable.sol
+117 −0		test/DynamicArrayLib.t.sol
+27 −0		test/DynamicBufferLib.t.sol
+90 −0		test/EnumerableSetLib.t.sol
+8 −8		test/LibRLP.t.sol
+30 −0		test/LibSort.t.sol
+5 −5		test/Ownable.t.sol
+4 −4		test/OwnableRoles.t.sol
+49 −0		test/utils/Brutalizer.sol
+2 −3		test/utils/mocks/MockMulticallable.sol