@zoralabs/coins 2.1.0 → 2.1.1

package/.turbo/turbo-build.log

@@ -1,17 +1,14 @@
 
-> @zoralabs/coins@2.1.0 build /home/runner/work/zora-protocol-private/zora-protocol-private/packages/coins
+> @zoralabs/coins@2.1.1 build /home/runner/work/zora-protocol-private/zora-protocol-private/packages/coins
 > pnpm run wagmi:generate && pnpm run copy-abis && pnpm run prettier:write && tsup
 
 
-> @zoralabs/coins@2.1.0 wagmi:generate /home/runner/work/zora-protocol-private/zora-protocol-private/packages/coins
+> @zoralabs/coins@2.1.1 wagmi:generate /home/runner/work/zora-protocol-private/zora-protocol-private/packages/coins
 > FOUNDRY_PROFILE=dev forge build && wagmi generate && pnpm exec rename-generated-abi-casing ./package/wagmiGenerated.ts
 
 Compiling 236 files with Solc 0.8.28
-Solc 0.8.28 finished in 186.86s
+Solc 0.8.28 finished in 192.36s
 Compiler run successful with warnings:
-Warning (3420): Source file does not specify required compiler version! Consider adding "pragma solidity ^0.8.28;"
---> src/BaseCoin.sol
-
 Warning (5667): Unused function parameter. Remove or comment out the variable name to silence this warning.
    --> src/ZoraFactoryImpl.sol:214:9:
     |
@@ -79,112 +76,112 @@ Warning (2072): Unused local variable.
 ✅ Updated ./package/wagmiGenerated.ts (10 replacements)
 ✨ All files processed successfully!
 
-> @zoralabs/coins@2.1.0 copy-abis /home/runner/work/zora-protocol-private/zora-protocol-private/packages/coins
+> @zoralabs/coins@2.1.1 copy-abis /home/runner/work/zora-protocol-private/zora-protocol-private/packages/coins
 > pnpm exec bundle-abis
 
 
-> @zoralabs/coins@2.1.0 prettier:write /home/runner/work/zora-protocol-private/zora-protocol-private/packages/coins
+> @zoralabs/coins@2.1.1 prettier:write /home/runner/work/zora-protocol-private/zora-protocol-private/packages/coins
 > prettier --write 'src/**/*.sol' 'test/**/*.sol' 'script/**/*.sol'
 
-src/BaseCoin.sol 423ms (unchanged)
-src/ContentCoin.sol 34ms (unchanged)
-src/CreatorCoin.sol 63ms (unchanged)
-src/deployment/CoinsDeployerBase.sol 216ms (unchanged)
+src/BaseCoin.sol 461ms (unchanged)
+src/ContentCoin.sol 26ms (unchanged)
+src/CreatorCoin.sol 57ms (unchanged)
+src/deployment/CoinsDeployerBase.sol 214ms (unchanged)
 src/hooks/BaseZoraV4CoinHook.sol 180ms (unchanged)
-src/hooks/ContentCoinHook.sol 7ms (unchanged)
+src/hooks/ContentCoinHook.sol 9ms (unchanged)
 src/hooks/CreatorCoinHook.sol 7ms (unchanged)
-src/hooks/deployment/BaseCoinDeployHook.sol 20ms (unchanged)
-src/hooks/deployment/BuySupplyWithSwapRouterHook.sol 118ms (unchanged)
-src/hooks/HookUpgradeGate.sol 22ms (unchanged)
+src/hooks/deployment/BaseCoinDeployHook.sol 16ms (unchanged)
+src/hooks/deployment/BuySupplyWithSwapRouterHook.sol 121ms (unchanged)
+src/hooks/HookUpgradeGate.sol 28ms (unchanged)
 src/interfaces/IAirlock.sol 1ms (unchanged)
-src/interfaces/ICoin.sol 13ms (unchanged)
-src/interfaces/ICoinComments.sol 1ms (unchanged)
+src/interfaces/ICoin.sol 16ms (unchanged)
+src/interfaces/ICoinComments.sol 2ms (unchanged)
 src/interfaces/ICoinDeployHook.sol 1ms (unchanged)
