@zoralabs/coins 0.9.0 → 1.0.0

package/test/{Hooks.t.sol → DeploymentHooks.t.sol}

@@ -2,14 +2,14 @@
 pragma solidity ^0.8.13;
 
 import {BaseTest} from "./utils/BaseTest.sol";
-import {BuySupplyWithSwapRouterHook} from "../src/hooks/BuySupplyWithSwapRouterHook.sol";
+import {BuySupplyWithSwapRouterHook} from "../src/hooks/deployment/BuySupplyWithSwapRouterHook.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IUniswapV3Pool} from "../src/interfaces/IUniswapV3Pool.sol";
 import {Coin} from "../src/Coin.sol";
 import {CoinConfigurationVersions} from "../src/libs/CoinConfigurationVersions.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {ICoin} from "../src/interfaces/ICoin.sol";
-import {IHasAfterCoinDeploy} from "../src/hooks/BaseCoinDeployHook.sol";
+import {IHasAfterCoinDeploy} from "../src/hooks/deployment/BaseCoinDeployHook.sol";
 import {IZoraFactory} from "../src/interfaces/IZoraFactory.sol";
 import {ISwapRouter} from "../src/interfaces/ISwapRouter.sol";
 import {CoinConstants} from "../src/libs/CoinConstants.sol";
@@ -22,10 +22,6 @@ contract FakeHookNoInterface {
 }
 
 contract HooksTest is BaseTest {
-    int24 internal constant DEFAULT_DISCOVERY_TICK_LOWER = -777000;
-    int24 internal constant DEFAULT_DISCOVERY_TICK_UPPER = 222000;
-    uint16 internal constant DEFAULT_NUM_DISCOVERY_POSITIONS = 10; // will be 11 total with tail position
-    uint256 internal constant DEFAULT_DISCOVERY_SUPPLY_SHARE = 0.495e18; // half of the 990m total pool supply
     address constant zora = 0x1111111111166b7FE7bd91427724B487980aFc69;
 
     function _generateDefaultPoolConfig(address currency) internal pure returns (bytes memory) {

package/test/Factory.t.sol

@@ -10,8 +10,9 @@ contract FactoryTest is BaseTest {
     }
 
     function test_constructor() public view {
-        assertEq(factory.coinImpl(), address(coinImpl));
-        assertEq(factory.owner(), users.factoryOwner);
+        assertEq(ZoraFactoryImpl(address(factory)).coinImpl(), address(coinV3Impl));
+        assertEq(ZoraFactoryImpl(address(factory)).owner(), users.factoryOwner);
+        assertEq(ZoraFactoryImpl(address(factory)).coinV4Impl(), address(coinV4Impl));
     }
 
     function test_deploy_no_eth() public {
@@ -24,9 +25,8 @@ contract FactoryTest is BaseTest {
             "https://test2.com",
             "Test2 Token",
             "TEST2",
+            _generatePoolConfig(address(weth)),
             users.platformReferrer,
-            address(weth),
-            MarketConstants.LP_TICK_LOWER_WETH,
             0
         );
         coin = Coin(payable(coinAddress));
@@ -73,9 +73,8 @@ contract FactoryTest is BaseTest {
             "https://test2.com",
             "Test2 Token",
             "TEST2",
+            _generatePoolConfig(address(weth)),
             users.platformReferrer,
-            address(weth),
-            MarketConstants.LP_TICK_LOWER_WETH,
             initialOrderSize
         );
         coin = Coin(payable(coinAddress));
@@ -119,9 +118,8 @@ contract FactoryTest is BaseTest {
             "https://test2.com",
             "Test2 Token",
             "TEST2",
+            _generatePoolConfig(address(weth)),
             users.platformReferrer,
-            address(weth),
-            MarketConstants.LP_TICK_LOWER_WETH,
             initialOrderSize
         );
     }
@@ -139,9 +137,8 @@ contract FactoryTest is BaseTest {
             "https://test2.com",
             "Test2 Token",
             "TEST2",
+            _generatePoolConfig(address(weth)),
             users.platformReferrer,
-            address(weth),
-            MarketConstants.LP_TICK_LOWER_WETH,
             orderSize
         );
         coin = Coin(payable(coinAddress));
@@ -160,9 +157,8 @@ contract FactoryTest is BaseTest {
             "https://testcoinusdcpair.com",
             "Testcoinusdcpair",
             "TESTCOINUSDCPAIR",
+            _generatePoolConfig(USDC_ADDRESS),
             users.platformReferrer,
-            USDC_ADDRESS,
-            USDC_TICK_LOWER,
             0
         );
         coin = Coin(payable(coinAddress));
@@ -193,9 +189,8 @@ contract FactoryTest is BaseTest {
             "https://testcoinusdcpair.com",
             "Testcoinusdcpair",
             "TESTCOINUSDCPAIR",
+            _generatePoolConfig(USDC_ADDRESS),
             users.platformReferrer,
-            USDC_ADDRESS,
-            USDC_TICK_LOWER,
             orderSize
         );
         coin = Coin(payable(coinAddress));
@@ -218,9 +213,8 @@ contract FactoryTest is BaseTest {
             "https://testcoinusdcpair.com",
             "Testcoinusdcpair",
             "TESTCOINUSDCPAIR",
+            _generatePoolConfig(USDC_ADDRESS),
             users.platformReferrer,
-            USDC_ADDRESS,
-            USDC_TICK_LOWER,
             0
         );
     }
@@ -235,9 +229,8 @@ contract FactoryTest is BaseTest {
             "https://testcoinusdcpair.com",
             "Testcoinusdcpair",
             "TESTCOINUSDCPAIR",
+            _generatePoolConfig(USDC_ADDRESS),
             users.platformReferrer,
-            USDC_ADDRESS,
-            USDC_TICK_LOWER,
             0
         );
     }
