@zoralabs/coins 1.1.2 → 2.1.0

package/test/utils/BaseTest.sol

@@ -12,8 +12,7 @@ import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/U
 import {IZoraFactory} from "../../src/interfaces/IZoraFactory.sol";
 import {ZoraFactoryImpl} from "../../src/ZoraFactoryImpl.sol";
 import {ZoraFactory} from "../../src/proxy/ZoraFactory.sol";
-import {Coin} from "../../src/Coin.sol";
-import {CoinV4} from "../../src/CoinV4.sol";
+import {ContentCoin} from "../../src/ContentCoin.sol";
 import {MultiOwnable} from "../../src/utils/MultiOwnable.sol";
 import {ICoin} from "../../src/interfaces/ICoin.sol";
 import {IERC7572} from "../../src/interfaces/IERC7572.sol";
@@ -32,7 +31,7 @@ import {ContentCoinHook} from "../../src/hooks/ContentCoinHook.sol";
 import {HooksDeployment} from "../../src/libs/HooksDeployment.sol";
 import {CoinConstants} from "../../src/libs/CoinConstants.sol";
 import {ProxyShim} from "./ProxyShim.sol";
-import {ICoinV4} from "../../src/interfaces/ICoinV4.sol";
+import {ICoin} from "../../src/interfaces/ICoin.sol";
 import {UniV4SwapHelper} from "../../src/libs/UniV4SwapHelper.sol";
 import {IPermit2} from "permit2/src/interfaces/IPermit2.sol";
 import {IUniversalRouter} from "@uniswap/universal-router/contracts/interfaces/IUniversalRouter.sol";