-src/interfaces/ICoinV3.sol 3ms (unchanged)
-src/interfaces/ICreatorCoin.sol 2ms (unchanged)
-src/interfaces/ICreatorCoinHook.sol 2ms (unchanged)
-src/interfaces/IDeployedCoinVersionLookup.sol 1ms (unchanged)
+src/interfaces/ICoinV3.sol 4ms (unchanged)
+src/interfaces/ICreatorCoin.sol 1ms (unchanged)
+src/interfaces/ICreatorCoinHook.sol 1ms (unchanged)
+src/interfaces/IDeployedCoinVersionLookup.sol 0ms (unchanged)
 src/interfaces/IDopplerErrors.sol 1ms (unchanged)
 src/interfaces/IERC7572.sol 0ms (unchanged)
 src/interfaces/IHasRewardsRecipients.sol 1ms (unchanged)
 src/interfaces/IHooksUpgradeGate.sol 1ms (unchanged)
 src/interfaces/IMsgSender.sol 1ms (unchanged)
-src/interfaces/INonfungiblePositionManager.sol 4ms (unchanged)
+src/interfaces/INonfungiblePositionManager.sol 5ms (unchanged)
 src/interfaces/IPoolConfigEncoding.sol 2ms (unchanged)
-src/interfaces/IProtocolRewards.sol 2ms (unchanged)
-src/interfaces/ISwapPathRouter.sol 1ms (unchanged)
+src/interfaces/IProtocolRewards.sol 3ms (unchanged)
+src/interfaces/ISwapPathRouter.sol 2ms (unchanged)
 src/interfaces/ISwapRouter.sol 1ms (unchanged)
-src/interfaces/IUniswapV3Factory.sol 5ms (unchanged)
+src/interfaces/IUniswapV3Factory.sol 4ms (unchanged)
 src/interfaces/IUniswapV3Pool.sol 3ms (unchanged)
 src/interfaces/IUniswapV3SwapCallback.sol 1ms (unchanged)
 src/interfaces/IUpgradeableV4Hook.sol 2ms (unchanged)
 src/interfaces/IWETH.sol 1ms (unchanged)
-src/interfaces/IZoraFactory.sol 12ms (unchanged)
-src/interfaces/IZoraV4CoinHook.sol 6ms (unchanged)
+src/interfaces/IZoraFactory.sol 11ms (unchanged)
+src/interfaces/IZoraV4CoinHook.sol 10ms (unchanged)
 src/libs/CoinCommon.sol 4ms (unchanged)
-src/libs/CoinConfigurationVersions.sol 46ms (unchanged)
-src/libs/CoinConstants.sol 4ms (unchanged)
-src/libs/CoinDopplerMultiCurve.sol 103ms (unchanged)
-src/libs/CoinRewardsV4.sol 99ms (unchanged)
-src/libs/CoinSetup.sol 26ms (unchanged)
+src/libs/CoinConfigurationVersions.sol 47ms (unchanged)
+src/libs/CoinConstants.sol 6ms (unchanged)
+src/libs/CoinDopplerMultiCurve.sol 102ms (unchanged)
+src/libs/CoinRewardsV4.sol 90ms (unchanged)
+src/libs/CoinSetup.sol 30ms (unchanged)
 src/libs/CreatorCoinConstants.sol 2ms (unchanged)
-src/libs/CreatorCoinRewards.sol 18ms (unchanged)
-src/libs/DopplerMath.sol 88ms (unchanged)
-src/libs/HooksDeployment.sol 79ms (unchanged)
-src/libs/MarketConstants.sol 2ms (unchanged)
+src/libs/CreatorCoinRewards.sol 20ms (unchanged)
+src/libs/DopplerMath.sol 86ms (unchanged)
+src/libs/HooksDeployment.sol 80ms (unchanged)
+src/libs/MarketConstants.sol 3ms (unchanged)
 src/libs/PoolStateReader.sol 6ms (unchanged)