@@ -252,9 +245,8 @@ contract FactoryTest is BaseTest {
             "https://testcoinusdcpair.com",
             "Testcoinusdcpair",
             "TESTCOINUSDCPAIR",
+            _generatePoolConfig(USDC_ADDRESS),
             address(0),
-            USDC_ADDRESS,
-            USDC_TICK_LOWER,
             0
         );
 
@@ -263,24 +255,6 @@ contract FactoryTest is BaseTest {
         assertEq(coin.platformReferrer(), coin.protocolRewardRecipient(), "platformReferrer");
     }
 
-    function test_revert_deploy_with_invalid_currency_tick() public {
-        address[] memory owners = new address[](1);
-        owners[0] = users.creator;
-
-        vm.expectRevert(abi.encodeWithSelector(ICoin.InvalidWethLowerTick.selector));
-        factory.deploy(
-            users.creator,
-            owners,
-            "https://testcoin.com",
-            "Testcoin",
-            "TESTCOIN",
-            users.platformReferrer,
-            address(0),
-            MarketConstants.LP_TICK_LOWER_WETH + 1,
-            0
-        );
-    }
-
     function test_deploy_with_usdc_revert_invalid_eth_transfer() public {
         address[] memory owners = new address[](1);
         owners[0] = users.creator;
@@ -298,9 +272,8 @@ contract FactoryTest is BaseTest {
             "https://testcoinusdcpair.com",
             "Testcoinusdcpair",
             "TESTCOINUSDCPAIR",
+            _generatePoolConfig(USDC_ADDRESS),
             users.platformReferrer,
-            USDC_ADDRESS,
-            USDC_TICK_LOWER,
             0
         );
     }
@@ -315,9 +288,8 @@ contract FactoryTest is BaseTest {
             "https://test.com",
             "Test Token",
             "TEST",
+            _generatePoolConfig(address(weth)),
             users.platformReferrer,
-            address(weth),
-            MarketConstants.LP_TICK_LOWER_WETH,
             0
         );
         coin = Coin(payable(coinAddress));
