@zoralabs/coins 0.5.0 → 0.6.0

package/deterministicConfig/deployerAndCaller.json

@@ -0,0 +1,5 @@
+{
+  "creationCode": "0x610180604052346101a1576040516100186040826101a5565b601e815260208101907f44657465726d696e69737469634465706c6f796572416e6443616c6c657200008252604051916100536040846101a5565b600183526020830191603160f81b835261006c816101c8565b610120526100798461035e565b61014052519020918260e05251902080610100524660a0526040519060208201927f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f8452604083015260608201524660808201523060a082015260a081526100e260c0826101a5565b5190206080523060c05260405161046b80820191906001600160401b0383118284101761018d575f928291610fbd8339039082f580156101825761016052604051610b269081610497823960805181610980015260a05181610a3d015260c0518161094a015260e051816109cf015261010051816109f50152610120518161025e0152610140518161028701526101605181818161035301526104bf0152f35b6040513d5f823e3d90fd5b634e487b7160e01b5f52604160045260245ffd5b5f80fd5b601f909101601f19168101906001600160401b0382119082101761018d57604052565b908151602081105f14610242575090601f8151116102025760208151910151602082106101f3571790565b5f198260200360031b1b161790565b604460209160405192839163305a27a960e01b83528160048401528051918291826024860152018484015e5f828201840152601f01601f19168101030190fd5b6001600160401b03811161018d575f54600181811c91168015610354575b602082101461034057601f811161030e575b50602092601f82116001146102af57928192935f926102a4575b50508160011b915f199060031b1c1916175f5560ff90565b015190505f8061028c565b601f198216935f8052805f20915f5b8681106102f657508360019596106102de575b505050811b015f5560ff90565b01515f1960f88460031b161c191690555f80806102d1565b919260206001819286850151815501940192016102be565b5f8052601f60205f20910160051c810190601f830160051c015b8181106103355750610272565b5f8155600101610328565b634e487b7160e01b5f52602260045260245ffd5b90607f1690610260565b908151602081105f14610389575090601f8151116102025760208151910151602082106101f3571790565b6001600160401b03811161018d57600154600181811c9116801561048c575b602082101461034057601f8111610459575b50602092601f82116001146103f857928192935f926103ed575b50508160011b915f199060031b1c19161760015560ff90565b015190505f806103d4565b601f1982169360015f52805f20915f5b8681106104415750836001959610610429575b505050811b0160015560ff90565b01515f1960f88460031b161c191690555f808061041b565b91926020600181928685015181550194019201610408565b60015f52601f60205f20910160051c810190601f830160051c015b81811061048157506103ba565b5f8155600101610474565b90607f16906103a856fe60806040526004361015610011575f80fd5b5f3560e01c806325746d39146103825780637db68ec41461033e57806384b0196e1461024657806386881034146101cf578063e3867c2914610105578063eae49c87146100d25763f9baed1814610066575f80fd5b346100ce5760603660031901126100ce5760243567ffffffffffffffff81116100ce57610097903690600401610449565b60443567ffffffffffffffff81116100ce576020916100bd6100c6923690600401610449565b906004356104f6565b604051908152f35b5f80fd5b346100ce575f3660031901126100ce576101016100ed6104b3565b60405191829160208352602083019061048f565b0390f35b60a03660031901126100ce5760043567ffffffffffffffff81116100ce57610131903690600401610449565b6024359060443567ffffffffffffffff81116100ce57610155903690600401610449565b60643567ffffffffffffffff81116100ce57610175903690600401610449565b608435916001600160a01b03831683036100ce57846101b8816101b36101aa6101bd986101a5888860209d6104f6565b610899565b909291926108d3565b61057a565b6105a8565b6040516001600160a01b039091168152f35b346100ce5760203660031901126100ce5760043567ffffffffffffffff81116100ce5760206100ed610208610101933690600401610449565b82806102126104b3565b6040519584879551918291018487015e8401908282015f8152815193849201905e01015f815203601f1981018352826103f7565b346100ce575f3660031901126100ce576102e26102827f00000000000000000000000000000000000000000000000000000000000000006106a6565b6102ab7f00000000000000000000000000000000000000000000000000000000000000006107c9565b60206102f0604051926102be83856103f7565b5f84525f368137604051958695600f60f81b875260e08588015260e087019061048f565b90858203604087015261048f565b4660608501523060808501525f60a085015283810360c08501528180845192838152019301915f5b82811061032757505050500390f35b835185528695509381019392810192600101610318565b346100ce575f3660031901126100ce576040517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b60803660031901126100ce5760043560243567ffffffffffffffff81116100ce576103b1903690600401610449565b9060443567ffffffffffffffff81116100ce576103d2903690600401610449565b606435906001600160a01b03821682036100ce57602093836101b86101bd953361057a565b90601f8019910116810190811067ffffffffffffffff82111761041957604052565b634e487b7160e01b5f52604160045260245ffd5b67ffffffffffffffff811161041957601f01601f191660200190565b81601f820112156100ce578035906104608261042d565b9261046e60405194856103f7565b828452602083830101116100ce57815f926020809301838601378301015290565b805180835260209291819084018484015e5f828201840152601f01601f1916010190565b60405160018060a01b037f0000000000000000000000000000000000000000000000000000000000000000166020820152602081526104f36040826103f7565b90565b90916042926020815191012090602081519101206040519160208301937fdc039731015eea17e316614c8f3af7dca5fc4664683c8e8f2adc4e0ff71a7c9285526040840152606083015260808201526080815261055460a0826103f7565b51902061055f610947565b906040519161190160f01b8352600283015260228201522090565b6001600160a01b0316606082901c819003610593575050565b632696d3f160e11b5f5260045260245260445ffd5b919290805191600b602083019384206040519060408201528560208201523081520160ff8153605590206001600160a01b0390811691168181036106915750508051156106825751905ff5906001600160a01b03821615610673575f816020829351910182855af13d1561066b573d906106218261042d565b9161062f60405193846103f7565b82523d5f602084013e5b15610642575090565b60405163a5fa8d2b60e01b81526020600482015290819061066790602483019061048f565b0390fd5b606090610639565b633a0ba96160e11b5f5260045ffd5b631328927760e21b5f5260045ffd5b6312ae30e560e01b5f5260045260245260445ffd5b60ff81146106ec5760ff811690601f82116106dd57604051916106ca6040846103f7565b6020808452838101919036833783525290565b632cd44ac360e21b5f5260045ffd5b506040515f5f548060011c91600182169182156107bf575b6020841083146107ab57838552849290811561078c575060011461072f575b6104f3925003826103f7565b505f80805290917f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e5635b8183106107705750509060206104f392820101610723565b6020919350806001915483858801015201910190918392610758565b602092506104f394915060ff191682840152151560051b820101610723565b634e487b7160e01b5f52602260045260245ffd5b92607f1692610704565b60ff81146107ed5760ff811690601f82116106dd57604051916106ca6040846103f7565b506040515f6001548060011c916001821691821561088f575b6020841083146107ab57838552849290811561078c5750600114610830576104f3925003826103f7565b5060015f90815290917fb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf65b8183106108735750509060206104f392820101610723565b602091935080600191548385880101520191019091839261085b565b92607f1692610806565b81519190604183036108c9576108c29250602082015190606060408401519301515f1a90610a63565b9192909190565b50505f9160029190565b600481101561093357806108e5575050565b600181036108fc5763f645eedf60e01b5f5260045ffd5b60028103610917575063fce698f760e01b5f5260045260245ffd5b6003146109215750565b6335e2f38360e21b5f5260045260245ffd5b634e487b7160e01b5f52602160045260245ffd5b307f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161480610a3a575b156109a2577f000000000000000000000000000000000000000000000000000000000000000090565b60405160208101907f8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f82527f000000000000000000000000000000000000000000000000000000000000000060408201527f000000000000000000000000000000000000000000000000000000000000000060608201524660808201523060a082015260a08152610a3460c0826103f7565b51902090565b507f00000000000000000000000000000000000000000000000000000000000000004614610979565b91907f7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a08411610ae5579160209360809260ff5f9560405194855216868401526040830152606082015282805260015afa15610ada575f516001600160a01b03811615610ad057905f905f90565b505f906001905f90565b6040513d5f823e3d90fd5b5050505f916003919056fea264697066735822122020d4cc29643fbc137d039c78a8d78f52fd9a09b7daa1a5943440ff9a3e8ea56f64736f6c634300081c003360c08060405234603257306080523360a0526104349081610037823960805181818160ae015261018b015260a051815050f35b5f80fdfe60806040526004361015610011575f80fd5b5f3560e01c80634f1ef2861461010257806352d1902d1461009c5763ad3cb1cc1461003a575f80fd5b34610098575f366003190112610098576040805190610059818361032e565b600582526020820191640352e302e360dc1b83528151928391602083525180918160208501528484015e5f828201840152601f01601f19168101030190f35b5f80fd5b34610098575f366003190112610098577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031630036100f35760206040515f5160206103df5f395f51905f528152f35b63703e46dd60e11b5f5260045ffd5b6040366003190112610098576004356001600160a01b03811690818103610098576024359067ffffffffffffffff821161009857366023830112156100985781600401359161015083610364565b9261015e604051948561032e565b8084526020840191366024838301011161009857815f926024602093018537850101526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001630811490811561030c575b506100f3576040516352d1902d60e01b8152602081600481885afa5f91816102d8575b506101f15784634c9c8ce360e01b5f5260045260245ffd5b805f5160206103df5f395f51905f528692036102c65750823b156102b4575f5160206103df5f395f51905f5280546001600160a01b031916821790557fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b5f80a282511561029b575f8091610291945190845af43d15610293573d9161027583610364565b92610283604051948561032e565b83523d5f602085013e610380565b005b606091610380565b505050346102a557005b63b398979f60e01b5f5260045ffd5b634c9c8ce360e01b5f5260045260245ffd5b632a87526960e21b5f5260045260245ffd5b9091506020813d602011610304575b816102f46020938361032e565b81010312610098575190866101d9565b3d91506102e7565b5f5160206103df5f395f51905f52546001600160a01b031614159050856101b6565b90601f8019910116810190811067ffffffffffffffff82111761035057604052565b634e487b7160e01b5f52604160045260245ffd5b67ffffffffffffffff811161035057601f01601f191660200190565b906103a4575080511561039557805190602001fd5b630a12f52160e11b5f5260045ffd5b815115806103d5575b6103b5575090565b639996b31560e01b5f9081526001600160a01b0391909116600452602490fd5b50803b156103ad56fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca264697066735822122005f8ca25544854f7fe07eac3cac751ac5b35b9a8529e80352f19449570409c3364736f6c634300081c0033",
+  "deployedAddress": "0xCB571Eaa13A8276B1Ed44348291dD80b5BC360dA",
+  "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+}

package/deterministicConfig/zoraFactory.json

@@ -0,0 +1,8 @@
+{
+  "constructorArgs": "0x00000000000000000000000015b56e81f8a628aab8a5a8b9414f05cf5728d1ff",
+  "contractName": "Zora",
+  "creationCode": "0x60a06040523461016c575f61028a6020813803918261001d81610170565b93849283398101031261016c5751906001600160a01b03821680830361016c576100476020610170565b905f8252833b1561015a577f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b031916821790557fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b5f80a280511561015257818160208293519101855af43d15610145573d926001600160401b038411610131576100f7936100e7601f8201601f1916602001610170565b908152809360203d92013e6101a9565b505b7fffd9efbec42a225861234c46dd9ad199e6b6c0e9dc65ff463e6987cedc26d6a1608052604051608290816102088239608051815050f35b634e487b7160e01b83526041600452602483fd5b6100f792606092506101a9565b5050506100f9565b634c9c8ce360e01b5f5260045260245ffd5b5f80fd5b6040519190601f01601f191682016001600160401b0381118382101761019557604052565b634e487b7160e01b5f52604160045260245ffd5b906101cd57508051156101be57805190602001fd5b630a12f52160e11b5f5260045ffd5b815115806101fe575b6101de575090565b639996b31560e01b5f9081526001600160a01b0391909116600452602490fd5b50803b156101d656fe60806040527f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc545f9081906001600160a01b0316368280378136915af43d5f803e156048573d5ff35b3d5ffdfea2646970667358221220d17864a0488eaaba33173ba368bd2448917739c58ea27a5b985e8b13c01d346664736f6c634300081c003300000000000000000000000015b56e81f8a628aab8a5a8b9414f05cf5728d1ff",
+  "deployedAddress": "0x777777751622c0d3258f214F9DF38E35BF45baF3",
+  "deploymentCaller": "0x680E26B472d8cae8148ee21FCAd6A69D73766436",
+  "salt": "0x680e26b472d8cae8148ee21fcad6a69d73766436f27a901327372bd2be5d38f6"
+}

package/foundry.toml

@@ -4,6 +4,20 @@ test = "test"
 libs = ["node_modules"]
 via_ir = true
 optimizer = true
+solc_version = '0.8.28'
+optimizer_runs = 200
+fs_permissions = [
+  { access = "readwrite", path = "./addresses" },
+  { access = "read", path = "./package.json" },
+  { access = "readwrite", path = "./deterministicConfig" },
+  { access = "read", path = "../shared-contracts/chainConfigs" },
+  { access = "read", path = "../shared-contracts/deterministicConfig" }
+]
 
 [profile.ci.fuzz]
 runs = 1000
+
+[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"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/coins",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -25,12 +25,13 @@
     "forge-std": "https://github.com/foundry-rs/forge-std#v1.9.1",
     "prettier": "^3.0.3",
     "prettier-plugin-solidity": "^1.4.1",
+    "solady": "0.0.132",
     "tsup": "^7.2.0",
     "tsx": "^3.13.0",
     "typescript": "^5.2.2",
     "viem": "^2.21.18",
-    "@zoralabs/shared-scripts": "^0.0.0",
     "@zoralabs/shared-contracts": "^0.0.1",
+    "@zoralabs/shared-scripts": "^0.0.0",
     "@zoralabs/tsconfig": "^0.0.1"
   },
   "scripts": {

package/remappings.txt

@@ -1,4 +1,5 @@
 ds-test/=node_modules/ds-test/src/
 forge-std/=node_modules/forge-std/src/
 @openzeppelin/=node_modules/@openzeppelin/
-@zoralabs/shared-contracts/=node_modules/@zoralabs/shared-contracts/src/
+@zoralabs/shared-contracts/=node_modules/@zoralabs/shared-contracts/src/
+solady/=node_modules/solady/src/ 

package/script/CoinsDeployerBase.sol

@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+import "forge-std/Script.sol";
+
+import {ProxyDeployerScript, DeterministicContractConfig, DeterministicDeployerAndCaller} from "@zoralabs/shared-contracts/deployment/ProxyDeployerScript.sol";
+import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import {ZoraFactoryImpl} from "../src/ZoraFactoryImpl.sol";
+import {Coin} from "../src/Coin.sol";
+import {IVersionedContract} from "@zoralabs/shared-contracts/interfaces/IVersionedContract.sol";
+
+contract CoinsDeployerBase is ProxyDeployerScript {
+    address internal constant PROTOCOL_REWARDS = 0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B;
+
+    using stdJson for string;
+
+    struct CoinsDeployment {
+        // Factory
+        address zoraFactory;
+        address zoraFactoryImpl;
+        // Implementation
+        address coinImpl;
+        string coinVersion;
+    }
+
+    function addressesFile() internal view returns (string memory) {
+        return string.concat("./addresses/", vm.toString(block.chainid), ".json");
+    }
+
+    function saveDeployment(CoinsDeployment memory deployment) internal {
+        string memory objectKey = "config";
+
+        vm.serializeAddress(objectKey, "ZORA_FACTORY", deployment.zoraFactory);
+        vm.serializeAddress(objectKey, "ZORA_FACTORY_IMPL", deployment.zoraFactoryImpl);
+        vm.serializeString(objectKey, "COIN_VERSION", deployment.coinVersion);
+        string memory result = vm.serializeAddress(objectKey, "COIN_IMPL", deployment.coinImpl);
+
+        vm.writeJson(result, addressesFile());
+    }
+
+    function readDeployment() internal returns (CoinsDeployment memory deployment) {
+        string memory file = addressesFile();
+        if (!vm.exists(file)) {
+            return deployment;
+        }
+        string memory json = vm.readFile(file);
+
+        deployment.zoraFactory = readAddressOrDefaultToZero(json, "ZORA_FACTORY");
+        deployment.zoraFactoryImpl = readAddressOrDefaultToZero(json, "ZORA_FACTORY_IMPL");
+        deployment.coinImpl = readAddressOrDefaultToZero(json, "COIN_IMPL");
+        deployment.coinVersion = readStringOrDefaultToEmpty(json, "COIN_VERSION");
+    }
+
+    function deployCoinImpl() internal returns (Coin) {
+        return new Coin(getZoraRecipient(), PROTOCOL_REWARDS, getWeth(), getNonFungiblePositionManager(), getUniswapSwapRouter());
+    }
+
+    function deployZoraFactoryImpl(address coinImpl) internal returns (ZoraFactoryImpl) {
+        return new ZoraFactoryImpl(coinImpl);
+    }
+
+    function deployZoraDeterministic(CoinsDeployment memory deployment, DeterministicDeployerAndCaller deployer) internal {
+        // read previously saved deterministic config
+        DeterministicContractConfig memory zoraConfig = readDeterministicContractConfig("zoraFactory");
+
+        // Deploy implementation contracts
+        deployment.coinImpl = address(deployCoinImpl());
+        deployment.zoraFactoryImpl = address(deployZoraFactoryImpl(deployment.coinImpl));
+        deployment.coinVersion = IVersionedContract(deployment.coinImpl).contractVersion();
+
+        if (deployment.zoraFactoryImpl.code.length == 0) {
+            revert("Factory Impl not yet deployed. Make sure to deploy it with DeployImpl.s.sol");
+        }
+
+        // build upgrade to and call for factory, with init call
+        bytes memory upgradeToAndCall = abi.encodeWithSelector(
+            UUPSUpgradeable.upgradeToAndCall.selector,
+            deployment.zoraFactoryImpl,
+            abi.encodeWithSelector(ZoraFactoryImpl.initialize.selector, getProxyAdmin())
+        );
+
+        // sign deployment with turnkey account
+        bytes memory signature = signDeploymentWithTurnkey(zoraConfig, upgradeToAndCall, deployer);
+
+        printVerificationCommand(zoraConfig);
+
+        deployment.zoraFactory = deployer.permitSafeCreate2AndCall(
+            signature,
+            zoraConfig.salt,
+            zoraConfig.creationCode,
+            upgradeToAndCall,
+            zoraConfig.deployedAddress
+        );
+
+        // validate that the zora factory owner is the proxy admin
+        require(ZoraFactoryImpl(deployment.zoraFactory).owner() == getProxyAdmin(), "Zora factory owner is not the proxy admin");
+    }
+}

package/script/Deploy.s.sol

@@ -1,14 +1,23 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.28;
 
-import {Script, console} from "forge-std/Script.sol";
-
-contract Deploy is Script {
-    function setUp() public {}
+import {ProxyDeployerScript, DeterministicDeployerAndCaller} from "@zoralabs/shared-contracts/deployment/ProxyDeployerScript.sol";
+import {CoinsDeployerBase} from "./CoinsDeployerBase.sol";
 
+contract DeployScript is CoinsDeployerBase {
     function run() public {
+        CoinsDeployment memory deployment = readDeployment();
+
         vm.startBroadcast();
 
+        // get deployer contract
+        DeterministicDeployerAndCaller deployer = createOrGetDeployerAndCaller();
+
+        deployZoraDeterministic(deployment, deployer);
+
         vm.stopBroadcast();
+
+        // save the deployment json
+        saveDeployment(deployment);
     }
 }

package/script/GenerateDeterministicParams.s.sol

@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+import "forge-std/Script.sol";
+
+import {ImmutableCreate2FactoryUtils} from "@zoralabs/shared-contracts/utils/ImmutableCreate2FactoryUtils.sol";
+import {ProxyDeployerScript, DeterministicDeployerAndCaller, DeterministicContractConfig} from "@zoralabs/shared-contracts/deployment/ProxyDeployerScript.sol";
+import {ZoraFactory} from "../src/proxy/ZoraFactory.sol";
+
+contract GenerateDeterministicParams is ProxyDeployerScript {
+    function mineForZoraAddress(DeterministicDeployerAndCaller deployer, address caller) private returns (DeterministicContractConfig memory config) {
+        // get proxy creation code
+        bytes memory initCode = deployer.proxyCreationCode(type(ZoraFactory).creationCode);
+        bytes32 initCodeHash = keccak256(initCode);
+
+        // uupsProxyDeployer is deployer
+        (bytes32 salt, address expectedAddress) = mineSalt(address(deployer), initCodeHash, "7777777", caller);
+
+        console2.log("salt");
+        console2.log(vm.toString(salt));
+
+        config.salt = salt;
+        config.deployedAddress = expectedAddress;
+        config.creationCode = initCode;
+        config.constructorArgs = deployer.proxyConstructorArgs();
+        config.contractName = "Zora";
+        config.deploymentCaller = caller;
+    }
+
+    function run() public {
+        address caller = vm.envAddress("DEPLOYER");
+
+        vm.startBroadcast();
+
+        // create a proxy deployer, which we can use to generate deterministic addresses and corresponding params
+        DeterministicDeployerAndCaller deployer = createOrGetDeployerAndCaller();
+
+        vm.stopBroadcast();
+
+        DeterministicContractConfig memory zoraConfig = mineForZoraAddress(deployer, caller);
+        saveDeterministicContractConfig(zoraConfig, "zoraFactory");
+    }
+}

package/src/Coin.sol

@@ -350,7 +350,7 @@ contract Coin is ICoin, CoinConstants, ContractVersionBase, ERC20PermitUpgradeab
     /// @dev Deploy the pool
     function _deployPool(int24 tickLower_) internal {
         // If WETH is the pool's currency, validate the lower tick
-        if (currency == WETH && tickLower_ != LP_TICK_LOWER_WETH) {
+        if (currency == WETH && tickLower_ < LP_TICK_LOWER_WETH) {
             revert InvalidWethLowerTick();
         }
 

package/src/proxy/ZoraFactory.sol

@@ -22,5 +22,11 @@ import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.s
                OURS TRULY,
 */
 contract ZoraFactory is ERC1967Proxy {
-    constructor(address _logic, bytes memory _data) ERC1967Proxy(_logic, _data) {}
+    bytes32 internal immutable name;
+
+    constructor(address _logic) ERC1967Proxy(_logic, "") {
+        // added to create unique bytecode for this contract
+        // so that it can be properly verified as its own contract.
+        name = keccak256("ZoraFactory");
+    }
 }

package/src/utils/CoinConstants.sol

@@ -50,9 +50,9 @@ abstract contract CoinConstants {
     /// @dev 10000 basis points = 1%
     uint24 internal constant LP_FEE = 10000;
 
-    /// @notice The LP's lower tick
+    /// @notice The LP's minimum lower tick
     /// @dev This is only used if the currency is WETH
-    int24 internal constant LP_TICK_LOWER_WETH = -199200;
+    int24 internal constant LP_TICK_LOWER_WETH = -208200;
 
     /// @notice The LP's upper tick
     int24 internal constant LP_TICK_UPPER = 887200;

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 "0.5.0";
+        return "0.6.0";
     }
 }

package/test/Coin.t.sol

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.13;
 
 import "./utils/BaseTest.sol";
+import {ISwapRouter} from "../src/interfaces/ISwapRouter.sol";
 
 contract CoinTest is BaseTest {
     function setUp() public override {
@@ -11,7 +12,7 @@ contract CoinTest is BaseTest {
     }
 
     function test_contract_version() public view {
-        assertEq(coin.contractVersion(), "0.5.0");
+        assertEq(coin.contractVersion(), "0.6.0");
     }
 
     function test_supply_constants() public view {
@@ -199,6 +200,82 @@ contract CoinTest is BaseTest {
         assertGe(coin.balanceOf(users.coinRecipient), amountOut, "coinRecipient coin balance");
     }
 
+    function test_sell_for_eth_direct_and_claim_secondary() public {
+        vm.deal(users.buyer, 1 ether);
+
+        vm.prank(users.buyer);
+        weth.deposit{value: 100_000}();
+
+        vm.prank(users.buyer);
+        weth.approve(address(swapRouter), 100_000);
+
+        // Set up the swap parameters
+        ISwapRouter.ExactInputSingleParams memory params = ISwapRouter.ExactInputSingleParams({
+            tokenIn: WETH_ADDRESS,
+            tokenOut: address(coin),
+            fee: LP_FEE,
+            recipient: address(users.buyer),
+            amountIn: 100_000,
+            amountOutMinimum: 0,
+            sqrtPriceLimitX96: 0
+        });
+
+        // Execute the swap
+        vm.prank(users.buyer);
+        uint256 amountOut = ISwapRouter(swapRouter).exactInputSingle(params);
+
+        assertEq(coin.balanceOf(users.buyer), 108941722423358, "buyer coin balance");
+        assertEq(amountOut, 108941722423358);
+        assertGt(users.buyer.balance, 0, "seller eth balance");
+
+        // now we have unclaimed secondary rewards to claim
+        vm.prank(users.buyer);
+
+        // don't push ETH
+        coin.claimSecondaryRewards(false);
+        assertEq(protocolRewards.balanceOf(users.creator), 499);
+        assertEq(protocolRewards.balanceOf(users.platformReferrer), 249);
+        assertEq(protocolRewards.balanceOf(users.feeRecipient), 251);
+    }
+
+    function test_sell_for_eth_direct_and_claim_secondary_push_eth() public {
+        vm.deal(users.buyer, 1 ether);
+
+        vm.prank(users.buyer);
+        weth.deposit{value: 100_000}();
+
+        vm.prank(users.buyer);
+        weth.approve(address(swapRouter), 100_000);
+
+        // Set up the swap parameters
+        ISwapRouter.ExactInputSingleParams memory params = ISwapRouter.ExactInputSingleParams({
+            tokenIn: WETH_ADDRESS,
+            tokenOut: address(coin),
+            fee: LP_FEE,
+            recipient: address(users.buyer),
+            amountIn: 100_000,
+            amountOutMinimum: 0,
+            sqrtPriceLimitX96: 0
+        });
+
+        // Execute the swap
+        vm.prank(users.buyer);
+        uint256 amountOut = ISwapRouter(swapRouter).exactInputSingle(params);
+
+        assertEq(coin.balanceOf(users.buyer), 108941722423358, "buyer coin balance");
+        assertEq(amountOut, 108941722423358);
+        assertGt(users.buyer.balance, 0, "seller eth balance");
+
+        // Now we have unclaimed secondary rewards to claim
+        vm.prank(users.buyer);
+
+        uint256 initialBalance = users.creator.balance;
+
+        // Push ETH
+        coin.claimSecondaryRewards(true);
+        assertEq(users.creator.balance - initialBalance, 499);
+    }
+
     function test_sell_for_eth() public {
         vm.deal(users.buyer, 1 ether);
         vm.prank(users.buyer);
@@ -284,18 +361,18 @@ contract CoinTest is BaseTest {
         coin.buy{value: 0.001 ether}(users.creator, 0.001 ether, 0, 0, users.tradeReferrer);
 
         uint256 beforeBalance = coin.balanceOf(users.creator);
-        assertEq(beforeBalance, 10438320330337104517114132); // 10,438,320 coins
+        assertEq(beforeBalance, 11077349369032224007213331); // 11,077,349 coins
 
         vm.prank(users.creator);
         (uint256 amountSold, ) = coin.sell(users.creator, beforeBalance, 0, 0, users.tradeReferrer);
-        assertEq(amountSold, 442747808421317694054680); // 442,747 coins (max that could be sold)
+        assertEq(amountSold, 1088231685891135360821548); // 1,088,232 coins (max that could be sold)
 
         uint256 afterBalance = coin.balanceOf(users.creator);
-        assertEq(afterBalance, 9997786260957893411529725); // 9,997,786 coins
+        assertEq(afterBalance, 9994558841570544323195890); // 9,994,559 coins
 
-        uint256 expectedMarketReward = 2213739042106588470273; // 2,213 coins
+        uint256 expectedMarketReward = 5441158429455676804107; // 5,441 coins
 
-        // 9,997,786 = 10,438,320 order size - 442,747 true order size + 2,213 creator market reward
+        // 9,994,559 = 11,077,349 order size - 1,088,232 true order size + 5,441 creator market reward
         assertEq(afterBalance, ((beforeBalance - amountSold) + expectedMarketReward), "amountSold");
     }
 
@@ -361,6 +438,42 @@ contract CoinTest is BaseTest {
         assertGt(protocolRewards.balanceOf(users.feeRecipient), expectedFees.platformReferrer, "feeRecipient eth balance");
     }
 
+    function test_invalid_weth_tick() public {
+        address[] memory owners = new address[](1);
+        owners[0] = users.creator;
+
+        vm.expectRevert(ICoin.InvalidWethLowerTick.selector);
+        (address newCoinAddr, ) = factory.deploy(
+            users.creator,
+            owners,
+            "https://test.com",
+            "Test Token",
+            "TEST",
+            users.platformReferrer,
+            address(weth),
+            LP_TICK_LOWER_WETH - 1,
+            0
+        );
+    }
+
+    function test_invalid_currency_tick() public {
+        address[] memory owners = new address[](1);
+        owners[0] = users.creator;
+
+        vm.expectRevert(ICoin.InvalidCurrencyLowerTick.selector);
+        (address newCoinAddr, ) = factory.deploy(
+            users.creator,
+            owners,
+            "https://test.com",
+            "Test Token",
+            "TEST",
+            users.platformReferrer,
+            address(0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913),
+            20,
+            0
+        );
+    }
+
     function test_default_order_referrer() public {
         vm.deal(users.buyer, 1 ether);
         vm.prank(users.buyer);

package/test/Factory.t.sol

@@ -96,6 +96,35 @@ contract FactoryTest is BaseTest {
         console.log("BUYER_COIN_BALANCE ", coin.balanceOf(users.creator) - 10_000_000e18);
     }
 
+    function test_deploy_with_weth(uint256 initialOrderSize) public {
+        vm.assume(initialOrderSize > MIN_ORDER_SIZE);
+        vm.assume(initialOrderSize < 10 ether);
+
+        address[] memory owners = new address[](1);
+        owners[0] = users.creator;
+
+        vm.deal(users.creator, initialOrderSize);
+
+        vm.startPrank(users.creator);
+        weth.deposit{value: initialOrderSize}();
+
+        weth.approve(address(factory), type(uint256).max);
+
+        // Expect this to revert because WETH needs to be sent with msg.value.
+        vm.expectRevert();
+        factory.deploy(
+            users.creator,
+            owners,
+            "https://test2.com",
+            "Test2 Token",
+            "TEST2",
+            users.platformReferrer,
+            address(weth),
+            LP_TICK_LOWER_WETH,
+            initialOrderSize
+        );
+    }
+
     function test_deploy_with_one_eth() public {
         address[] memory owners = new address[](1);
         owners[0] = users.creator;
@@ -206,17 +235,7 @@ contract FactoryTest is BaseTest {
 
         vm.expectRevert(abi.encodeWithSelector(ICoin.InvalidWethLowerTick.selector));
 
-        factory.deploy(
-            users.creator,
-            owners,
-            "https://testcoinusdcpair.com",
-            "Testcoinusdcpair",
-            "TESTCOINUSDCPAIR",
-            users.platformReferrer,
-            address(0),
-            USDC_TICK_LOWER,
-            0
-        );
+        factory.deploy(users.creator, owners, "https://testcoin.com", "Testcoin", "TESTCOIN", users.platformReferrer, address(0), LP_TICK_LOWER_WETH - 1, 0);
     }
 
     function test_deploy_with_usdc_revert_invalid_eth_transfer() public {
@@ -272,6 +291,10 @@ contract FactoryTest is BaseTest {
         assertEq(factory.implementation(), address(newImpl), "implementation");
     }
 
+    function test_implementation_address() public view {
+        assertEq(factory.implementation(), address(factoryImpl));
+    }
+
     function test_revert_invalid_upgrade_impl() public {
         address newImpl = address(this);
 

package/test/utils/BaseTest.sol

@@ -59,7 +59,7 @@ contract BaseTest is Test, CoinConstants {
     IUniswapV3Pool internal pool;
 
     function setUp() public virtual {
-        forkId = vm.createSelectFork("https://mainnet.base.org", 21179722);
+        forkId = vm.createSelectFork("base", 21179722);
 
         weth = IWETH(WETH_ADDRESS);
         usdc = IERC20Metadata(USDC_ADDRESS);
@@ -80,9 +80,9 @@ contract BaseTest is Test, CoinConstants {
 
         coinImpl = new Coin(users.feeRecipient, address(protocolRewards), WETH_ADDRESS, NONFUNGIBLE_POSITION_MANAGER, SWAP_ROUTER);
         factoryImpl = new ZoraFactoryImpl(address(coinImpl));
-        factory = ZoraFactoryImpl(
-            address(new ZoraFactory(address(factoryImpl), abi.encodeWithSelector(ZoraFactoryImpl.initialize.selector, users.factoryOwner)))
-        );
+        factory = ZoraFactoryImpl(address(new ZoraFactory(address(factoryImpl))));
+
+        ZoraFactoryImpl(factory).initialize(users.factoryOwner);
 
         vm.label(address(factory), "ZORA_FACTORY");
         vm.label(address(protocolRewards), "PROTOCOL_REWARDS");

package/abis/Deploy.json

@@ -1,29 +0,0 @@
-[
-  {
-    "type": "function",
-    "name": "IS_SCRIPT",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "bool",
-        "internalType": "bool"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "run",
-    "inputs": [],
-    "outputs": [],
-    "stateMutability": "nonpayable"
-  },
-  {
-    "type": "function",
-    "name": "setUp",
-    "inputs": [],
-    "outputs": [],
-    "stateMutability": "nonpayable"
-  }
-]

package/addresses/1.json

@@ -1,4 +0,0 @@
-{
-    "WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-    "UniswapQuoter": "0x61fFE014bA17989E743c5F6cB21bF9697530B21e"
-}