revert: keep ListaV3Factory non-upgradeable

Restores Factory to the upstream Uniswap V3 shape — plain constructor,
NoDelegateCall on createPool, no Initializable / __gap / initialize.
NPM stays upgradeable behind TransparentUpgradeableProxy.

Knock-on changes:
- script/Deploy.s.sol: factory deploys directly; setOwner called only if
  OWNER != msg.sender. Factory impl + proxy + init data removed.
- test/periphery/FullFlowTest.t.sol: setUp constructs factory directly.
- foundry.toml: factory drops out of compilation_restrictions; the
  reverted (smaller) code fits at the default optimizer_runs.
- README.md: top-line and Contracts section describe factory as
  non-upgradeable; deployment outline shortened. The License &
  on-chain bytecode reuse disclaimer is removed since the
  NoDelegateCall deviation it explained no longer applies.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: razww

README.md

@@ -1,33 +1,33 @@
 # Lista V3
 
-A Uniswap V3 fork renamed to Lista V3, with the factory and NFT position manager deployed behind upgradeable proxies.
+A Uniswap V3 fork renamed to Lista V3, with the NFT position manager deployed behind an upgradeable proxy. Factory, pool, and router behavior tracks upstream Uniswap V3.
 
 ## Contracts
 
 ### Core (`src/core/`)
 
-- `ListaV3Factory` — canonical factory. **Upgradeable** via `TransparentUpgradeableProxy`; initializer replaces the constructor and seeds the 500 / 3000 / 10000 fee tiers.
-- `ListaV3Pool` — AMM pool, CREATE2-deployed by the factory, **not upgradeable**.
+- `ListaV3Factory` — canonical factory. Plain (non-upgradeable) deploy; constructor sets the deployer as owner and seeds the 500 / 3000 / 10000 fee tiers. Keeps `NoDelegateCall` as upstream.
+- `ListaV3Pool` — AMM pool, CREATE2-deployed by the factory, not upgradeable.
 - `ListaV3PoolDeployer` — base of the factory; writes transient parameters so the pool constructor can read them back, keeping `POOL_INIT_CODE_HASH` constant for off-chain address derivation.
 
 ### Periphery (`src/periphery/`)
 
-- `NonfungiblePositionManager` — wraps positions as ERC-721 NFTs. **Hybrid upgradeable**: the ERC-721 / permit stack uses `ERC721PermitUpgradeable` (storage-backed, behind the proxy), while `factory` and `WETH9` remain constructor-set `immutable`s in the implementation bytecode. Every impl upgrade must re-pass the original `(factory, WETH9)` to the new impl's constructor.
+- `NonfungiblePositionManager` — wraps positions as ERC-721 NFTs. **Hybrid upgradeable**: the ERC-721 / permit stack uses `ERC721PermitUpgradeable` (storage-backed, behind a `TransparentUpgradeableProxy`), while `factory` and `WETH9` remain constructor-set `immutable`s in the implementation bytecode. Every impl upgrade must re-pass the original `(factory, WETH9)` to the new impl's constructor.
 - `SwapRouter`, `V3Migrator`, `Quoter`, `QuoterV2`, `NonfungibleTokenPositionDescriptor`, `PairFlash` — deployed normally (non-upgradeable).
 
 ## Deployment outline
 
-1. Deploy `ListaV3Factory` impl (no constructor args).
-2. Deploy a shared `ProxyAdmin`.
-3. Deploy `TransparentUpgradeableProxy(factoryImpl, proxyAdmin, abi.encodeWithSelector(ListaV3Factory.initialize.selector, owner))`. Treat the proxy address as *the* factory from here on.
-4. Deploy `NonfungiblePositionManager` impl with `(factoryProxy, WETH9)`.
-5. Deploy `TransparentUpgradeableProxy(npmImpl, proxyAdmin, abi.encodeWithSelector(NonfungiblePositionManager.initialize.selector, tokenDescriptor))`.
-6. Deploy `SwapRouter`, `V3Migrator`, etc. against the factory proxy address.
+1. Deploy `ListaV3Factory` directly. The deployer becomes owner; call `setOwner` afterwards if a different owner is required.
+2. Deploy a `ProxyAdmin` for the NPM proxy (and any future upgradeable contracts).
+3. Deploy `NonfungiblePositionManager` impl with `(factory, WETH9)`.
+4. Deploy `TransparentUpgradeableProxy(npmImpl, proxyAdmin, abi.encodeWithSelector(NonfungiblePositionManager.initialize.selector, tokenDescriptor))`.
+5. Deploy `SwapRouter`, `V3Migrator`, etc. against the factory address.
 
 Operational notes:
 