@@ -326,10 +298,10 @@ contract FactoryTest is BaseTest {
     }
 
     function test_upgrade() public {
-        ZoraFactoryImpl newImpl = new ZoraFactoryImpl(address(coinImpl));
+        ZoraFactoryImpl newImpl = new ZoraFactoryImpl(address(coinV3Impl), address(coinV4Impl));
 
         vm.prank(users.factoryOwner);
-        factory.upgradeToAndCall(address(newImpl), "");
+        ZoraFactoryImpl(address(factory)).upgradeToAndCall(address(newImpl), "");
 
         assertEq(factory.implementation(), address(newImpl), "implementation");
     }
@@ -343,14 +315,75 @@ contract FactoryTest is BaseTest {
 
         vm.prank(users.factoryOwner);
         vm.expectRevert(abi.encodeWithSelector(ERC1967Utils.ERC1967InvalidImplementation.selector, address(newImpl)));
-        factory.upgradeToAndCall(address(newImpl), "");
+        ZoraFactoryImpl(address(factory)).upgradeToAndCall(address(newImpl), "");
     }
 
     function test_revert_invalid_owner() public {
-        ZoraFactoryImpl newImpl = new ZoraFactoryImpl(address(coinImpl));
+        ZoraFactoryImpl newImpl = new ZoraFactoryImpl(address(coinV3Impl), address(coinV4Impl));
 
         vm.prank(users.creator);
         vm.expectRevert(abi.encodeWithSelector(OwnableUpgradeable.OwnableUnauthorizedAccount.selector, users.creator));
-        factory.upgradeToAndCall(address(newImpl), "");
+        ZoraFactoryImpl(address(factory)).upgradeToAndCall(address(newImpl), "");
+    }
+
+    function test_coinAddress_canBePredicted(
+        bool msgSenderChanged,
+        bool saltChanged,
+        bool poolConfigChanged,
+        bool platformReferrerChanged,
+        bool nameChanged,
+        bool symbolChanged
+    ) public {
+        address[] memory owners = new address[](1);
+        owners[0] = users.creator;
+
+        address payoutRecipient = users.creator;
+
+        bytes32 salt = keccak256(abi.encode(bytes("randomSalt")));
+
+        address msgSender = makeAddr("msgSender");
+
+        string memory uri = "https://test.com";
+        string memory name = "Testcoin";
+        string memory symbol = "TEST";
+
+        address platformReferrer = users.platformReferrer;
+
+        bytes memory poolConfig = CoinConfigurationVersions.defaultDopplerMultiCurveUniV4(address(weth));
+        bytes memory poolConfigForGettingAddress = poolConfigChanged ? CoinConfigurationVersions.defaultDopplerUniV3(address(weth)) : poolConfig;
+
+        address expectedCoinAddress = factory.coinAddress(msgSender, name, symbol, poolConfigForGettingAddress, platformReferrer, salt);
+
+        if (msgSenderChanged) {
+            msgSender = makeAddr("msgSender2");
+        }
+
+        if (saltChanged) {
+            salt = keccak256(abi.encode(bytes("randomSalt2")));
+        }
+
+        if (platformReferrerChanged) {
+            platformReferrer = makeAddr("platformReferrer2");
+        }
+
+        if (nameChanged) {
+            name = "Testcoin2";
+        }
+
+        if (symbolChanged) {
+            symbol = "TEST2";
+        }
+
+        // now deploy the coin
+        vm.prank(msgSender);
+        (address coinAddress, ) = factory.deploy(payoutRecipient, owners, uri, name, symbol, poolConfig, platformReferrer, address(0), bytes(""), salt);
+
+        bool addressShouldMismatch = msgSenderChanged || saltChanged || poolConfigChanged || platformReferrerChanged || nameChanged || symbolChanged;
+
+        if (addressShouldMismatch) {
+            assertNotEq(coinAddress, expectedCoinAddress, "coinAddress should mismatch");
+        } else {
+            assertEq(coinAddress, expectedCoinAddress, "coinAddress should match");
+        }
     }
 }

package/test/MultiOwnable.t.sol

