Honey x402 plus minor fixes (#93)

* Feat/honey eip3009 (#91)

* feat/eip-3009 integration

* using OZ libs for signature verification

* delete unused interface

* refactor EIP3009

* rename:eip3009 error strings

* version

* nits

* lint

* add eip3009 tests

* eip2612 impl

* fix test revert

* make version EIP712 specific

* nit

* introduce diamond inheritence

* nits

* updated honey impl address

* Feat honey v3 (#92)

* Feat(Honey): Skip paused vault inside withdrawAllFee (#79)

* skip paused vault inside withdrawAllFee

* nit

* add comment

* nit

* nit

* honey: migrate collected fee for new receiver (#80)

* honey: migrate collected fee for new receiver

* comment

* Fix: Refund leftover honey from factory wrapper (#81)

* refund lefterover honey in factory wrapper

* nit

* nit

* update honeyFactory impl address on testnet

* test domain separator

* keep same permit errors

* override versionHash

* update predicted addresses

Author: sj448

script/base/actions/ValidateHoneyUpgrade.s.sol

@@ -34,7 +34,7 @@ contract ValidateHoneyUpgrade is Script {
         console2.log("HoneyFactoryReader can be upgraded successfully.");
 
         // check Honey safe upgrade
-        options.referenceContract = "Honey_V0.sol:Honey_V0";
+        options.referenceContract = "Honey_V1.sol:Honey_V1";
         Upgrades.validateUpgrade("Honey.sol", options);
         console2.log("Honey can be upgraded successfully.");
 

script/honey/HoneyAddresses.sol

@@ -35,13 +35,13 @@ abstract contract HoneyAddressBook {
     function _getMainnetHoneyAddresses() private pure returns (HoneyAddresses memory) {
         return HoneyAddresses({
             honey: 0xFCBD14DC51f0A4d49d5E53C2E0950e0bC26d0Dce,
-            honeyImpl: 0x3caE8dC9A2E2D2106CE1a0ffDBdF21AbcC870bF8,
+            honeyImpl: 0x96b1a552A97dA5503343d0F9FF2766c616E62905,
             honeyFactory: 0xA4aFef880F5cE1f63c9fb48F661E27F8B4216401,
             honeyFactoryReader: 0x285e147060CDc5ba902786d3A471224ee6cE0F91,
-            honeyFactoryImpl: 0xF51C5a7B48410c4c4f99d353622d365481BDE7e7,
+            honeyFactoryImpl: 0x6331F0a4E0220a14Be27BD31aF091F0a1AC036A1,
             honeyFactoryReaderImpl: 0x91C54526A9f8D0391F64392f24C7E8ff94A5f4fB,
             collateralVaultImpl: 0xAa4f2Bc7a06c89BEAB5125D82e25D4166b4a4681,
-            honeyFactoryPythWrapper: 0x4b7cb1c197f8EE4d309866B16C2c12E3B4E7E606
+            honeyFactoryPythWrapper: 0xF5686e448BE103beA465105bEb9d284a34ae7e95
         });
     }
 
@@ -51,13 +51,13 @@ abstract contract HoneyAddressBook {
     function _getTestnetHoneyAddresses() private pure returns (HoneyAddresses memory) {
         return HoneyAddresses({
             honey: 0xFCBD14DC51f0A4d49d5E53C2E0950e0bC26d0Dce,
-            honeyImpl: 0x114Af1Ad4c6FeBCB9222B7D6AF6141E7a34775Fe,
+            honeyImpl: 0xD1886E0659Ed88812aeA75862Cc9891097c25542,
             honeyFactory: 0xA4aFef880F5cE1f63c9fb48F661E27F8B4216401,
             honeyFactoryReader: 0x285e147060CDc5ba902786d3A471224ee6cE0F91,
-            honeyFactoryImpl: 0x3Ba6452ED6C57f4E1A6334E0C3b810c481AdaC64,
+            honeyFactoryImpl: 0xD38a1fD3E943a61066903889b8e0889EcAc6Dedd,
             honeyFactoryReaderImpl: 0x22ee76216B1b7E4f34CF1417da3E4773F7cbA8E6,
             collateralVaultImpl: 0xE3689043e7F860FbC0c814839cd7dF5022223172,
-            honeyFactoryPythWrapper: 0x4b7cb1c197f8EE4d309866B16C2c12E3B4E7E606
+            honeyFactoryPythWrapper: 0xE5Ad9BA751714ec8cdd554b5a9f12BFcA13980cB
         });
     }
 

src/base/EIP2612.sol

@@ -0,0 +1,120 @@
+/**
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright (c) 2023, Circle Internet Financial, LLC.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ---------------------------------------------------------------------
+ *
+ * Adapted and modified by Berachain for greater flexibility and reusability
+ */
+pragma solidity 0.8.26;
+
+import { ERC20 } from "solady/src/tokens/ERC20.sol";
+import { SignatureChecker } from "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
+import { MessageHashUtils } from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
+
+/**
+ * @title EIP-2612
+ * @notice Provide implementation for gas-abstracted approvals with smart account support
+ * @dev Extends ERC20 to use its EIP712 logic and EIP2612 nonce management.
+ */
+abstract contract EIP2612 is ERC20 {
+    // keccak256("Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)")
+    bytes32 public constant PERMIT_TYPEHASH = 0x6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c9;
+
+    /**
+     * @notice Verify a signed approval permit and execute if valid
+     * @dev Overrides Solady's permit to support smart account (EIP-1271) signatures.
+     * @param owner     Token owner's address (Authorizer)
+     * @param spender   Spender's address
+     * @param value     Amount of allowance
+     * @param deadline  The time at which the signature expires (unix time), or max uint256 value to signal no
+     * expiration
+     * @param v         v of the signature
+     * @param r         r of the signature
+     * @param s         s of the signature
+     */
+    function permit(
+        address owner,
+        address spender,
+        uint256 value,
+        uint256 deadline,
+        uint8 v,
+        bytes32 r,
+        bytes32 s
+    )
+        public
+        virtual
+        override
+    {
+        _permit(owner, spender, value, deadline, abi.encodePacked(r, s, v));
+    }
+
+    /**
+     * @notice Verify a signed approval permit and execute if valid (bytes signature version)
+     * @dev EOA wallet signatures should be packed in the order of r, s, v.
+     * @param owner      Token owner's address (Authorizer)
+     * @param spender    Spender's address
+     * @param value      Amount of allowance
+     * @param deadline   The time at which the signature expires (unix time), or max uint256 value to signal no
+     * expiration
+     * @param signature  Signature byte array signed by an EOA wallet or a contract wallet
+     */
+    function permit(
+        address owner,
+        address spender,
+        uint256 value,
+        uint256 deadline,
+        bytes memory signature
+    )
+        public
+        virtual
+    {
+        _permit(owner, spender, value, deadline, signature);
+    }
+
+    /**
+     * @notice Internal permit implementation with bytes signature
+     * @param owner      Token owner's address (Authorizer)
+     * @param spender    Spender's address
+     * @param value      Amount of allowance
+     * @param deadline   The time at which the signature expires (unix time), or max uint256 value to signal no
+     * expiration
+     * @param signature  Signature byte array signed by an EOA wallet or a contract wallet
+     */
+    function _permit(
+        address owner,
+        address spender,
+        uint256 value,
+        uint256 deadline,
+        bytes memory signature
+    )
+        internal
+    {
+        if (deadline < block.timestamp) {
+            revert PermitExpired();
+        }
+
+        bytes32 typedDataHash = MessageHashUtils.toTypedDataHash(
+            DOMAIN_SEPARATOR(), keccak256(abi.encode(PERMIT_TYPEHASH, owner, spender, value, nonces(owner), deadline))
+        );
+        _incrementNonce(owner);
+        if (!SignatureChecker.isValidSignatureNow(owner, typedDataHash, signature)) {
+            revert InvalidPermit();
+        }
+
+        _approve(owner, spender, value);
+    }
+}