suberra · zlace0x · Dec 8, 2022 · Dec 1, 2022 · Dec 1, 2022 · Dec 1, 2022
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/Openzeppelin/openzeppelin-contracts
-[submodule "lib/solmate"]
-	path = lib/solmate
-	url = https://github.com/transmissions11/solmate
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/solmate b/lib/solmate
diff --git a/src/Funnel.sol b/src/Funnel.sol
@@ -1,33 +1,29 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity 0.8.17;
 
-import { ERC20 } from "solmate/tokens/ERC20.sol";
-import { SafeTransferLib } from "solmate/utils/SafeTransferLib.sol";
-import { IERC20Metadata } from "openzeppelin-contracts/interfaces/IERC20Metadata.sol";
 import { Address } from "openzeppelin-contracts/utils/Address.sol";
 import { IERC1363Receiver } from "openzeppelin-contracts/interfaces/IERC1363Receiver.sol";
-import { IERC1271 } from "openzeppelin-contracts/interfaces/IERC1271.sol";
 import { Strings } from "openzeppelin-contracts/utils/Strings.sol";
 import { Initializable } from "openzeppelin-contracts/proxy/utils/Initializable.sol";
 
 import { IFunnel } from "./interfaces/IFunnel.sol";
+import { IERC20 } from 'openzeppelin-contracts/token/ERC20/IERC20.sol';
+import { SafeERC20 } from 'openzeppelin-contracts/token/ERC20/utils/SafeERC20.sol';
 import { IERC5827 } from "./interfaces/IERC5827.sol";
 import { IERC5827Proxy } from "./interfaces/IERC5827Proxy.sol";
 import { IERC5827Spender } from "./interfaces/IERC5827Spender.sol";
 import { IERC5827Payable } from "./interfaces/IERC5827Payable.sol";
 import { MetaTxContext } from "./lib/MetaTxContext.sol";
