@zoralabs/coins 2.2.1 → 2.3.1

package/test/utils/hookmate/interfaces/router/PathKey.sol

@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.26;
+
+import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
+import {IHooks} from "@uniswap/v4-core/src/interfaces/IHooks.sol";
+import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";
+
+struct PathKey {
+    Currency intermediateCurrency;
+    uint24 fee;
+    int24 tickSpacing;
+    IHooks hooks;
+    bytes hookData;
+}
+
+using PathKeyLibrary for PathKey global;
+
+/// @title PathKey Library
+/// @notice Memory-oriented version of v4-periphery/src/libraries/PathKeyLibrary.sol
+/// @dev Handles PathKey operations in memory rather than calldata for router operations
+library PathKeyLibrary {
+    /// @notice Get the pool and swap direction for a given PathKey
+    /// @param params the given PathKey
+    /// @param currencyIn the input currency
+    /// @return poolKey the pool key of the swap
+    /// @return zeroForOne the direction of the swap, true if currency0 is being swapped for currency1
+    function getPoolAndSwapDirection(PathKey memory params, Currency currencyIn) internal pure returns (PoolKey memory poolKey, bool zeroForOne) {
+        Currency currencyOut = params.intermediateCurrency;
+        (Currency currency0, Currency currency1) = currencyIn < currencyOut ? (currencyIn, currencyOut) : (currencyOut, currencyIn);
+
+        zeroForOne = currencyIn == currency0;
+        poolKey = PoolKey(currency0, currency1, params.fee, params.tickSpacing, params.hooks);
+    }
+}

package/test/utils/hookmate/test/utils/SwapFeeEventAsserter.sol

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.26;
+
+import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
+import {Vm} from "forge-std/Vm.sol";
+
+/**
+ * @title Swap Fee Event Asserter
+ * @author saucepoint, akshatmittal
+ */
+library SwapFeeEventAsserter {
+    function getSwapFeeFromEvent(Vm.Log[] memory recordedLogs) internal pure returns (uint24 fee) {
+        for (uint256 i; i < recordedLogs.length; i++) {
+            if (recordedLogs[i].topics[0] == IPoolManager.Swap.selector) {
+                (, , , , , fee) = abi.decode(recordedLogs[i].data, (int128, int128, uint160, uint128, int24, uint24));
+                break;
+            }
+        }
+    }
+
+    function assertSwapFee(Vm vm, Vm.Log[] memory recordedLogs, uint24 expectedFee) internal pure {
+        vm.assertEq(getSwapFeeFromEvent(recordedLogs), expectedFee);
+    }
+}

package/wagmi.config.ts

@@ -14,11 +14,11 @@ export default defineConfig({
         "CreatorCoin",
         "ZoraFactoryImpl",
         "IUniswapV3Pool",
-        "BuySupplyWithSwapRouterHook",
         "IPoolConfigEncoding",
         "IUniversalRouter",
         "IPermit2",
         "AutoSwapper",
+        "BuySupplyWithV4SwapHook",
       ].map((contractName) => `${contractName}.json`),
     }),
   ],

package/abis/CoinConstants.json

@@ -1,54 +0,0 @@
-[
-  {
-    "type": "function",
-    "name": "CREATOR_LAUNCH_REWARD",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "MAX_TOTAL_SUPPLY",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "MIN_ORDER_SIZE",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "POOL_LAUNCH_SUPPLY",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  }
-]

package/abis/CoinRewardsV4.json

@@ -1,67 +0,0 @@
-[
-  {
-    "type": "function",
-    "name": "CREATE_REFERRAL_REWARD_BPS",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "CREATOR_REWARD_BPS",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "DOPPLER_REWARD_BPS",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "LP_REWARD_BPS",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "TRADE_REFERRAL_REWARD_BPS",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  }
-]

package/src/libs/CreatorCoinConstants.sol

