From 06a21befa5c6630cb6a0cca41d995db55ab99ec1 Mon Sep 17 00:00:00 2001 From: ross <92001561+z0r0z@users.noreply.github.com> Date: Sun, 14 Jan 2024 10:48:01 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Tidy=20v0.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gas-snapshot | 12 ++++++------ lib/accounts | 2 +- lib/forge-std | 2 +- lib/solady | 2 +- src/Dagon.sol | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gas-snapshot b/.gas-snapshot index 5a94719..83da05d 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -1,7 +1,7 @@ DagonTest:testBurn(address,uint96) (runs: 256, μ: 153055, ~: 153055) DagonTest:testDeploy() (gas: 2216130) -DagonTest:testFailBurnOverBalance(address,uint96) (runs: 256, μ: 187448, ~: 188692) -DagonTest:testFailBurnOverThreshold(address,uint96) (runs: 256, μ: 218700, ~: 219944) +DagonTest:testFailBurnOverBalance(address,uint96) (runs: 256, μ: 187603, ~: 188692) +DagonTest:testFailBurnOverThreshold(address,uint96) (runs: 256, μ: 218855, ~: 219944) DagonTest:testFailInvalidThresholdExceedsSupply() (gas: 159135) DagonTest:testFailInvalidThresholdExceedsSupply2() (gas: 164270) DagonTest:testFailInvalidThresholdNull() (gas: 159183) @@ -13,8 +13,8 @@ DagonTest:testFailIsValidSignatureWeightedERC20() (gas: 240854) DagonTest:testFailIsValidSignatureWeightedERC6909() (gas: 232746) DagonTest:testFailIsValidSignatureWeightedERC721() (gas: 211709) DagonTest:testFailSetTokenInvalidStd(address) (runs: 256, μ: 158177, ~: 158177) -DagonTest:testFailTransferFromInactiveAuth(address,address,uint96) (runs: 256, μ: 192049, ~: 192905) -DagonTest:testFailTransferOverBalance(address,address,uint96) (runs: 256, μ: 186557, ~: 187413) +DagonTest:testFailTransferFromInactiveAuth(address,address,uint96) (runs: 256, μ: 192205, ~: 192905) +DagonTest:testFailTransferOverBalance(address,address,uint96) (runs: 256, μ: 186713, ~: 187413) DagonTest:testInstall() (gas: 137488) DagonTest:testIsValidSignature() (gas: 150964) DagonTest:testIsValidSignature2of3() (gas: 197468) @@ -30,5 +30,5 @@ DagonTest:testSetAuth(address) (runs: 256, μ: 145752, ~: 145752) DagonTest:testSetThreshold() (gas: 147633) DagonTest:testSetToken(address) (runs: 256, μ: 148425, ~: 148425) DagonTest:testSetURI() (gas: 165155) -DagonTest:testTransfer(address,address,uint88) (runs: 256, μ: 175912, ~: 177001) -DagonTest:testTransferWithAuth(address,address,uint96) (runs: 256, μ: 180161, ~: 180949) \ No newline at end of file +DagonTest:testTransfer(address,address,uint88) (runs: 256, μ: 176068, ~: 177001) +DagonTest:testTransferWithAuth(address,address,uint96) (runs: 256, μ: 180229, ~: 180949) \ No newline at end of file diff --git a/lib/accounts b/lib/accounts index 6c829af..1c4503f 160000 --- a/lib/accounts +++ b/lib/accounts @@ -1 +1 @@ -Subproject commit 6c829af0f6356ddd53a6ad4fdae07a6fec799987 +Subproject commit 1c4503f6d597d5c029957e56ac441bc23f752d6d diff --git a/lib/forge-std b/lib/forge-std index 87a2a0a..36c303b 160000 --- a/lib/forge-std +++ b/lib/forge-std @@ -1 +1 @@ -Subproject commit 87a2a0afc5fafd6297538a45a52ac19e71a84562 +Subproject commit 36c303b7ffdd842d06b1ec2744c9b9b5fb3083f3 diff --git a/lib/solady b/lib/solady index e229410..03fe77a 160000 --- a/lib/solady +++ b/lib/solady @@ -1 +1 @@ -Subproject commit e229410140b3745299c20efa55908c53ad95f7d9 +Subproject commit 03fe77af044c61cf61b7fe1d5e496aef613b7c7a diff --git a/src/Dagon.sol b/src/Dagon.sol index 0118a04..eee058a 100644 --- a/src/Dagon.sol +++ b/src/Dagon.sol @@ -185,7 +185,7 @@ contract Dagon is ERC6909 { /// @dev Returns validated signature result within the conventional ERC1271 syntax. function _validateReturn(bool success) internal pure virtual returns (bytes4 result) { - assembly { + assembly ("memory-safe") { // `success ? bytes4(keccak256("isValidSignature(bytes32,bytes)")) : 0xffffffff`. result := shl(224, or(0x1626ba7e, sub(0, iszero(success)))) }