@zoralabs/coins 1.1.2 → 2.0.0

package/test/utils/BaseTest.sol

@@ -13,7 +13,7 @@ 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";
@@ -75,14 +75,14 @@ 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;
+    ContentCoin internal coinV4Impl;
     CreatorCoin internal creatorCoinImpl;
     ZoraFactoryImpl internal factoryImpl;
     IZoraFactory internal factory;
@@ -157,7 +157,7 @@ contract BaseTest is Test, ContractAddresses {
             salt
         );
 
-        coinV4 = CoinV4(payable(coinAddress));
+        coinV4 = ContentCoin(payable(coinAddress));
         return coinV4;
     }
 
@@ -206,11 +206,15 @@ 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();
     }
@@ -269,18 +273,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
+                    )
                 )
             )
         );
@@ -324,7 +332,7 @@ contract BaseTest is Test, ContractAddresses {
 
         _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);
 

package/wagmi.config.ts

@@ -10,7 +10,7 @@ export default defineConfig({
       },
       include: [
         "Coin",
-        "CoinV4",
+        "ContentCoin",
         "CreatorCoin",
         "ZoraFactoryImpl",
         "IUniswapV3Pool",