-- The Factory/NPM implementations should have their initializers consumed post-deploy (e.g. `initialize(0xdead)` / `initialize(0xdead, 0xdead)`) to close the Parity-style impl-takeover window.
-- Pool addresses are derived from the factory proxy via `PoolAddress.computeAddress`. If `ListaV3Pool` bytecode is ever changed, `PoolAddress.POOL_INIT_CODE_HASH` must be recomputed — the value in `src/periphery/libraries/PoolAddress.sol` is only valid for the currently-checked-in pool source and build settings.
+- The NPM implementation should have its initializer consumed post-deploy (e.g. `npmImpl.initialize(0xdead)`) to close the Parity-style impl-takeover window.
+- Every NPM impl upgrade must re-pass the same `(factory, WETH9)` to the new impl's constructor — the values are baked into impl bytecode as immutables. A deploy script that reads `npm.factory()` / `npm.WETH9()` from the existing proxy and forwards them to the new impl's constructor is the safest pattern.
+- Pool addresses are derived from the factory via `PoolAddress.computeAddress`. If `ListaV3Pool` bytecode is ever changed, `PoolAddress.POOL_INIT_CODE_HASH` must be recomputed — the value in `src/periphery/libraries/PoolAddress.sol` is only valid for the currently-checked-in pool source and build settings.
 - Re-verify `POOL_INIT_CODE_HASH` before deploying to a new chain. The value is machine-deterministic given `bytecode_hash = "none"` in `foundry.toml`, but a different toolchain version, optimizer setting, or solc patch can still shift it. Run `testInitCodeHash` in `test/periphery/FullFlowTest.t.sol` against your build environment as a pre-deploy gate; if it fails, update the constant before deploying or off-chain pool address derivation will silently point at the wrong addresses.
 
 ## Build & test
@@ -41,16 +41,10 @@ forge test
 
 The end-to-end flow (pool creation, mint, swap, increase / decrease liquidity, collect, transfer, burn) runs in `test/periphery/FullFlowTest.t.sol`, which also exercises the proxy wiring and asserts NPM initializer state / ERC-165 registrations.
 
-## License & on-chain bytecode reuse
+## License
 
 Source is GPL-2.0-or-later (see `NOTICE` for derivation and attribution).
 