-src/libs/UniV4SwapHelper.sol 29ms (unchanged)
-src/libs/UniV4SwapToCurrency.sol 48ms (unchanged)
-src/libs/V4Liquidity.sol 131ms (unchanged)
+src/libs/UniV4SwapHelper.sol 28ms (unchanged)
+src/libs/UniV4SwapToCurrency.sol 49ms (unchanged)
+src/libs/V4Liquidity.sol 133ms (unchanged)
 src/proxy/ZoraFactory.sol 5ms (unchanged)
 src/types/LpPosition.sol 1ms (unchanged)
-src/types/PoolConfiguration.sol 3ms (unchanged)
-src/types/PoolState.sol 1ms (unchanged)
+src/types/PoolConfiguration.sol 1ms (unchanged)
+src/types/PoolState.sol 2ms (unchanged)
 src/utils/AutoSwapper.sol 20ms (unchanged)
-src/utils/DeployedCoinVersionLookup.sol 4ms (unchanged)
-src/utils/MultiOwnable.sol 45ms (unchanged)
+src/utils/DeployedCoinVersionLookup.sol 5ms (unchanged)
+src/utils/MultiOwnable.sol 46ms (unchanged)
 src/utils/uniswap/BitMath.sol 10ms (unchanged)
 src/utils/uniswap/BytesLib.sol 17ms (unchanged)
 src/utils/uniswap/CustomRevert.sol 41ms (unchanged)
 src/utils/uniswap/FixedPoint96.sol 1ms (unchanged)
-src/utils/uniswap/FullMath.sol 20ms (unchanged)
-src/utils/uniswap/LiquidityAmounts.sol 46ms (unchanged)
+src/utils/uniswap/FullMath.sol 21ms (unchanged)
+src/utils/uniswap/LiquidityAmounts.sol 47ms (unchanged)
 src/utils/uniswap/Path.sol 5ms (unchanged)
-src/utils/uniswap/SafeCast.sol 11ms (unchanged)
-src/utils/uniswap/SqrtPriceMath.sol 64ms (unchanged)
-src/utils/uniswap/TickMath.sol 68ms (unchanged)
-src/utils/uniswap/UnsafeMath.sol 2ms (unchanged)
+src/utils/uniswap/SafeCast.sol 12ms (unchanged)
+src/utils/uniswap/SqrtPriceMath.sol 65ms (unchanged)
+src/utils/uniswap/TickMath.sol 63ms (unchanged)
+src/utils/uniswap/UnsafeMath.sol 3ms (unchanged)
 src/version/ContractVersionBase.sol 1ms (unchanged)
 src/ZoraFactoryImpl.sol 106ms (unchanged)
-test/AutoSwapper.t.sol 34ms (unchanged)
-test/Coin.t.sol 110ms (unchanged)
-test/CoinUniV4.t.sol 336ms (unchanged)
-test/CreatorCoin.t.sol 130ms (unchanged)
-test/DeploymentHooks.t.sol 66ms (unchanged)
-test/Factory.t.sol 76ms (unchanged)
-test/HooksDeployment.t.sol 25ms (unchanged)
-test/LiquidityMigration.t.sol 155ms (unchanged)
-test/mocks/MockERC20.sol 2ms (unchanged)
-test/MultiOwnable.t.sol 80ms (unchanged)
-test/Upgrades.t.sol 107ms (unchanged)
-test/utils/BaseTest.sol 154ms (unchanged)
+test/AutoSwapper.t.sol 35ms (unchanged)
+test/Coin.t.sol 114ms (unchanged)
+test/CoinUniV4.t.sol 355ms (unchanged)
+test/CreatorCoin.t.sol 137ms (unchanged)
+test/DeploymentHooks.t.sol 70ms (unchanged)
+test/Factory.t.sol 80ms (unchanged)
+test/HooksDeployment.t.sol 31ms (unchanged)
+test/LiquidityMigration.t.sol 162ms (unchanged)
+test/mocks/MockERC20.sol 3ms (unchanged)
+test/MultiOwnable.t.sol 83ms (unchanged)
+test/Upgrades.t.sol 110ms (unchanged)
+test/utils/BaseTest.sol 163ms (unchanged)
 test/utils/ContractAddresses.sol 2ms (unchanged)