@@ -135,22 +135,25 @@ contract MultiOwnableTest is BaseTest {
 
     function test_revert_init_with_zero_owners() public {
         address[] memory emptyOwners = new address[](0);
+        bytes memory poolConfig_ = _generatePoolConfig(address(weth));
         vm.expectRevert(MultiOwnable.OneOwnerRequired.selector);
-        factory.deploy(users.creator, emptyOwners, "https://test.com", "Test Token", "TEST", users.platformReferrer, address(0), 0, 0);
+        factory.deploy(users.creator, emptyOwners, "https://test.com", "Test Token", "TEST", poolConfig_, users.platformReferrer, 0);
     }
 
     function test_revert_init_with_zero_address() public {
         address[] memory owners = new address[](1);
         owners[0] = address(0);
+        bytes memory poolConfig_ = _generatePoolConfig(address(weth));
         vm.expectRevert(MultiOwnable.OwnerCannotBeAddressZero.selector);
-        factory.deploy(users.creator, owners, "https://test.com", "Test Token", "TEST", users.platformReferrer, address(0), 0, 0);
+        factory.deploy(users.creator, owners, "https://test.com", "Test Token", "TEST", poolConfig_, users.platformReferrer, 0);
     }
 
     function test_revert_init_with_duplicate_owner() public {
         address[] memory owners = new address[](2);
         owners[0] = users.creator;
         owners[1] = users.creator;
+        bytes memory poolConfig_ = _generatePoolConfig(address(weth));
         vm.expectRevert(MultiOwnable.AlreadyOwner.selector);
-        factory.deploy(users.creator, owners, "https://test.com", "Test Token", "TEST", users.platformReferrer, address(0), 0, 0);
+        factory.deploy(users.creator, owners, "https://test.com", "Test Token", "TEST", poolConfig_, users.platformReferrer, 0);
     }
 }

package/test/Upgrades.t.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.13;
 import {Test} from "forge-std/Test.sol";
 import {IZoraFactory} from "../src/interfaces/IZoraFactory.sol";
 import {ZoraFactoryImpl} from "../src/ZoraFactoryImpl.sol";