@@ -75,61 +74,30 @@ contract BaseTest is Test, ContractAddresses {
     IUniversalRouter internal router;
     IPoolManager internal poolManager;
     IV4Quoter internal quoter;
-    CoinV4 internal coinV4;
+    ContentCoin internal coinV4;
 
     ISwapRouter internal swapRouter;
     IAirlock internal airlock;
     Users internal users;
 
-    Coin internal coinV3Impl;
-    CoinV4 internal coinV4Impl;
+    // Coin internal coinV3Impl;
+    ContentCoin internal coinV4Impl;
     CreatorCoin internal creatorCoinImpl;
     ZoraFactoryImpl internal factoryImpl;
     IZoraFactory internal factory;
     ContentCoinHook internal contentCoinHook;
     CreatorCoinHook internal creatorCoinHook;
     HookUpgradeGate internal hookUpgradeGate;
-    Coin internal coin;
-
-    IUniswapV3Pool internal pool;
     int24 internal constant DEFAULT_DISCOVERY_TICK_LOWER = CoinConstants.DEFAULT_DISCOVERY_TICK_LOWER;
     int24 internal constant DEFAULT_DISCOVERY_TICK_UPPER = CoinConstants.DEFAULT_DISCOVERY_TICK_UPPER;
     uint16 internal constant DEFAULT_NUM_DISCOVERY_POSITIONS = CoinConstants.DEFAULT_NUM_DISCOVERY_POSITIONS;
     uint256 internal constant DEFAULT_DISCOVERY_SUPPLY_SHARE = CoinConstants.DEFAULT_DISCOVERY_SUPPLY_SHARE;
 
-    function _deployCoin() internal {
-        bytes memory poolConfig_ = _generatePoolConfig(
-            CoinConfigurationVersions.DOPPLER_UNI_V3_POOL_VERSION,
-            address(weth),
-            DEFAULT_DISCOVERY_TICK_LOWER,
-            DEFAULT_DISCOVERY_TICK_UPPER,
-            DEFAULT_NUM_DISCOVERY_POSITIONS,
-            DEFAULT_DISCOVERY_SUPPLY_SHARE
-        );
-        vm.prank(users.creator);
-        (address coinAddress, ) = factory.deploy(
-            users.creator,
-            _getDefaultOwners(),
-            "https://test.com",
-            "Testcoin",
-            "TEST",
-            poolConfig_,
-            users.platformReferrer,
-            0
-        );
-
-        coin = Coin(payable(coinAddress));
-        pool = IUniswapV3Pool(coin.poolAddress());
-
-        vm.label(address(coin), "COIN");
-        vm.label(address(pool), "POOL");
-    }
-
     function _defaultPoolConfig(address currency) internal pure returns (bytes memory) {
         return CoinConfigurationVersions.defaultDopplerMultiCurveUniV4(currency);
     }
 
-    function _deployV4Coin(address currency) internal returns (ICoinV4) {
+    function _deployV4Coin(address currency) internal returns (ICoin) {
         bytes32 salt = keccak256(abi.encode(bytes("randomSalt")));
         return _deployV4Coin(currency, address(0), salt);
     }
@@ -137,7 +105,7 @@ contract BaseTest is Test, ContractAddresses {
     string constant DEFAULT_NAME = "Testcoin";
     string constant DEFAULT_SYMBOL = "TEST";
 
-    function _deployV4Coin(address currency, address createReferral, bytes32 salt) internal returns (ICoinV4) {
+    function _deployV4Coin(address currency, address createReferral, bytes32 salt) internal returns (ICoin) {
         address[] memory owners = new address[](1);
         owners[0] = users.creator;
 
@@ -157,19 +125,17 @@ contract BaseTest is Test, ContractAddresses {
             salt
         );
 
-        coinV4 = CoinV4(payable(coinAddress));
+        coinV4 = ContentCoin(payable(coinAddress));
         return coinV4;
     }
 
+    function _deployV4Coin() internal returns (ICoin) {
+        // deploy with eth and no referral
+        return _deployV4Coin(address(0), address(0), bytes32(0));
+    }
+
     function _deployCoinUSDCPair() internal {
-        bytes memory poolConfig_ = _generatePoolConfig(
-            CoinConfigurationVersions.DOPPLER_UNI_V3_POOL_VERSION,
-            USDC_ADDRESS,
-            DEFAULT_DISCOVERY_TICK_LOWER,
-            DEFAULT_DISCOVERY_TICK_UPPER,
-            DEFAULT_NUM_DISCOVERY_POSITIONS,
-            DEFAULT_DISCOVERY_SUPPLY_SHARE
-        );
+        bytes memory poolConfig_ = _defaultPoolConfig(USDC_ADDRESS);
         vm.prank(users.creator);
         (address coinAddress, ) = factory.deploy(
             users.creator,
@@ -182,18 +148,14 @@ contract BaseTest is Test, ContractAddresses {
             0
         );
 
-        coin = Coin(payable(coinAddress));
-        pool = IUniswapV3Pool(coin.poolAddress());
-
-        vm.label(address(coin), "COIN");
-        vm.label(address(pool), "POOL");
+        vm.label(coinAddress, "COIN");
     }
 
-    function _swapSomeCurrencyForCoin(ICoinV4 _coin, address currency, uint128 amountIn, address trader) internal {
+    function _swapSomeCurrencyForCoin(ICoin _coin, address currency, uint128 amountIn, address trader) internal {
         _swapSomeCurrencyForCoin(_coin.getPoolKey(), _coin, currency, amountIn, trader);
     }
 
-    function _swapSomeCurrencyForCoin(PoolKey memory poolKey, ICoinV4 _coin, address currency, uint128 amountIn, address trader) internal {
+    function _swapSomeCurrencyForCoin(PoolKey memory poolKey, ICoin _coin, address currency, uint128 amountIn, address trader) internal {
         uint128 minAmountOut = uint128(0);
 
         (bytes memory commands, bytes[] memory inputs) = UniV4SwapHelper.buildExactInputSingleSwapCommand(
@@ -206,16 +168,20 @@ contract BaseTest is Test, ContractAddresses {
         );
 
         vm.startPrank(trader);
-        UniV4SwapHelper.approveTokenWithPermit2(permit2, address(router), currency, amountIn, uint48(block.timestamp + 1 days));
+        if (currency != address(0)) {
+            UniV4SwapHelper.approveTokenWithPermit2(permit2, address(router), currency, amountIn, uint48(block.timestamp + 1 days));
+        }
+
+        uint256 value = currency == address(0) ? amountIn : 0;
 
         // Execute the swap
         uint256 deadline = block.timestamp + 20;
-        router.execute(commands, inputs, deadline);
+        router.execute{value: value}(commands, inputs, deadline);
 
         vm.stopPrank();
     }
 
-    function _swapSomeCoinForCurrency(ICoinV4 _coin, address currency, uint128 amountIn, address trader) internal {
+    function _swapSomeCoinForCurrency(ICoin _coin, address currency, uint128 amountIn, address trader) internal {
         uint128 minAmountOut = uint128(0);
 
         (bytes memory commands, bytes[] memory inputs) = UniV4SwapHelper.buildExactInputSingleSwapCommand(
@@ -269,18 +235,22 @@ contract BaseTest is Test, ContractAddresses {
         (bytes32 contentCoinSalt, bytes32 creatorCoinSalt) = getSalts(trustedMessageSenders);
 
         contentCoinHook = ContentCoinHook(
-            address(
-                HooksDeployment.deployHookWithSalt(
-                    HooksDeployment.contentCoinCreationCode(V4_POOL_MANAGER, address(factory), trustedMessageSenders, address(hookUpgradeGate)),
-                    contentCoinSalt
+            payable(
+                address(
+                    HooksDeployment.deployHookWithSalt(
+                        HooksDeployment.contentCoinCreationCode(V4_POOL_MANAGER, address(factory), trustedMessageSenders, address(hookUpgradeGate)),
+                        contentCoinSalt
+                    )
                 )
             )
         );
         creatorCoinHook = CreatorCoinHook(
-            address(
-                HooksDeployment.deployHookWithSalt(
-                    HooksDeployment.creatorCoinHookCreationCode(V4_POOL_MANAGER, address(factory), trustedMessageSenders, address(hookUpgradeGate)),
-                    creatorCoinSalt
+            payable(
+                address(
+                    HooksDeployment.deployHookWithSalt(
+                        HooksDeployment.creatorCoinHookCreationCode(V4_POOL_MANAGER, address(factory), trustedMessageSenders, address(hookUpgradeGate)),
+                        creatorCoinSalt
+                    )
                 )
             )
         );
@@ -318,23 +288,16 @@ contract BaseTest is Test, ContractAddresses {
 
         ProxyShim mockUpgradeableImpl = new ProxyShim();
         factory = IZoraFactory(address(new ZoraFactory(address(mockUpgradeableImpl))));
-        coinV3Impl = new Coin(users.feeRecipient, address(protocolRewards), WETH_ADDRESS, V3_FACTORY, SWAP_ROUTER, DOPPLER_AIRLOCK);
 
         hookUpgradeGate = new HookUpgradeGate(users.factoryOwner);
 
         _deployHooks();
 
-        coinV4Impl = new CoinV4(users.feeRecipient, address(protocolRewards), IPoolManager(V4_POOL_MANAGER), DOPPLER_AIRLOCK);
+        coinV4Impl = new ContentCoin(users.feeRecipient, address(protocolRewards), IPoolManager(V4_POOL_MANAGER), DOPPLER_AIRLOCK);
 
         creatorCoinImpl = new CreatorCoin(users.feeRecipient, address(protocolRewards), IPoolManager(V4_POOL_MANAGER), DOPPLER_AIRLOCK);
 
-        factoryImpl = new ZoraFactoryImpl(
-            address(coinV3Impl),
-            address(coinV4Impl),
-            address(creatorCoinImpl),
-            address(contentCoinHook),
-            address(creatorCoinHook)
-        );
+        factoryImpl = new ZoraFactoryImpl(address(coinV4Impl), address(creatorCoinImpl), address(contentCoinHook), address(creatorCoinHook));
         UUPSUpgradeable(address(factory)).upgradeToAndCall(address(factoryImpl), "");
         factory = IZoraFactory(address(factory));
 
@@ -411,15 +374,7 @@ contract BaseTest is Test, ContractAddresses {
     }
 
     function _generatePoolConfig(address currency_) internal pure returns (bytes memory) {
-        return
-            _generatePoolConfig(
-                CoinConfigurationVersions.DOPPLER_UNI_V3_POOL_VERSION,
-                currency_,
-                DEFAULT_DISCOVERY_TICK_LOWER,
-                DEFAULT_DISCOVERY_TICK_UPPER,
-                DEFAULT_NUM_DISCOVERY_POSITIONS,
-                DEFAULT_DISCOVERY_SUPPLY_SHARE
-            );
+        return CoinConfigurationVersions.defaultDopplerMultiCurveUniV4(currency_);
     }
 
     function _generatePoolConfig(

package/test/utils/FeeEstimatorHook.sol

@@ -11,7 +11,7 @@ import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";
 import {CoinCommon} from "../../src/libs/CoinCommon.sol";
 import {V4Liquidity} from "../../src/libs/V4Liquidity.sol";
 import {BaseHook} from "@uniswap/v4-periphery/src/utils/BaseHook.sol";
-import {ICoinV4, IHasSwapPath} from "../../src/interfaces/ICoinV4.sol";
+import {ICoin, IHasSwapPath} from "../../src/interfaces/ICoin.sol";
 import {UniV4SwapToCurrency} from "../../src/libs/UniV4SwapToCurrency.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {CoinRewardsV4} from "../../src/libs/CoinRewardsV4.sol";
@@ -59,7 +59,7 @@ contract FeeEstimatorHook is BaseZoraV4CoinHook {
 
         {
             uint256 coinBalanceBefore = IERC20(coin).balanceOf(address(this));
-            uint256 currencyBalanceBefore = IERC20(ICoinV4(coin).currency()).balanceOf(address(this));
+            uint256 currencyBalanceBefore = IERC20(ICoin(coin).currency()).balanceOf(address(this));
 
             IHasSwapPath.PayoutSwapPath memory payoutSwapPath = IHasSwapPath(coin).getPayoutSwapPath(coinVersionLookup);
 
@@ -81,7 +81,7 @@ contract FeeEstimatorHook is BaseZoraV4CoinHook {
             feeState.fees1 += uint128(fee1);
 
             uint256 coinBalanceAfter = IERC20(coin).balanceOf(address(this));
-            uint256 currencyBalanceAfter = IERC20(ICoinV4(coin).currency()).balanceOf(address(this));
+            uint256 currencyBalanceAfter = IERC20(ICoin(coin).currency()).balanceOf(address(this));
 
             feeState.coinBalanceChange = coinBalanceAfter - coinBalanceBefore;
             feeState.currencyBalanceChange = currencyBalanceAfter - currencyBalanceBefore;

package/wagmi.config.ts

@@ -9,8 +9,8 @@ export default defineConfig({
         build: false,
       },
       include: [
-        "Coin",
-        "CoinV4",
+        "BaseCoin",
+        "ContentCoin",
         "CreatorCoin",
         "ZoraFactoryImpl",
         "IUniswapV3Pool",