@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: ZORA-DELAYED-OSL-v1
-// This software is licensed under the Zora Delayed Open Source License.
-// Under this license, you may use, copy, modify, and distribute this software for
-// non-commercial purposes only. Commercial use and competitive products are prohibited
-// until the "Open Date" (3 years from first public distribution or earlier at Zora's discretion),
-// at which point this software automatically becomes available under the MIT License.
-// Full license terms available at: https://docs.zora.co/coins/license
-pragma solidity ^0.8.23;
-
-library CreatorCoinConstants {
-    uint256 internal constant TOTAL_SUPPLY = 1_000_000_000e18; // 1b coins
-    uint256 internal constant CREATOR_VESTING_SUPPLY = 500_000_000e18; // 500m coins
-    uint256 internal constant CREATOR_VESTING_DURATION = 5 * 365 days; // 5 years
-    address internal constant CURRENCY = 0x1111111111166b7FE7bd91427724B487980aFc69;
-}

package/src/libs/MarketConstants.sol

@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
-
-library MarketConstants {
-    /// @dev Constant used to increase precision during calculations
-    uint256 internal constant WAD = 1e18;
-
-    /// @notice The number of coins allocated to the liquidity pool for content coins
-    /// @dev 990 million coins
-    uint256 internal constant CONTENT_COIN_MARKET_SUPPLY = 990_000_000 * WAD;
-
-    /// @notice The number of coins allocated to the liquidity pool for creator coins
-    /// @dev 500 million coins
-    uint256 internal constant CREATOR_COIN_MARKET_SUPPLY = 500_000_000 * WAD;
-
-    /// @notice The LP fee
-    /// @dev 10000 basis points = 1%
-    uint24 internal constant LP_FEE_V4 = 10_000;
-
-    /// @notice The spacing for 1% pools
-    /// @dev 200 ticks
-    int24 internal constant TICK_SPACING = 200;
-}

package/src/utils/uniswap/BytesLib.sol

@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * @title Solidity Bytes Arrays Utils
- * @author Gonçalo Sá <goncalo.sa@consensys.net>
- *
- * @dev Bytes tightly packed arrays utility library for ethereum contracts written in Solidity.
- *      The library lets you concatenate, slice and type cast bytes arrays both in memory and storage.
- */
-pragma solidity ^0.8.28;
-
-library BytesLib {
-    function toAddress(bytes memory _bytes, uint256 _start) internal pure returns (address) {
-        require(_start + 20 >= _start, "toAddress_overflow");
-        require(_bytes.length >= _start + 20, "toAddress_outOfBounds");
-        address tempAddress;
-
-        assembly {
-            tempAddress := div(mload(add(add(_bytes, 0x20), _start)), 0x1000000000000000000000000)
-        }
-
-        return tempAddress;
-    }
-
-    function toUint24(bytes memory _bytes, uint256 _start) internal pure returns (uint24) {
-        require(_start + 3 >= _start, "toUint24_overflow");
-        require(_bytes.length >= _start + 3, "toUint24_outOfBounds");
-        uint24 tempUint;
-
-        assembly {
-            tempUint := mload(add(add(_bytes, 0x3), _start))
-        }
-
-        return tempUint;
-    }
-}

package/src/utils/uniswap/Path.sol

@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.28;
-
-import "./BytesLib.sol";
-
-// copied from https://github.com/Uniswap/v3-periphery/blob/main/contracts/libraries/Path.sol
-// with certain functionality removed
-
-/// @title Functions for manipulating path data for multihop swaps
-library Path {
-    using BytesLib for bytes;
-
-    /// @dev The length of the bytes encoded address
-    uint256 private constant ADDR_SIZE = 20;
-    /// @dev The length of the bytes encoded fee
-    uint256 private constant FEE_SIZE = 3;
-
-    /// @dev The offset of a single token address and pool fee
-    uint256 private constant NEXT_OFFSET = ADDR_SIZE + FEE_SIZE;
-
-    /// @notice Decodes the first pool in path
-    /// @param path The bytes encoded swap path
-    /// @return tokenA The first token of the given pool
-    /// @return tokenB The second token of the given pool
-    /// @return fee The fee level of the pool
-    function decodeFirstPool(bytes memory path) internal pure returns (address tokenA, address tokenB, uint24 fee) {
-        tokenA = path.toAddress(0);
-        fee = path.toUint24(ADDR_SIZE);
-        tokenB = path.toAddress(NEXT_OFFSET);
-    }
-}