-import { Nonces } from "./lib/Nonces.sol";
-import { EIP712 } from "./lib/EIP712.sol";
 import { NativeMetaTransaction } from "./lib/NativeMetaTransaction.sol";
 
 contract Funnel is IFunnel, NativeMetaTransaction, MetaTxContext, Initializable {
-    using SafeTransferLib for ERC20;
+    using SafeERC20 for IERC20;
 
     /*//////////////////////////////////////////////////////////////
                             EIP-5827 STORAGE
     //////////////////////////////////////////////////////////////*/
 
-    ERC20 private _baseToken;
+    IERC20 private _baseToken;
 
     struct RenewableAllowance {
         uint256 maxAmount;
@@ -47,18 +43,19 @@ contract Funnel is IFunnel, NativeMetaTransaction, MetaTxContext, Initializable
 
     bytes32 internal INITIAL_DOMAIN_SEPARATOR;
 
-    bytes32 internal immutable PERMIT_RENEWABLE_TYPEHASH =
+    bytes32 internal constant PERMIT_RENEWABLE_TYPEHASH =
         keccak256(
             "PermitRenewable(address owner,address spender,uint256 value,uint256 recoveryRate,uint256 nonce,uint256 deadline)"
         );
 
-    bytes32 internal immutable PERMIT_TYPEHASH =
+    bytes32 internal constant PERMIT_TYPEHASH =
         keccak256(
             "Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)"
         );
 
-    function initialize(address _token) public initializer {
-        _baseToken = ERC20(_token);
+    function initialize(address _token) external initializer {
+        require(_token != address(0));
+        _baseToken = IERC20(_token);
 
         INITIAL_CHAIN_ID = block.chainid;
 
@@ -113,7 +110,7 @@ contract Funnel is IFunnel, NativeMetaTransaction, MetaTxContext, Initializable
         uint8 v,
         bytes32 r,
         bytes32 s
-    ) public virtual {
+    ) external virtual {
         require(deadline >= block.timestamp, "PERMIT_DEADLINE_EXPIRED");
 
         uint256 nonce;
@@ -139,7 +136,7 @@ contract Funnel is IFunnel, NativeMetaTransaction, MetaTxContext, Initializable
         uint8 v,
         bytes32 r,
         bytes32 s
-    ) public virtual {
+    ) external virtual {
         require(deadline >= block.timestamp, "PERMIT_DEADLINE_EXPIRED");
 
         uint256 nonce;
@@ -165,8 +162,7 @@ contract Funnel is IFunnel, NativeMetaTransaction, MetaTxContext, Initializable
     }
 
     function approve(address _spender, uint256 _value)
-        public
-        override
+        external
         returns (bool success)
     {
         _approve(_msgSender(), _spender, _value, 0);
@@ -177,7 +173,7 @@ contract Funnel is IFunnel, NativeMetaTransaction, MetaTxContext, Initializable
         address _spender,
         uint256 _value,
         uint256 _recoveryRate
-    ) public returns (bool success) {
+    ) external returns (bool success) {
         _approve(_msgSender(), _spender, _value, _recoveryRate);
         return true;
     }
@@ -228,7 +224,7 @@ contract Funnel is IFunnel, NativeMetaTransaction, MetaTxContext, Initializable
     /// @return amount initial and maximum allowance given to spender
     /// @return recoveryRate recovery amount per second
     function renewableAllowance(address _owner, address _spender)
-        public
+        external
         view
         returns (uint256 amount, uint256 recoveryRate)
     {
@@ -381,7 +377,7 @@ contract Funnel is IFunnel, NativeMetaTransaction, MetaTxContext, Initializable
         return address(_baseToken);
     }
 
-    function supportsInterface(bytes4 interfaceId) public view virtual returns (bool) {
+    function supportsInterface(bytes4 interfaceId) external pure returns (bool) {
         return
             interfaceId == type(IERC5827).interfaceId ||
             interfaceId == type(IERC5827Payable).interfaceId ||
@@ -398,7 +394,8 @@ contract Funnel is IFunnel, NativeMetaTransaction, MetaTxContext, Initializable
     }
 
     function transfer(address to, uint256 amount) external returns (bool) {
-        return _baseToken.transferFrom(_msgSender(), to, amount);
+        _baseToken.safeTransferFrom(_msgSender(), to, amount);
+        return true;
     }
 
     fallback() external {

diff --git a/src/FunnelFactory.sol b/src/FunnelFactory.sol
@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity 0.8.17;
 
 import { IFunnelFactory } from "./interfaces/IFunnelFactory.sol";
-import { IERC5827 } from "./interfaces/IERC5827.sol";
 import { IERC5827Proxy } from "./interfaces/IERC5827Proxy.sol";
 import { Funnel } from "./Funnel.sol";
 import { Clones } from "openzeppelin-contracts/proxy/Clones.sol";
@@ -16,22 +15,24 @@ contract FunnelFactory is IFunnelFactory {
     address public funnelImplementation;
 
     constructor(address _funnelImplementation) {
+        require(_funnelImplementation != address(0));
         funnelImplementation = _funnelImplementation;
     }
 
     /**
      * @dev Deploys a new Funnel contract
      * Throws if `_tokenAddress` has already been deployed
      */
-    function deployFunnelForToken(address _tokenAddress)
-        public
-        returns (address _funnelAddress)
-    {
+    function deployFunnelForToken(
+        address _tokenAddress
+    ) external returns (address _funnelAddress) {
         if (deployments[_tokenAddress] != address(0)) {
             revert FunnelAlreadyDeployed();
         }
 
-        if (_tokenAddress.code.length == 0) revert InvalidToken();
+        if (_tokenAddress.code.length == 0) {
+            revert InvalidToken();
+        }
 
         _funnelAddress = _deployFunnel(_tokenAddress);
         deployments[_tokenAddress] = _funnelAddress;
@@ -55,11 +56,9 @@ contract FunnelFactory is IFunnelFactory {
      * @dev Returns the Funnel contract address for a given token address
      * Reverts with FunnelNotDeployed if `_tokenAddress` has not been deployed
      */
-    function getFunnelForToken(address _tokenAddress)
-        public
-        view
-        returns (address _funnelAddress)
-    {
+    function getFunnelForToken(
+        address _tokenAddress
+    ) public view returns (address _funnelAddress) {
         if (deployments[_tokenAddress] == address(0)) {
             revert FunnelNotDeployed();
         }
@@ -70,12 +69,16 @@ contract FunnelFactory is IFunnelFactory {
     /**
      * @dev Returns true if contract address is a deployed Funnel contract
      */
-    function isFunnel(address _funnelAddress) public view returns (bool) {
+    function isFunnel(address _funnelAddress) external view returns (bool) {
         // Not a deployed contract
-        if (_funnelAddress.code.length == 0) return false;
+        if (_funnelAddress.code.length == 0) {
+            return false;
+        }
 
         try IERC5827Proxy(_funnelAddress).baseToken() returns (address baseToken) {
-            if (baseToken == address(0)) return false;
+            if (baseToken == address(0)) {
+                return false;
+            }
             return _funnelAddress == getFunnelForToken(baseToken);
         } catch {
             return false;

diff --git a/src/interfaces/IERC5827.sol b/src/interfaces/IERC5827.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: CC0-1.0
-pragma solidity ^0.8.15;
+pragma solidity 0.8.17;
 import "openzeppelin-contracts/interfaces/IERC20.sol";
 import "openzeppelin-contracts/interfaces/IERC165.sol";
 

diff --git a/src/interfaces/IERC5827Payable.sol b/src/interfaces/IERC5827Payable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity 0.8.17;
 
 import "openzeppelin-contracts/interfaces/IERC165.sol";
 

diff --git a/src/interfaces/IERC5827Proxy.sol b/src/interfaces/IERC5827Proxy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: CC0-1.0
-pragma solidity ^0.8.15;
+pragma solidity 0.8.17;
 
 interface IERC5827Proxy {
     /*

diff --git a/src/interfaces/IERC5827Spender.sol b/src/interfaces/IERC5827Spender.sol
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.0;
+pragma solidity 0.8.17;
 
 /**
  * @title IERC5827Spender defines a callback function that is called when renewable allowance is approved

diff --git a/src/interfaces/IFunnel.sol b/src/interfaces/IFunnel.sol
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity 0.8.17;
 
-import { IERC1363 } from "openzeppelin-contracts/interfaces/IERC1363.sol";
-import { IERC165 } from "openzeppelin-contracts/interfaces/IERC165.sol";
 import { IERC5827 } from "./IERC5827.sol";
 import { IERC5827Payable } from "./IERC5827Payable.sol";
 import { IERC5827Proxy } from "./IERC5827Proxy.sol";

diff --git a/src/interfaces/IFunnelFactory.sol b/src/interfaces/IFunnelFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.15;
+pragma solidity 0.8.17;
 
 interface IFunnelFactory {
     error FunnelNotDeployed();

diff --git a/src/lib/NativeMetaTransaction.sol b/src/lib/NativeMetaTransaction.sol
@@ -9,7 +9,7 @@ abstract contract NativeMetaTransaction is EIP712, Nonces {
         0x23d10def3caacba2e4042e0c75d44a42d2558aabcf5ce951d0642a8032e1e653;
 
     event MetaTransactionExecuted(
-        address userAddress,
+        address indexed userAddress,
         address payable relayerAddress,
         bytes functionSignature
     );

diff --git a/src/mocks/MockERC1271.sol b/src/mocks/MockERC1271.sol
@@ -1,5 +1,6 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.15;
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
+
 
 import { IERC1271 } from "openzeppelin-contracts/interfaces/IERC1271.sol";
 import { IERC20 } from "openzeppelin-contracts/interfaces/IERC20.sol";

diff --git a/src/mocks/MockSpenderReceiver.sol b/src/mocks/MockSpenderReceiver.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.15;
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
 
 import { IERC1363Receiver } from "openzeppelin-contracts/interfaces/IERC1363Receiver.sol";
 import { IERC5827Spender } from "../interfaces/IERC5827Spender.sol";

diff --git a/src/mocks/TestERC20Token.sol b/src/mocks/TestERC20Token.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.15;
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
 
 import { ERC20 } from "openzeppelin-contracts/token/ERC20/ERC20.sol";
 import { ERC20Permit } from "openzeppelin-contracts/token/ERC20/extensions/draft-ERC20Permit.sol";

diff --git a/test/ERC20TestSuite.sol b/test/ERC20TestSuite.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.15;
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
 
 import { TestSetup } from "./TestSetup.sol";
 import { IERC20 } from "openzeppelin-contracts/interfaces/IERC20.sol";

diff --git a/test/ERC5827TestSuite.sol b/test/ERC5827TestSuite.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.15;
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
 
 import { TestSetup } from "./TestSetup.sol";
 import { IERC5827 } from "../src/interfaces/IERC5827.sol";

diff --git a/test/Funnel.t.sol b/test/Funnel.t.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.15;
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
 
 import "forge-std/Test.sol";
 import { ERC20PresetFixedSupply, ERC20 } from "openzeppelin-contracts/token/ERC20/presets/ERC20PresetFixedSupply.sol";

diff --git a/test/FunnelERC20.t.sol b/test/FunnelERC20.t.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.15;
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
 
 import "forge-std/Test.sol";
 import { ERC20PresetMinterPauser } from "openzeppelin-contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";

diff --git a/test/FunnelFactory.t.sol b/test/FunnelFactory.t.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.15;
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
 
 import { console } from "forge-std/console.sol";
 import "forge-std/Test.sol";

diff --git a/test/MockSpenderReceiver.t.sol b/test/MockSpenderReceiver.t.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.15;
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
 
 import "forge-std/Test.sol";
 import { IERC1363Receiver } from "openzeppelin-contracts/interfaces/IERC1363Receiver.sol";
+92 −0		.github/workflows/ci.yml
+0 −27		.github/workflows/tests.yml
+1 −1		.gitignore
+1 −1		LICENSE-APACHE
+1 −1		LICENSE-MIT
+8 −4		README.md
+18 −0		foundry.toml
+1 −1		lib/ds-test
+3 −3		package.json
+28 −0		src/Common.sol
+14 −0		src/Components.sol
+9 −39		src/Script.sol
+209 −0		src/StdAssertions.sol
+90 −0		src/StdChains.sol
+543 −0		src/StdCheats.sol
+15 −0		src/StdError.sol
+115 −54		src/StdJson.sol
+43 −0		src/StdMath.sol
+327 −0		src/StdStorage.sol
+85 −0		src/StdUtils.sol
+6 −1,133		src/Test.sol
+199 −149		src/Vm.sol
+6 −6		src/console2.sol
+105 −0		src/interfaces/IERC1155.sol
+12 −0		src/interfaces/IERC165.sol
+43 −0		src/interfaces/IERC20.sol
+190 −0		src/interfaces/IERC4626.sol
+164 −0		src/interfaces/IERC721.sol
+0 −20		src/test/Script.t.sol
+0 −200		src/test/StdMath.t.sol
+65 −80		test/StdAssertions.t.sol
+61 −0		test/StdChains.t.sol
+66 −78		test/StdCheats.t.sol
+5 −11		test/StdError.t.sol
+197 −0		test/StdMath.t.sol
+46 −84		test/StdStorage.t.sol
+107 −0		test/StdUtils.t.sol
+10 −0		test/compilation/CompilationScript.sol
+10 −0		test/compilation/CompilationScriptBase.sol
+10 −0		test/compilation/CompilationTest.sol
+10 −0		test/compilation/CompilationTestBase.sol
+0 −0		test/fixtures/broadcast.log.json
+3 −0		contracts/token/ERC20/extensions/ERC20Votes.sol
+14 −3		contracts/token/ERC20/extensions/ERC4626.sol
+17 −7		contracts/utils/Checkpoints.sol
+1 −1		contracts/utils/math/Math.sol
+1 −1		docs/modules/ROOT/pages/erc721.adoc
+7 −3		scripts/generate/templates/Checkpoints.js
+1 −1		test/token/ERC1155/extensions/ERC1155URIStorage.test.js
+19 −0		test/token/ERC20/extensions/ERC4626.t.sol
+1 −1		test/utils/Checkpoints.test.js