+import {BaseTest} from "./utils/BaseTest.sol";
 
 contract BadImpl {
     function contractName() public pure returns (string memory) {
@@ -10,7 +11,7 @@ contract BadImpl {
     }
 }
 
-contract UpgradesTest is Test {
+contract UpgradesTest is BaseTest {
     ZoraFactoryImpl public factoryProxy;
 
     function test_canUpgradeFromVersionWithoutContractName() public {
@@ -19,7 +20,7 @@ contract UpgradesTest is Test {
 
         factoryProxy = ZoraFactoryImpl(0x777777751622c0d3258f214F9DF38E35BF45baF3);
 
-        ZoraFactoryImpl newImpl = new ZoraFactoryImpl(factoryProxy.implementation());
+        ZoraFactoryImpl newImpl = new ZoraFactoryImpl(factoryProxy.coinImpl(), address(coinV4Impl));
 
         vm.prank(factoryProxy.owner());
         factoryProxy.upgradeToAndCall(address(newImpl), "");
@@ -34,7 +35,7 @@ contract UpgradesTest is Test {
 
         factoryProxy = ZoraFactoryImpl(0x777777751622c0d3258f214F9DF38E35BF45baF3);
 
-        ZoraFactoryImpl newImpl = new ZoraFactoryImpl(factoryProxy.implementation());
+        ZoraFactoryImpl newImpl = new ZoraFactoryImpl(factoryProxy.coinImpl(), address(coinV4Impl));
 
         vm.prank(factoryProxy.owner());
         factoryProxy.upgradeToAndCall(address(newImpl), "");
@@ -52,12 +53,12 @@ contract UpgradesTest is Test {
 
         factoryProxy = ZoraFactoryImpl(0x777777751622c0d3258f214F9DF38E35BF45baF3);
 
-        ZoraFactoryImpl newImpl = new ZoraFactoryImpl(factoryProxy.implementation());
+        ZoraFactoryImpl newImpl = new ZoraFactoryImpl(factoryProxy.coinImpl(), address(coinV4Impl));
 
         vm.prank(factoryProxy.owner());
         factoryProxy.upgradeToAndCall(address(newImpl), "");
 
-        ZoraFactoryImpl newImpl2 = new ZoraFactoryImpl(factoryProxy.implementation());
+        ZoraFactoryImpl newImpl2 = new ZoraFactoryImpl(factoryProxy.coinImpl(), factoryProxy.coinV4Impl());
 
         vm.prank(factoryProxy.owner());
         factoryProxy.upgradeToAndCall(address(newImpl2), "");

package/test/mocks/MockERC20.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.23;
+
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+contract MockERC20 is ERC20 {
+    constructor(string memory name, string memory symbol) ERC20(name, symbol) {}
+
+    function mint(address to, uint256 amount) external {
+        _mint(to, amount);
+    }
+}

package/test/utils/BaseTest.sol

@@ -8,10 +8,12 @@ import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {ERC1967Utils} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-
+import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+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 {MultiOwnable} from "../../src/utils/MultiOwnable.sol";
 import {ICoin} from "../../src/interfaces/ICoin.sol";
 import {IERC7572} from "../../src/interfaces/IERC7572.sol";
@@ -24,6 +26,12 @@ import {IUniswapV3Pool} from "../../src/interfaces/IUniswapV3Pool.sol";
 import {IProtocolRewards} from "../../src/interfaces/IProtocolRewards.sol";
 import {ProtocolRewards} from "../utils/ProtocolRewards.sol";
 import {MarketConstants} from "../../src/libs/MarketConstants.sol";
+import {CoinConfigurationVersions} from "../../src/libs/CoinConfigurationVersions.sol";
+import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
+import {ZoraV4CoinHook} from "../../src/hooks/ZoraV4CoinHook.sol";
+import {HooksDeployment} from "../../src/libs/HooksDeployment.sol";
+import {CoinConstants} from "../../src/libs/CoinConstants.sol";
+import {ProxyShim} from "./ProxyShim.sol";
 
 contract BaseTest is Test {
     using stdStorage for StdStorage;
@@ -35,6 +43,11 @@ contract BaseTest is Test {
     address internal constant SWAP_ROUTER = 0x2626664c2603336E57B271c5C0b26F421741e481;
     address internal constant DOPPLER_AIRLOCK = 0x660eAaEdEBc968f8f3694354FA8EC0b4c5Ba8D12;
     address internal constant USDC_ADDRESS = 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913;
+    address internal constant V4_POOL_MANAGER = 0x498581fF718922c3f8e6A244956aF099B2652b2b;
+    address internal constant V4_POSITION_MANAGER = 0x7C5f5A4bBd8fD63184577525326123B519429bDc;
+    address internal constant V4_PERMIT2 = 0x000000000022D473030F116dDEE9F6B43aC78BA3;
+    address internal constant V4_QUOTER = 0x0d5e0F971ED27FBfF6c2837bf31316121532048D;
+    address internal constant UNIVERSAL_ROUTER = 0x6fF5693b99212Da76ad316178A184AB56D299b43;
     int24 internal constant USDC_TICK_LOWER = 57200;
 
     struct Users {
@@ -54,15 +67,79 @@ contract BaseTest is Test {
     ProtocolRewards internal protocolRewards;
     IUniswapV3Factory internal v3Factory;
     INonfungiblePositionManager internal nonfungiblePositionManager;
+
     ISwapRouter internal swapRouter;
     IAirlock internal airlock;
     Users internal users;
 
-    Coin internal coinImpl;
+    Coin internal coinV3Impl;
+    CoinV4 internal coinV4Impl;
     ZoraFactoryImpl internal factoryImpl;
-    ZoraFactoryImpl internal factory;
+    IZoraFactory internal factory;
+    ZoraV4CoinHook internal zoraV4CoinHook;
     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 _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
+        );
+        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 setUp() public virtual {
         setUpWithBlockNumber(28415528);
@@ -78,7 +155,6 @@ contract BaseTest is Test {
         swapRouter = ISwapRouter(SWAP_ROUTER);
         airlock = IAirlock(DOPPLER_AIRLOCK);
         protocolRewards = new ProtocolRewards();
-
         users = Users({
             factoryOwner: makeAddr("factoryOwner"),
             feeRecipient: makeAddr("feeRecipient"),
@@ -90,11 +166,21 @@ contract BaseTest is Test {
             tradeReferrer: makeAddr("tradeReferrer")
         });
 
-        coinImpl = new Coin(users.feeRecipient, address(protocolRewards), WETH_ADDRESS, V3_FACTORY, SWAP_ROUTER, DOPPLER_AIRLOCK);
-        factoryImpl = new ZoraFactoryImpl(address(coinImpl));
-        factory = ZoraFactoryImpl(address(new ZoraFactory(address(factoryImpl))));
+        address[] memory trustedMessageSenders = new address[](2);
+        trustedMessageSenders[0] = UNIVERSAL_ROUTER;
+        trustedMessageSenders[1] = V4_POSITION_MANAGER;
 
-        ZoraFactoryImpl(factory).initialize(users.factoryOwner);
+        ProxyShim mockUpgradeableImpl = new ProxyShim();
+        factory = IZoraFactory(address(new ZoraFactory(address(mockUpgradeableImpl))));
+        zoraV4CoinHook = ZoraV4CoinHook(address(HooksDeployment.deployZoraV4CoinHookFromContract(V4_POOL_MANAGER, address(factory), trustedMessageSenders)));
+        coinV3Impl = new Coin(users.feeRecipient, address(protocolRewards), WETH_ADDRESS, V3_FACTORY, SWAP_ROUTER, DOPPLER_AIRLOCK);
+        coinV4Impl = new CoinV4(users.feeRecipient, address(protocolRewards), IPoolManager(V4_POOL_MANAGER), DOPPLER_AIRLOCK, zoraV4CoinHook);
+        factoryImpl = new ZoraFactoryImpl(address(coinV3Impl), address(coinV4Impl));
+        UUPSUpgradeable(address(factory)).upgradeToAndCall(address(factoryImpl), "");
+        factory = IZoraFactory(address(factory));
+        // factory = ZoraFactoryImpl(address(new ZoraFactory(address(factoryImpl))));
+
+        ZoraFactoryImpl(address(factory)).initialize(users.factoryOwner);
 
         vm.label(address(factory), "ZORA_FACTORY");
         vm.label(address(protocolRewards), "PROTOCOL_REWARDS");
@@ -120,54 +206,6 @@ contract BaseTest is Test {
         uint256 protocol;
     }
 
-    function _deployCoin() internal {
-        address[] memory owners = new address[](1);
-        owners[0] = users.creator;
-
-        vm.prank(users.creator);
-        (address coinAddress, ) = factory.deploy(
-            users.creator,
-            owners,
-            "https://test.com",
-            "Testcoin",
-            "TEST",
-            users.platformReferrer,
-            address(weth),
-            MarketConstants.LP_TICK_LOWER_WETH,
-            0
-        );
-
-        coin = Coin(payable(coinAddress));
-        pool = IUniswapV3Pool(coin.poolAddress());
-
-        vm.label(address(coin), "COIN");
-        vm.label(address(pool), "POOL");
-    }
-
-    function _deployCoinUSDCPair() internal {
-        address[] memory owners = new address[](1);
-        owners[0] = users.creator;
-
-        vm.prank(users.creator);
-        (address coinAddress, ) = factory.deploy(
-            users.creator,
-            owners,
-            "https://testusdccoin.com",
-            "Testusdccoin",
-            "TESTUSDCCOIN",
-            users.platformReferrer,
-            USDC_ADDRESS,
-            USDC_TICK_LOWER,
-            0
-        );
-
-        coin = Coin(payable(coinAddress));
-        pool = IUniswapV3Pool(coin.poolAddress());
-
-        vm.label(address(coin), "COIN");
-        vm.label(address(pool), "POOL");
-    }
-
     function _calculateTradeRewards(uint256 ethAmount) internal pure returns (TradeRewards memory) {
         return
             TradeRewards({
@@ -207,6 +245,18 @@ contract BaseTest is Test {
         return airlock.owner();
     }
 
+    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
+            );
+    }
+
     function _generatePoolConfig(
         uint8 version_,
         address currency_,