Skip to content

Commit

Permalink
Merge branch 'main' into ci/add-venom-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@pcaversaccio
pcaversaccio authored Oct 3, 2024
2 parents 693dc06 + 949adb5 commit e9b7a46
Show file tree
Hide file tree
Showing 8 changed files with 174 additions and 174 deletions.
268 changes: 134 additions & 134 deletions .gas-snapshot
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/create-util
Submodule create-util updated 2 files
+2 −2 package.json
+79 −79 pnpm-lock.yaml
2 changes: 1 addition & 1 deletion lib/forge-std
Submodule forge-std updated 2 files
+22 −7 src/Vm.sol
+1 −1 test/Vm.t.sol
2 changes: 1 addition & 1 deletion lib/openzeppelin-contracts
Submodule openzeppelin-contracts updated 7 files
+8 −0 .solcover.js
+70 −24 contracts/utils/cryptography/P256.sol
+6 −2 contracts/utils/cryptography/RSA.sol
+6 −6 docs/modules/ROOT/pages/utilities.adoc
+1 −1 lib/forge-std
+2 −2 test/helpers/iterate.js
+13 −104 test/utils/cryptography/P256.t.sol
2 changes: 1 addition & 1 deletion lib/solady
Submodule solady updated 11 files
+1 −1 package.json
+2 −2 src/accounts/Pod.sol
+262 −25 src/utils/DynamicArrayLib.sol
+61 −6 src/utils/LibClone.sol
+112 −1 src/utils/LibSort.sol
+349 −354 src/utils/LibString.sol
+194 −0 test/DynamicArrayLib.t.sol
+30 −0 test/LibClone.t.sol
+3 −0 test/LibSort.t.sol
+176 −0 test/LibString.t.sol
+4 −0 test/utils/mocks/MockPod.sol
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@openzeppelin/merkle-tree": "^1.0.7",
"eslint": "^9.11.1",
"eslint-config-prettier": "^9.1.0",
"ethers": "^6.13.2",
"ethers": "^6.13.3",
"keccak256": "^1.0.6",
"merkletreejs": "^0.4.0",
"prettier": "^3.3.3",
Expand Down
34 changes: 17 additions & 17 deletions pnpm-lock.yaml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 18 additions & 18 deletions test/tokens/ERC721.t.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ contract ERC721Test is Test {
bool withData,
bytes memory data
) internal {
uint256 snapshot = vm.snapshot();
uint256 snapshot = vm.snapshotState();
vm.startPrank(owner);
vm.expectEmit(true, true, true, false);
emit IERC721.Transfer(owner, receiver, tokenId);
Expand Down Expand Up @@ -249,9 +249,9 @@ contract ERC721Test is Test {
}
_transferSuccess(owner, tokenId, receiver);
vm.stopPrank();
vm.revertTo(snapshot);
vm.revertToState(snapshot);

snapshot = vm.snapshot();
snapshot = vm.snapshotState();
vm.startPrank(approved);
vm.expectEmit(true, true, true, false);
emit IERC721.Transfer(owner, receiver, tokenId);
Expand Down Expand Up @@ -279,9 +279,9 @@ contract ERC721Test is Test {
}
_transferSuccess(owner, tokenId, receiver);
vm.stopPrank();
vm.revertTo(snapshot);
vm.revertToState(snapshot);

snapshot = vm.snapshot();
snapshot = vm.snapshotState();
vm.startPrank(operator);
vm.expectEmit(true, true, true, false);
emit IERC721.Transfer(owner, receiver, tokenId);
Expand Down Expand Up @@ -309,9 +309,9 @@ contract ERC721Test is Test {
}
_transferSuccess(owner, tokenId, receiver);
vm.stopPrank();
vm.revertTo(snapshot);
vm.revertToState(snapshot);

snapshot = vm.snapshot();
snapshot = vm.snapshotState();
vm.startPrank(owner);
ERC721Extended.approve(zeroAddress, tokenId);
vm.stopPrank();
Expand Down Expand Up @@ -342,9 +342,9 @@ contract ERC721Test is Test {
}
_transferSuccess(owner, tokenId, receiver);
vm.stopPrank();
vm.revertTo(snapshot);
vm.revertToState(snapshot);

snapshot = vm.snapshot();
snapshot = vm.snapshotState();
vm.startPrank(owner);
vm.expectEmit(true, true, true, false);
emit IERC721.Transfer(owner, owner, tokenId);
Expand All @@ -371,7 +371,7 @@ contract ERC721Test is Test {
assertEq(ERC721Extended.tokenOfOwnerByIndex(owner, 0), tokenId);
assertTrue(ERC721Extended.tokenOfOwnerByIndex(owner, 1) == tokenId + 1);
vm.stopPrank();
vm.revertTo(snapshot);
vm.revertToState(snapshot);

/**
* @dev Validates all possible reverts.
Expand Down Expand Up @@ -408,7 +408,7 @@ contract ERC721Test is Test {
address receiver,
bytes memory data
) internal {
uint256 snapshot = vm.snapshot();
uint256 snapshot = vm.snapshotState();
_shouldTransferTokensByUsers(
transferFunction,
owner,
Expand All @@ -419,9 +419,9 @@ contract ERC721Test is Test {
true,
data
);
vm.revertTo(snapshot);
vm.revertToState(snapshot);

snapshot = vm.snapshot();
snapshot = vm.snapshotState();
_shouldTransferTokensByUsers(
transferFunction,
owner,
Expand All @@ -432,9 +432,9 @@ contract ERC721Test is Test {
true,
data
);
vm.revertTo(snapshot);
vm.revertToState(snapshot);

snapshot = vm.snapshot();
snapshot = vm.snapshotState();
vm.startPrank(owner);
vm.expectEmit(true, true, true, true, receiver);
emit ERC721ReceiverMock.Received(owner, owner, tokenId, data);
Expand All @@ -450,9 +450,9 @@ contract ERC721Test is Test {
);
_transferSuccess(owner, tokenId, receiver);
vm.stopPrank();
vm.revertTo(snapshot);
vm.revertToState(snapshot);

snapshot = vm.snapshot();
snapshot = vm.snapshotState();
vm.startPrank(approved);
vm.expectEmit(true, true, true, true, receiver);
emit ERC721ReceiverMock.Received(approved, owner, tokenId, data);
Expand All @@ -468,7 +468,7 @@ contract ERC721Test is Test {
);
_transferSuccess(owner, tokenId, receiver);
vm.stopPrank();
vm.revertTo(snapshot);
vm.revertToState(snapshot);

vm.startPrank(owner);
vm.expectRevert(bytes("erc721: invalid token ID"));
Expand Down

0 comments on commit e9b7a46

Please sign in to comment.