-`NoDelegateCall` has been removed from `ListaV3Factory` — its `address(this) == original` invariant is incompatible with the proxy pattern, since every legitimate call from `TransparentUpgradeableProxy` is itself a `delegatecall`. `ListaV3Pool` is unproxied and keeps the modifier.
-
-Upstream Uniswap V3 added `NoDelegateCall` as a license-agnostic deterrent against on-chain bytecode reuse — the original PR comment frames the intent as ["Prevents circumventing the license, GPL or otherwise"](https://github.com/Uniswap/v3-core/pull/327#issuecomment-813462722). Without it, a third party can point their own proxy at our deployed factory implementation and run a parallel AMM on Lista's compiled logic. Pools they create that way are state-isolated — CREATE2 addresses derive from their proxy, not Lista's — and cannot interact with Lista pools.
-
-This does not change GPL obligations: source modification and redistribution remain governed by GPL-2.0-or-later. The legal status of `delegatecall`-into-licensed-bytecode is itself unsettled; `NoDelegateCall` was a technical deterrent, not a settled legal interpretation. We accept the tradeoff as the cost of TUP-fronted upgradeability.
-
 ## Dependencies
 
 Git submodules under `lib/`:

foundry.toml

@@ -8,16 +8,13 @@ optimizer_runs = 500
 # deterministic across machines / lib changes (matching Uniswap V3's production config).
 bytecode_hash = "none"
 
-# Factory and NonfungiblePositionManager exceed EIP-170 at the default run count.
-# Compile them with fewer runs (smaller runtime bytecode, slightly more gas per call).
-# Same profile for both so Foundry can resolve Deploy.s.sol (which imports both) as
-# a single compilation unit.
+# NonfungiblePositionManager exceeds EIP-170 at the default run count, so compile
+# it with fewer runs (smaller runtime bytecode, slightly more gas per call).
 additional_compiler_profiles = [
     { name = "small", optimizer_runs = 50 },
 ]
 
 compilation_restrictions = [
-    { paths = "src/core/ListaV3Factory.sol", optimizer_runs = 50 },
     { paths = "src/periphery/NonfungiblePositionManager.sol", optimizer_runs = 50 },
 ]
 

script/Deploy.s.sol

@@ -31,8 +31,7 @@ import {TransparentUpgradeableProxy} from 'lib/openzeppelin-contracts/contracts/
 contract Deploy is Script {
     struct Deployment {
         address proxyAdmin;
-        address factoryImpl;
-        address factoryProxy;
+        address factory;
         address npmImpl;
         address npmProxy;
         address swapRouter;
@@ -67,42 +66,38 @@ contract Deploy is Script {
             proxyAdmin.transferOwnership(proxyAdminOwner);
         }
 
-        // Factory: impl + proxy
-        ListaV3Factory factoryImpl = new ListaV3Factory();
-        // Consume the impl's initializer so it can't be hijacked on-chain.
-        factoryImpl.initialize(address(0xdead));
-
-        bytes memory factoryInit = abi.encodeWithSelector(ListaV3Factory.initialize.selector, owner);
-        TransparentUpgradeableProxy factoryProxy =
-            new TransparentUpgradeableProxy(address(factoryImpl), address(proxyAdmin), factoryInit);
+        // Factory: plain deploy. owner = msg.sender (the broadcaster). If a separate
+        // owner is required, the broadcaster should call factory.setOwner(owner) after.
+        ListaV3Factory factory = new ListaV3Factory();
+        if (owner != address(0) && owner != msg.sender) {
+            factory.setOwner(owner);
+        }
 
         // NPM: impl + proxy. factory/WETH9 are constructor immutables on the impl; every
-        // future upgrade MUST re-pass the exact same (factoryProxy, WETH9) to the new impl.
-        NonfungiblePositionManager npmImpl = new NonfungiblePositionManager(address(factoryProxy), weth9);
+        // future upgrade MUST re-pass the exact same (factory, WETH9) to the new impl.
+        NonfungiblePositionManager npmImpl = new NonfungiblePositionManager(address(factory), weth9);
         npmImpl.initialize(address(0xdead));
 
         bytes memory npmInit = abi.encodeWithSelector(NonfungiblePositionManager.initialize.selector, tokenDescriptor);
         TransparentUpgradeableProxy npmProxy =
             new TransparentUpgradeableProxy(address(npmImpl), address(proxyAdmin), npmInit);
 
-        // SwapRouter is not upgradeable; it's a plain deploy against the factory proxy.
-        SwapRouter swapRouter = new SwapRouter(address(factoryProxy), weth9);
+        // SwapRouter is not upgradeable; plain deploy against the factory.
+        SwapRouter swapRouter = new SwapRouter(address(factory), weth9);
 
         vm.stopBroadcast();
 
         out = Deployment({
             proxyAdmin: address(proxyAdmin),
-            factoryImpl: address(factoryImpl),
-            factoryProxy: address(factoryProxy),
+            factory: address(factory),
             npmImpl: address(npmImpl),
             npmProxy: address(npmProxy),
             swapRouter: address(swapRouter)
         });
 
         console.log('--- deployed ---');
         console.log('ProxyAdmin:', out.proxyAdmin);
-        console.log('Factory impl:', out.factoryImpl);
-        console.log('Factory proxy:', out.factoryProxy);
+        console.log('Factory:', out.factory);
         console.log('NPM impl:', out.npmImpl);
         console.log('NPM proxy:', out.npmProxy);
         console.log('SwapRouter:', out.swapRouter);

src/core/ListaV3Factory.sol

@@ -1,18 +1,16 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity =0.7.6;
 
-import 'lib/openzeppelin-contracts-upgradeable/contracts/proxy/Initializable.sol';
-
 import './interfaces/IListaV3Factory.sol';
 
 import './ListaV3PoolDeployer.sol';
+import './NoDelegateCall.sol';
 
 import './ListaV3Pool.sol';
 
 /// @title Canonical Lista V3 factory
 /// @notice Deploys Lista V3 pools and manages ownership and control over pool protocol fees
-/// @dev Deployed behind a TransparentUpgradeableProxy; initialize() replaces the constructor.
-contract ListaV3Factory is IListaV3Factory, ListaV3PoolDeployer, Initializable {
+contract ListaV3Factory is IListaV3Factory, ListaV3PoolDeployer, NoDelegateCall {
     /// @inheritdoc IListaV3Factory
     address public override owner;
 
@@ -21,13 +19,9 @@ contract ListaV3Factory is IListaV3Factory, ListaV3PoolDeployer, Initializable {
     /// @inheritdoc IListaV3Factory
     mapping(address => mapping(address => mapping(uint24 => address))) public override getPool;
 
-    /// @dev Reserved for future layout additions behind the proxy.
-    uint256[50] private __gap;
-
-    function initialize(address owner_) external initializer {
-        require(owner_ != address(0));
-        owner = owner_;
-        emit OwnerChanged(address(0), owner_);
+    constructor() {
+        owner = msg.sender;
+        emit OwnerChanged(address(0), msg.sender);
 
         feeAmountTickSpacing[500] = 10;
         emit FeeAmountEnabled(500, 10);
@@ -42,7 +36,7 @@ contract ListaV3Factory is IListaV3Factory, ListaV3PoolDeployer, Initializable {
         address tokenA,
         address tokenB,
         uint24 fee
-    ) external override returns (address pool) {
+    ) external override noDelegateCall returns (address pool) {
         require(tokenA != tokenB);
         (address token0, address token1) = tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA);
         require(token0 != address(0));

test/periphery/FullFlowTest.t.sol

@@ -97,11 +97,7 @@ contract FullFlowTest is Test {
         weth = new WETH9Mock();
         proxyAdmin = new ProxyAdmin();
 
-        ListaV3Factory factoryImpl = new ListaV3Factory();
-        bytes memory factoryInit = abi.encodeWithSelector(ListaV3Factory.initialize.selector, address(this));
-        TransparentUpgradeableProxy factoryProxy =
-            new TransparentUpgradeableProxy(address(factoryImpl), address(proxyAdmin), factoryInit);
-        factory = ListaV3Factory(address(factoryProxy));
+        factory = new ListaV3Factory();
 
         NonfungiblePositionManager npmImpl = new NonfungiblePositionManager(address(factory), address(weth));
         bytes memory npmInit = abi.encodeWithSelector(NonfungiblePositionManager.initialize.selector, address(0));