🤏 erc20: Init immutables don't hafta to be constructored

.gitattributes

@@ -1,2 +1 @@
-*.sol linguist-language=Solidity
 .gas-snapshot linguist-language=Julia

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
   "solidity.packageDefaultDependenciesContractsDirectory": "src",
   "solidity.packageDefaultDependenciesDirectory": "lib",
-  "solidity.compileUsingRemoteVersion": "v0.8.10",
+  "solidity.compileUsingRemoteVersion": "v0.8.15",
   "search.exclude": { "lib": true },
   "files.associations": {
     ".gas-snapshot": "julia"

README.md

@@ -19,9 +19,12 @@ tokens
 ├─ ERC721 — "Modern, minimalist, and gas efficient ERC721 implementation"
 ├─ ERC1155 — "Minimalist and gas efficient standard ERC1155 implementation"
 utils
-├─ SSTORE2 - "Library for cheaper reads and writes to persistent storage"
+├─ SSTORE2 — "Library for cheaper reads and writes to persistent storage"
 ├─ CREATE3 — "Deploy to deterministic addresses without an initcode factor"
-├─ SafeCastLib - "Safe unsigned integer casting lib that reverts on overflow"
+├─ LibString — "Library for creating string representations of uint values"
+├─ SafeCastLib — "Safe unsigned integer casting lib that reverts on overflow"
+├─ SignedWadMath — "Signed integer 18 decimal fixed point arithmetic library"
+├─ MerkleProofLib — "Efficient merkle tree inclusion proof verification library"
 ├─ ReentrancyGuard — "Gas optimized reentrancy protection for smart contracts"
 ├─ FixedPointMathLib — "Arithmetic library with operations for fixed-point numbers"
 ├─ Bytes32AddressLib — "Library for converting between addresses and bytes32 values"
@@ -45,13 +48,13 @@ We **do not give any warranties** and **will not be liable for any loss** incurr
 To install with [**Foundry**](https://github.com/gakonst/foundry):
 
 ```sh
-forge install rari-capital/solmate
+forge install transmissions11/solmate
 ```
 
 To install with [**Hardhat**](https://github.com/nomiclabs/hardhat) or [**Truffle**](https://github.com/trufflesuite/truffle):
 
 ```sh
-npm install @rari-capital/solmate
+npm install solmate
 ```
 
 ## Acknowledgements

foundry.toml

@@ -1,7 +1,7 @@
-[default]
-solc = "0.8.10"
+[profile.default]
+solc = "0.8.15"
 bytecode_hash = "none"
 optimizer_runs = 1000000
 
-[intense]
-fuzz_runs = 10000
+[profile.intense.fuzz]
+runs = 10000

package.json

@@ -1,14 +1,14 @@
 {
-  "name": "@rari-capital/solmate",
+  "name": "solmate",
   "license": "AGPL-3.0-only",
-  "version": "6.4.0",
+  "version": "6.1.0",
   "description": "Modern, opinionated and gas optimized building blocks for smart contract development.",
   "files": [
     "src/**/*.sol"
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Rari-Capital/solmate.git"
+    "url": "git+https://github.com/transmissions11/solmate.git"
   },
   "devDependencies": {
     "prettier": "^2.3.1",

src/auth/Auth.sol

@@ -2,10 +2,10 @@
 pragma solidity >=0.8.0;
 
 /// @notice Provides a flexible and updatable auth pattern which is completely separate from application logic.
-/// @author Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/auth/Auth.sol)
+/// @author Solmate (https://github.com/transmissions11/solmate/blob/main/src/auth/Auth.sol)
 /// @author Modified from Dappsys (https://github.com/dapphub/ds-auth/blob/master/src/auth.sol)
 abstract contract Auth {
-    event OwnerUpdated(address indexed user, address indexed newOwner);
+    event OwnershipTransferred(address indexed user, address indexed newOwner);
 
     event AuthorityUpdated(address indexed user, Authority indexed newAuthority);
 
@@ -17,7 +17,7 @@ abstract contract Auth {
         owner = _owner;
         authority = _authority;
 
-        emit OwnerUpdated(msg.sender, _owner);
+        emit OwnershipTransferred(msg.sender, _owner);
         emit AuthorityUpdated(msg.sender, _authority);
     }
 
@@ -45,15 +45,15 @@ abstract contract Auth {
         emit AuthorityUpdated(msg.sender, newAuthority);
     }
 
-    function setOwner(address newOwner) public virtual requiresAuth {
+    function transferOwnership(address newOwner) public virtual requiresAuth {
         owner = newOwner;
 
-        emit OwnerUpdated(msg.sender, newOwner);
+        emit OwnershipTransferred(msg.sender, newOwner);
     }
 }
 
 /// @notice A generic interface for a contract which provides authorization data to an Auth instance.
-/// @author Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/auth/Auth.sol)
+/// @author Solmate (https://github.com/transmissions11/solmate/blob/main/src/auth/Auth.sol)
 /// @author Modified from Dappsys (https://github.com/dapphub/ds-auth/blob/master/src/auth.sol)
 interface Authority {
     function canCall(

src/auth/Owned.sol

@@ -2,13 +2,13 @@
 pragma solidity >=0.8.0;
 
 /// @notice Simple single owner authorization mixin.
-/// @author Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/auth/Owned.sol)
+/// @author Solmate (https://github.com/transmissions11/solmate/blob/main/src/auth/Owned.sol)
 abstract contract Owned {
     /*//////////////////////////////////////////////////////////////
                                  EVENTS
     //////////////////////////////////////////////////////////////*/
 
-    event OwnerUpdated(address indexed user, address indexed newOwner);
+    event OwnershipTransferred(address indexed user, address indexed newOwner);
 
     /*//////////////////////////////////////////////////////////////
                             OWNERSHIP STORAGE
@@ -29,16 +29,16 @@ abstract contract Owned {
     constructor(address _owner) {
         owner = _owner;
 
-        emit OwnerUpdated(address(0), _owner);
+        emit OwnershipTransferred(address(0), _owner);
     }
 
     /*//////////////////////////////////////////////////////////////
                              OWNERSHIP LOGIC
     //////////////////////////////////////////////////////////////*/
 
-    function setOwner(address newOwner) public virtual onlyOwner {
+    function transferOwnership(address newOwner) public virtual onlyOwner {
         owner = newOwner;
 
-        emit OwnerUpdated(msg.sender, newOwner);
+        emit OwnershipTransferred(msg.sender, newOwner);
     }
 }

src/auth/authorities/MultiRolesAuthority.sol

@@ -4,7 +4,7 @@ pragma solidity >=0.8.0;
 import {Auth, Authority} from "../Auth.sol";
 
 /// @notice Flexible and target agnostic role based Authority that supports up to 256 roles.
-/// @author Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/auth/authorities/MultiRolesAuthority.sol)
+/// @author Solmate (https://github.com/transmissions11/solmate/blob/main/src/auth/authorities/MultiRolesAuthority.sol)
 contract MultiRolesAuthority is Auth, Authority {
     /*//////////////////////////////////////////////////////////////
                                  EVENTS

src/auth/authorities/RolesAuthority.sol

@@ -4,7 +4,7 @@ pragma solidity >=0.8.0;
 import {Auth, Authority} from "../Auth.sol";
 
 /// @notice Role based Authority that supports up to 256 roles.
-/// @author Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/auth/authorities/RolesAuthority.sol)
+/// @author Solmate (https://github.com/transmissions11/solmate/blob/main/src/auth/authorities/RolesAuthority.sol)
 /// @author Modified from Dappsys (https://github.com/dapphub/ds-roles/blob/master/src/roles.sol)
 contract RolesAuthority is Auth, Authority {
     /*//////////////////////////////////////////////////////////////

src/mixins/ERC4626.sol

@@ -6,7 +6,7 @@ import {SafeTransferLib} from "../utils/SafeTransferLib.sol";
 import {FixedPointMathLib} from "../utils/FixedPointMathLib.sol";
 
 /// @notice Minimal ERC4626 tokenized Vault implementation.
-/// @author Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/mixins/ERC4626.sol)
+/// @author Solmate (https://github.com/transmissions11/solmate/blob/main/src/mixins/ERC4626.sol)
 abstract contract ERC4626 is ERC20 {
     using SafeTransferLib for ERC20;
     using FixedPointMathLib for uint256;

src/test/Auth.t.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
-pragma solidity 0.8.10;
+pragma solidity 0.8.15;
 
 import {DSTestPlus} from "./utils/DSTestPlus.sol";
 import {MockAuthChild} from "./utils/mocks/MockAuthChild.sol";
@@ -24,8 +24,8 @@ contract AuthTest is DSTestPlus {
         mockAuthChild = new MockAuthChild();
     }
 
-    function testSetOwnerAsOwner() public {
-        mockAuthChild.setOwner(address(0xBEEF));
+    function testTransferOwnershipAsOwner() public {
+        mockAuthChild.transferOwnership(address(0xBEEF));
         assertEq(mockAuthChild.owner(), address(0xBEEF));
     }
 
@@ -38,21 +38,21 @@ contract AuthTest is DSTestPlus {
         mockAuthChild.updateFlag();
     }
 
-    function testSetOwnerWithPermissiveAuthority() public {
+    function testTransferOwnershipWithPermissiveAuthority() public {
         mockAuthChild.setAuthority(new MockAuthority(true));
-        mockAuthChild.setOwner(address(0));
-        mockAuthChild.setOwner(address(this));
+        mockAuthChild.transferOwnership(address(0));
+        mockAuthChild.transferOwnership(address(this));
     }
 
     function testSetAuthorityWithPermissiveAuthority() public {
         mockAuthChild.setAuthority(new MockAuthority(true));
-        mockAuthChild.setOwner(address(0));
+        mockAuthChild.transferOwnership(address(0));
         mockAuthChild.setAuthority(Authority(address(0xBEEF)));
     }
 
     function testCallFunctionWithPermissiveAuthority() public {
         mockAuthChild.setAuthority(new MockAuthority(true));
-        mockAuthChild.setOwner(address(0));
+        mockAuthChild.transferOwnership(address(0));
         mockAuthChild.updateFlag();
     }
 
@@ -61,51 +61,51 @@ contract AuthTest is DSTestPlus {
         mockAuthChild.setAuthority(new MockAuthority(true));
     }
 
-    function testFailSetOwnerAsNonOwner() public {
-        mockAuthChild.setOwner(address(0));
-        mockAuthChild.setOwner(address(0xBEEF));
+    function testFailTransferOwnershipAsNonOwner() public {
+        mockAuthChild.transferOwnership(address(0));
+        mockAuthChild.transferOwnership(address(0xBEEF));
     }
 
     function testFailSetAuthorityAsNonOwner() public {
-        mockAuthChild.setOwner(address(0));
+        mockAuthChild.transferOwnership(address(0));
         mockAuthChild.setAuthority(Authority(address(0xBEEF)));
     }
 
     function testFailCallFunctionAsNonOwner() public {
-        mockAuthChild.setOwner(address(0));
+        mockAuthChild.transferOwnership(address(0));
         mockAuthChild.updateFlag();
     }
 
-    function testFailSetOwnerWithRestrictiveAuthority() public {
+    function testFailTransferOwnershipWithRestrictiveAuthority() public {
         mockAuthChild.setAuthority(new MockAuthority(false));
-        mockAuthChild.setOwner(address(0));
-        mockAuthChild.setOwner(address(this));
+        mockAuthChild.transferOwnership(address(0));
+        mockAuthChild.transferOwnership(address(this));
     }
 
     function testFailSetAuthorityWithRestrictiveAuthority() public {
         mockAuthChild.setAuthority(new MockAuthority(false));
-        mockAuthChild.setOwner(address(0));
+        mockAuthChild.transferOwnership(address(0));
         mockAuthChild.setAuthority(Authority(address(0xBEEF)));
     }
 
     function testFailCallFunctionWithRestrictiveAuthority() public {
         mockAuthChild.setAuthority(new MockAuthority(false));
-        mockAuthChild.setOwner(address(0));
+        mockAuthChild.transferOwnership(address(0));
         mockAuthChild.updateFlag();
     }
 
-    function testFailSetOwnerAsOwnerWithOutOfOrderAuthority() public {
+    function testFailTransferOwnershipAsOwnerWithOutOfOrderAuthority() public {
         mockAuthChild.setAuthority(new OutOfOrderAuthority());
-        mockAuthChild.setOwner(address(0));
+        mockAuthChild.transferOwnership(address(0));
     }
 
     function testFailCallFunctionAsOwnerWithOutOfOrderAuthority() public {
         mockAuthChild.setAuthority(new OutOfOrderAuthority());
         mockAuthChild.updateFlag();
     }
 
-    function testSetOwnerAsOwner(address newOwner) public {
-        mockAuthChild.setOwner(newOwner);
+    function testTransferOwnershipAsOwner(address newOwner) public {
+        mockAuthChild.transferOwnership(newOwner);
         assertEq(mockAuthChild.owner(), newOwner);
     }
 
@@ -114,79 +114,79 @@ contract AuthTest is DSTestPlus {
         assertEq(address(mockAuthChild.authority()), address(newAuthority));
     }
 
-    function testSetOwnerWithPermissiveAuthority(address deadOwner, address newOwner) public {
+    function testTransferOwnershipWithPermissiveAuthority(address deadOwner, address newOwner) public {
         if (deadOwner == address(this)) deadOwner = address(0);
 
         mockAuthChild.setAuthority(new MockAuthority(true));
-        mockAuthChild.setOwner(deadOwner);
-        mockAuthChild.setOwner(newOwner);
+        mockAuthChild.transferOwnership(deadOwner);
+        mockAuthChild.transferOwnership(newOwner);
     }
 
     function testSetAuthorityWithPermissiveAuthority(address deadOwner, Authority newAuthority) public {
         if (deadOwner == address(this)) deadOwner = address(0);
 
         mockAuthChild.setAuthority(new MockAuthority(true));
-        mockAuthChild.setOwner(deadOwner);
+        mockAuthChild.transferOwnership(deadOwner);
         mockAuthChild.setAuthority(newAuthority);
     }
 
     function testCallFunctionWithPermissiveAuthority(address deadOwner) public {
         if (deadOwner == address(this)) deadOwner = address(0);
 
         mockAuthChild.setAuthority(new MockAuthority(true));
-        mockAuthChild.setOwner(deadOwner);
+        mockAuthChild.transferOwnership(deadOwner);
         mockAuthChild.updateFlag();
     }
 
-    function testFailSetOwnerAsNonOwner(address deadOwner, address newOwner) public {
+    function testFailTransferOwnershipAsNonOwner(address deadOwner, address newOwner) public {
         if (deadOwner == address(this)) deadOwner = address(0);
 
-        mockAuthChild.setOwner(deadOwner);
-        mockAuthChild.setOwner(newOwner);
+        mockAuthChild.transferOwnership(deadOwner);
+        mockAuthChild.transferOwnership(newOwner);
     }
 
     function testFailSetAuthorityAsNonOwner(address deadOwner, Authority newAuthority) public {
         if (deadOwner == address(this)) deadOwner = address(0);
 
-        mockAuthChild.setOwner(deadOwner);
+        mockAuthChild.transferOwnership(deadOwner);
         mockAuthChild.setAuthority(newAuthority);
     }
 
     function testFailCallFunctionAsNonOwner(address deadOwner) public {
         if (deadOwner == address(this)) deadOwner = address(0);
 
-        mockAuthChild.setOwner(deadOwner);
+        mockAuthChild.transferOwnership(deadOwner);
         mockAuthChild.updateFlag();
     }
 
-    function testFailSetOwnerWithRestrictiveAuthority(address deadOwner, address newOwner) public {
+    function testFailTransferOwnershipWithRestrictiveAuthority(address deadOwner, address newOwner) public {
         if (deadOwner == address(this)) deadOwner = address(0);
 
         mockAuthChild.setAuthority(new MockAuthority(false));
-        mockAuthChild.setOwner(deadOwner);
-        mockAuthChild.setOwner(newOwner);
+        mockAuthChild.transferOwnership(deadOwner);
+        mockAuthChild.transferOwnership(newOwner);
     }
 
     function testFailSetAuthorityWithRestrictiveAuthority(address deadOwner, Authority newAuthority) public {
         if (deadOwner == address(this)) deadOwner = address(0);
 
         mockAuthChild.setAuthority(new MockAuthority(false));
-        mockAuthChild.setOwner(deadOwner);
+        mockAuthChild.transferOwnership(deadOwner);
         mockAuthChild.setAuthority(newAuthority);
     }
 
     function testFailCallFunctionWithRestrictiveAuthority(address deadOwner) public {
         if (deadOwner == address(this)) deadOwner = address(0);
 
         mockAuthChild.setAuthority(new MockAuthority(false));
-        mockAuthChild.setOwner(deadOwner);
+        mockAuthChild.transferOwnership(deadOwner);
         mockAuthChild.updateFlag();
     }
 
-    function testFailSetOwnerAsOwnerWithOutOfOrderAuthority(address deadOwner) public {
+    function testFailTransferOwnershipAsOwnerWithOutOfOrderAuthority(address deadOwner) public {
         if (deadOwner == address(this)) deadOwner = address(0);
 
         mockAuthChild.setAuthority(new OutOfOrderAuthority());
-        mockAuthChild.setOwner(deadOwner);
+        mockAuthChild.transferOwnership(deadOwner);
     }
 }