-test/utils/DeployedCoinVersionLookup.t.sol 38ms (unchanged)
+test/utils/DeployedCoinVersionLookup.t.sol 44ms (unchanged)
 test/utils/FeeEstimatorHook.sol 26ms (unchanged)
-test/utils/ProtocolRewards.sol 281ms (unchanged)
-test/utils/ProxyShim.sol 6ms (unchanged)
-script/Deploy.s.sol 3ms (unchanged)
+test/utils/ProtocolRewards.sol 304ms (unchanged)
+test/utils/ProxyShim.sol 4ms (unchanged)
+script/Deploy.s.sol 4ms (unchanged)
 script/DeployAutoSwapper.s.sol 13ms (unchanged)
-script/DeployDevFactory.s.sol 3ms (unchanged)
-script/DeployPostDeploymentHooks.s.sol 2ms (unchanged)
-script/DeployUpgradeGate.s.sol 3ms (unchanged)
-script/GenerateDeterministicParams.s.sol 12ms (unchanged)
-script/PrintRegisterUpgradePath.s.sol 9ms (unchanged)
-script/PrintUpgradeCommand.s.sol 2ms (unchanged)
-script/TestBackingCoinSwap.s.sol 31ms (unchanged)
+script/DeployDevFactory.s.sol 4ms (unchanged)
+script/DeployPostDeploymentHooks.s.sol 3ms (unchanged)
+script/DeployUpgradeGate.s.sol 4ms (unchanged)
+script/GenerateDeterministicParams.s.sol 14ms (unchanged)
+script/PrintRegisterUpgradePath.s.sol 10ms (unchanged)
+script/PrintUpgradeCommand.s.sol 1ms (unchanged)
+script/TestBackingCoinSwap.s.sol 32ms (unchanged)
 script/TestV4Swap.s.sol 30ms (unchanged)
 script/UpgradeCoinImpl.sol 5ms (unchanged)
-script/UpgradeFactoryImpl.s.sol 5ms (unchanged)
+script/UpgradeFactoryImpl.s.sol 6ms (unchanged)
 script/UpgradeHooks.s.sol 6ms (unchanged)
 CLI Building entry: package/index.ts
 CLI Using tsconfig: tsconfig.json
@@ -196,7 +193,7 @@ script/UpgradeHooks.s.sol 6ms (unchanged)
 ESM Build start
 ESM dist/index.js     128.58 KB
 ESM dist/index.js.map 229.86 KB
-ESM ⚡️ Build success in 44ms
+ESM ⚡️ Build success in 42ms
 CJS dist/index.cjs     130.00 KB
 CJS dist/index.cjs.map 230.01 KB
-CJS ⚡️ Build success in 44ms
+CJS ⚡️ Build success in 43ms

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @zoralabs/coins
 
+## 2.1.1
+
+### Patch Changes
+
+- 498e5c9d: Consolidated POOL_LAUNCH_SUPPLY into a single constant
+
 ## 2.1.0
 
 ### Minor Changes

package/foundry.toml

