diff --git a/package.json b/package.json index 03c223ae1..d3ee595ed 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "eslint-config-prettier": "^9.0.0", "ethers": "^6.7.1", "keccak256": "^1.0.6", - "merkletreejs": "^0.3.10", + "merkletreejs": "^0.3.9", "prettier": "^3.0.3", "prettier-plugin-solidity": "^1.1.3", "solhint": "^3.6.2" diff --git a/src/auth/AccessControl.vy b/src/auth/AccessControl.vy index 26cb8b775..5aca97c57 100644 --- a/src/auth/AccessControl.vy +++ b/src/auth/AccessControl.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Multi-Role-Based Access Control Functions @custom:contract-name AccessControl diff --git a/src/auth/Ownable.vy b/src/auth/Ownable.vy index c357de4e1..0917f4fbc 100644 --- a/src/auth/Ownable.vy +++ b/src/auth/Ownable.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Owner-Based Access Control Functions @custom:contract-name Ownable diff --git a/src/auth/Ownable2Step.vy b/src/auth/Ownable2Step.vy index 068796e4f..1bdb689b3 100644 --- a/src/auth/Ownable2Step.vy +++ b/src/auth/Ownable2Step.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title 2-Step Ownership Transfer Functions @custom:contract-name Ownable2Step diff --git a/src/auth/interfaces/IAccessControl.vy b/src/auth/interfaces/IAccessControl.vy index 44ba8b6c4..786e728af 100644 --- a/src/auth/interfaces/IAccessControl.vy +++ b/src/auth/interfaces/IAccessControl.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title AccessControl Interface Definition @custom:contract-name IAccessControl diff --git a/src/extensions/ERC2981.vy b/src/extensions/ERC2981.vy index bad3433c9..ec712789b 100644 --- a/src/extensions/ERC2981.vy +++ b/src/extensions/ERC2981.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title ERC-721 and ERC-1155 Compatible ERC-2981 Reference Implementation @custom:contract-name ERC2981 diff --git a/src/extensions/ERC4626.vy b/src/extensions/ERC4626.vy index 9f43d614e..6a3379b05 100644 --- a/src/extensions/ERC4626.vy +++ b/src/extensions/ERC4626.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Modern and Gas-Efficient ERC-4626 Tokenised Vault Implementation @custom:contract-name ERC4626 diff --git a/src/extensions/interfaces/IERC2981.vy b/src/extensions/interfaces/IERC2981.vy index 1c8db5d8e..a1ffe466b 100644 --- a/src/extensions/interfaces/IERC2981.vy +++ b/src/extensions/interfaces/IERC2981.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-2981 Interface Definition @custom:contract-name IERC2981 diff --git a/src/tokens/ERC1155.vy b/src/tokens/ERC1155.vy index 147570066..47a2ad1c4 100644 --- a/src/tokens/ERC1155.vy +++ b/src/tokens/ERC1155.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Modern and Gas-Efficient ERC-1155 Implementation @custom:contract-name ERC1155 diff --git a/src/tokens/ERC20.vy b/src/tokens/ERC20.vy index b07e681ab..b39e626d8 100644 --- a/src/tokens/ERC20.vy +++ b/src/tokens/ERC20.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Modern and Gas-Efficient ERC-20 + EIP-2612 Implementation @custom:contract-name ERC20 diff --git a/src/tokens/ERC721.vy b/src/tokens/ERC721.vy index 0030ee9b2..b73c82ab9 100644 --- a/src/tokens/ERC721.vy +++ b/src/tokens/ERC721.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Modern and Gas-Efficient ERC-721 + EIP-4494 Implementation @custom:contract-name ERC721 diff --git a/src/tokens/interfaces/IERC1155.vy b/src/tokens/interfaces/IERC1155.vy index a03ad4403..75a8fa9e3 100644 --- a/src/tokens/interfaces/IERC1155.vy +++ b/src/tokens/interfaces/IERC1155.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-1155 Interface Definition @custom:contract-name IERC1155 diff --git a/src/tokens/interfaces/IERC1155MetadataURI.vy b/src/tokens/interfaces/IERC1155MetadataURI.vy index 3a03080ba..1a5498ade 100644 --- a/src/tokens/interfaces/IERC1155MetadataURI.vy +++ b/src/tokens/interfaces/IERC1155MetadataURI.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-1155 Optional Metadata Interface Definition @custom:contract-name IERC1155MetadataURI diff --git a/src/tokens/interfaces/IERC1155Receiver.vy b/src/tokens/interfaces/IERC1155Receiver.vy index 81a9c59ec..26ec0150d 100644 --- a/src/tokens/interfaces/IERC1155Receiver.vy +++ b/src/tokens/interfaces/IERC1155Receiver.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-1155 Token Receiver Interface Definition @custom:contract-name IERC1155Receiver diff --git a/src/tokens/interfaces/IERC20Permit.vy b/src/tokens/interfaces/IERC20Permit.vy index 007b1ccf2..9388b8dd5 100644 --- a/src/tokens/interfaces/IERC20Permit.vy +++ b/src/tokens/interfaces/IERC20Permit.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-2612 Interface Definition @custom:contract-name IERC20Permit diff --git a/src/tokens/interfaces/IERC4906.vy b/src/tokens/interfaces/IERC4906.vy index e415ac7b3..7663e931c 100644 --- a/src/tokens/interfaces/IERC4906.vy +++ b/src/tokens/interfaces/IERC4906.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-4906 Interface Definition @custom:contract-name IERC4906 diff --git a/src/tokens/interfaces/IERC721Enumerable.vy b/src/tokens/interfaces/IERC721Enumerable.vy index 2f0d88d66..7b2baf60a 100644 --- a/src/tokens/interfaces/IERC721Enumerable.vy +++ b/src/tokens/interfaces/IERC721Enumerable.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-721 Optional Enumeration Interface Definition @custom:contract-name IERC721Enumerable diff --git a/src/tokens/interfaces/IERC721Metadata.vy b/src/tokens/interfaces/IERC721Metadata.vy index 5b65e5a1c..b22b02c26 100644 --- a/src/tokens/interfaces/IERC721Metadata.vy +++ b/src/tokens/interfaces/IERC721Metadata.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-721 Optional Metadata Interface Definition @custom:contract-name IERC721Metadata diff --git a/src/tokens/interfaces/IERC721Permit.vy b/src/tokens/interfaces/IERC721Permit.vy index d001b4677..ad9c48874 100644 --- a/src/tokens/interfaces/IERC721Permit.vy +++ b/src/tokens/interfaces/IERC721Permit.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-4494 Interface Definition @custom:contract-name IERC721Permit diff --git a/src/tokens/interfaces/IERC721Receiver.vy b/src/tokens/interfaces/IERC721Receiver.vy index 647d596ff..ae55c1aea 100644 --- a/src/tokens/interfaces/IERC721Receiver.vy +++ b/src/tokens/interfaces/IERC721Receiver.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-721 Token Receiver Interface Definition @custom:contract-name IERC721Receiver diff --git a/src/utils/Base64.vy b/src/utils/Base64.vy index 01a8ff54b..cd1503318 100644 --- a/src/utils/Base64.vy +++ b/src/utils/Base64.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Base64 Encoding and Decoding Functions @custom:contract-name Base64 diff --git a/src/utils/BatchDistributor.vy b/src/utils/BatchDistributor.vy index 19824549f..746aae364 100644 --- a/src/utils/BatchDistributor.vy +++ b/src/utils/BatchDistributor.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Batch Sending Both Native and ERC-20 Tokens @custom:contract-name BatchDistributor diff --git a/src/utils/Create2Address.vy b/src/utils/Create2Address.vy index b030554c6..5dd48dc8c 100644 --- a/src/utils/Create2Address.vy +++ b/src/utils/Create2Address.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title `CREATE2` EVM Opcode Utility Functions for Address Calculations @custom:contract-name Create2Address diff --git a/src/utils/CreateAddress.vy b/src/utils/CreateAddress.vy index 9fb2c068c..b035e346e 100644 --- a/src/utils/CreateAddress.vy +++ b/src/utils/CreateAddress.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title `CREATE` EVM Opcode Utility Functions for Address Calculations @custom:contract-name CreateAddress diff --git a/src/utils/ECDSA.vy b/src/utils/ECDSA.vy index 54efd22df..edea0e2cf 100644 --- a/src/utils/ECDSA.vy +++ b/src/utils/ECDSA.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Elliptic Curve Digital Signature Algorithm (ECDSA) Functions @custom:contract-name ECDSA diff --git a/src/utils/EIP712DomainSeparator.vy b/src/utils/EIP712DomainSeparator.vy index df6fab485..ebe4fd61e 100644 --- a/src/utils/EIP712DomainSeparator.vy +++ b/src/utils/EIP712DomainSeparator.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-712 Domain Separator @custom:contract-name EIP712DomainSeparator diff --git a/src/utils/Math.vy b/src/utils/Math.vy index f9f502cd1..b1a66389a 100644 --- a/src/utils/Math.vy +++ b/src/utils/Math.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Standard Mathematical Utility Functions @custom:contract-name Math diff --git a/src/utils/MerkleProofVerification.vy b/src/utils/MerkleProofVerification.vy index 39ee01bc4..019757bb8 100644 --- a/src/utils/MerkleProofVerification.vy +++ b/src/utils/MerkleProofVerification.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Merkle Tree Proof Verification Functions @custom:contract-name MerkleProofVerification diff --git a/src/utils/Multicall.vy b/src/utils/Multicall.vy index 3389e77bf..6e4c280b1 100644 --- a/src/utils/Multicall.vy +++ b/src/utils/Multicall.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title Multicall Functions @custom:contract-name Multicall diff --git a/src/utils/SignatureChecker.vy b/src/utils/SignatureChecker.vy index 88da64c18..3bdbabf75 100644 --- a/src/utils/SignatureChecker.vy +++ b/src/utils/SignatureChecker.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title ECDSA and EIP-1271 Signature Verification Functions @custom:contract-name SignatureChecker diff --git a/src/utils/interfaces/IERC5267.vy b/src/utils/interfaces/IERC5267.vy index 3ef2ca5df..1864491e0 100644 --- a/src/utils/interfaces/IERC5267.vy +++ b/src/utils/interfaces/IERC5267.vy @@ -1,4 +1,4 @@ -# @version ^0.3.10 +# @version ^0.3.9 """ @title EIP-5267 Interface Definition @custom:contract-name IERC5267 diff --git a/test/utils/Math.t.sol b/test/utils/Math.t.sol index a9dd29559..394277538 100644 --- a/test/utils/Math.t.sol +++ b/test/utils/Math.t.sol @@ -350,7 +350,7 @@ contract MathTest is Test { assertEq(math.wad_exp(-0.5 * 10 ** 18), 606_530_659_712_633_423); assertEq(math.wad_exp(-0.3 * 10 ** 18), 740_818_220_681_717_866); assertEq(math.wad_exp(0), 10 ** 18); - assertEq(math.wad_exp(0.3 * 10 ** 18), 1_349_858_807_576_003_103); + assertEq(math.wad_exp(0.3 * 10 ** 18), 1_349_858_807_576_0.3.93); assertEq(math.wad_exp(0.5 * 10 ** 18), 1_648_721_270_700_128_146); assertEq(math.wad_exp(1 * 10 ** 18), 2_718_281_828_459_045_235); assertEq(math.wad_exp(2 * 10 ** 18), 7_389_056_098_930_650_227); diff --git a/yarn.lock b/yarn.lock index df10c08e2..55961314c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1118,9 +1118,9 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -merkletreejs@^0.3.10: - version "0.3.10" - resolved "https://registry.yarnpkg.com/merkletreejs/-/merkletreejs-0.3.10.tgz#b9abdfc5e3aadaf9eb8b0a35c4b87aea33f5d4b7" +merkletreejs@^0.3.9: + version "0.3.9" + resolved "https://registry.yarnpkg.com/merkletreejs/-/merkletreejs-0.3.9.tgz#b9abdfc5e3aadaf9eb8b0a35c4b87aea33f5d4b7" integrity sha512-lin42tKfRdkW+6iE5pjtQ9BnH+1Hk3sJ5Fn9hUUSjcXRcJbSISHgPCfYvMNEXiNqZPhz/TyRPEV30qgnujsQ7A== dependencies: bignumber.js "^9.0.1"