@@ -19,6 +19,4 @@ fs_permissions = [
 runs = 100
 
 [rpc_endpoints]
-base = "https://base-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}"
-mainnet = "https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}"
-zora = "https://rpc.zora.energy"
+base = "https://base.gateway.tenderly.co/${TENDERLY_KEY}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/coins",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -36,8 +36,8 @@
     "typescript": "^5.2.2",
     "viem": "^2.21.18",
     "@zoralabs/tsconfig": "^0.0.1",
-    "@zoralabs/shared-scripts": "^0.0.0",
-    "@zoralabs/shared-contracts": "^0.0.5"
+    "@zoralabs/shared-contracts": "^0.0.5",
+    "@zoralabs/shared-scripts": "^0.0.0"
   },
   "scripts": {
     "build": "pnpm run wagmi:generate && pnpm run copy-abis && pnpm run prettier:write && tsup",

package/src/BaseCoin.sol

@@ -4,7 +4,8 @@
 // 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/licensepragma solidity ^0.8.23;
+// Full license terms available at: https://docs.zora.co/coins/license
+pragma solidity ^0.8.23;
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";

package/src/hooks/ContentCoinHook.sol

@@ -9,7 +9,7 @@ pragma solidity ^0.8.28;
 
 import {IPoolManager, IDeployedCoinVersionLookup, IHasRewardsRecipients, Currency, BaseZoraV4CoinHook} from "./BaseZoraV4CoinHook.sol";
 import {CoinRewardsV4} from "../libs/CoinRewardsV4.sol";
-import {MarketConstants} from "../libs/MarketConstants.sol";
+import {CoinConstants} from "../libs/CoinConstants.sol";
 import {IHooksUpgradeGate} from "../interfaces/IHooksUpgradeGate.sol";
 
 contract ContentCoinHook is BaseZoraV4CoinHook {
@@ -18,7 +18,7 @@ contract ContentCoinHook is BaseZoraV4CoinHook {
         IDeployedCoinVersionLookup coinVersionLookup_,
         address[] memory trustedMessageSenders_,
         IHooksUpgradeGate upgradeGate
-    ) BaseZoraV4CoinHook(poolManager_, coinVersionLookup_, trustedMessageSenders_, upgradeGate, MarketConstants.POOL_LAUNCH_SUPPLY) {}
+    ) BaseZoraV4CoinHook(poolManager_, coinVersionLookup_, trustedMessageSenders_, upgradeGate, CoinConstants.POOL_LAUNCH_SUPPLY) {}
 
     /// @dev Override for market reward distribution
     function _distributeMarketRewards(Currency currency, uint128 fees, IHasRewardsRecipients coin, address tradeReferrer) internal override {

package/src/libs/CoinRewardsV4.sol

@@ -53,7 +53,7 @@ library CoinRewardsV4 {
     uint256 public constant LP_REWARD_BPS = 3333;
 
     function getTradeReferral(bytes calldata hookData) internal pure returns (address) {
-        return hookData.length >= 32 ? abi.decode(hookData, (address)) : address(0);
+        return hookData.length >= 20 ? abi.decode(hookData, (address)) : address(0);
     }
 
     /// @dev Converts collected fees from LP positions into target payout currency, and transfers to hook contract, so

package/src/libs/MarketConstants.sol

@@ -2,10 +2,6 @@
 pragma solidity ^0.8.23;
 
 library MarketConstants {
-    /// @notice The number of coins allocated to the liquidity pool
-    /// @dev 990 million coins
-    uint256 internal constant POOL_LAUNCH_SUPPLY = 990_000_000e18;
-
     /// @dev Constant used to increase precision during calculations
     uint256 constant WAD = 1e18;
 

package/src/version/ContractVersionBase.sol

@@ -9,6 +9,6 @@ import {IVersionedContract} from "@zoralabs/shared-contracts/interfaces/IVersion
 contract ContractVersionBase is IVersionedContract {
     /// @notice The version of the contract
     function contractVersion() external pure override returns (string memory) {
-        return "2.1.0";
+        return "2.1.1";
     }
 }

package/test/CoinUniV4.t.sol

@@ -57,7 +57,7 @@ contract CoinUniV4Test is BaseTest {
     /// and then reverting the state after the swap
     function _estimateLpFees(bytes memory commands, bytes[] memory inputs) internal returns (FeeEstimatorHook.FeeEstimatorState memory feeState) {
         uint256 snapshot = vm.snapshot();
-        _deployFeeEstimatorHook(MarketConstants.POOL_LAUNCH_SUPPLY, address(contentCoinHook));
+        _deployFeeEstimatorHook(CoinConstants.POOL_LAUNCH_SUPPLY, address(contentCoinHook));
 
         // Execute the swap
         uint256 deadline = block.timestamp + 20;
@@ -74,7 +74,7 @@ contract CoinUniV4Test is BaseTest {
         bytes[] memory inputs
     ) internal returns (BalanceDelta delta, SwapParams memory swapParams, uint160 sqrtPriceX96) {
         uint256 snapshot = vm.snapshot();
-        _deployFeeEstimatorHook(MarketConstants.POOL_LAUNCH_SUPPLY, address(contentCoinHook));
+        _deployFeeEstimatorHook(CoinConstants.POOL_LAUNCH_SUPPLY, address(contentCoinHook));
 
         // Execute the swap
         uint256 deadline = block.timestamp + 20;