From a594e0740d5f752484532ea813dd61f95e85ba25 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Wed, 20 Mar 2024 10:12:10 -0400
Subject: [PATCH] Add download option for upgradeable Foundry package (#346)

---
 packages/core/src/zip-foundry.test.ts      |  26 +-
 packages/core/src/zip-foundry.test.ts.md   | 715 +++++++++++++++++++--
 packages/core/src/zip-foundry.test.ts.snap | Bin 2266 -> 3383 bytes
 packages/core/src/zip-foundry.ts           | 175 ++++-
 packages/ui/src/App.svelte                 |   2 +-
 5 files changed, 834 insertions(+), 84 deletions(-)

diff --git a/packages/core/src/zip-foundry.test.ts b/packages/core/src/zip-foundry.test.ts
index dcbaa846..eef1c879 100644
--- a/packages/core/src/zip-foundry.test.ts
+++ b/packages/core/src/zip-foundry.test.ts
@@ -49,8 +49,14 @@ test.serial('erc20 full', async t => {
   await runTest(c, t, opts);
 });
 
-test.serial('erc721 basic', async t => {
-  const opts: GenericOptions = { kind: 'ERC721', name: 'My Token', symbol: 'MTK'};
+test.serial('erc20 uups, roles', async t => {
+  const opts: GenericOptions = { kind: 'ERC20', name: 'My Token', symbol: 'MTK', upgradeable: 'uups', access: 'roles' };
+  const c = buildERC20(opts);
+  await runTest(c, t, opts);
+});
+
+test.serial('erc721 uups, ownable', async t => {
+  const opts: GenericOptions = { kind: 'ERC721', name: 'My Token', symbol: 'MTK', upgradeable: 'uups', access: 'ownable' };
   const c = buildERC721(opts);
   await runTest(c, t, opts);
 });
@@ -61,12 +67,24 @@ test.serial('erc1155 basic', async t => {
   await runTest(c, t, opts);
 });
 
+test.serial('erc1155 transparent, ownable', async t => {
+  const opts: GenericOptions = { kind: 'ERC1155', name: 'My Token', uri: 'https://myuri/{id}', upgradeable: 'transparent', access: 'ownable' };
+  const c = buildERC1155(opts);
+  await runTest(c, t, opts);
+});
+
 test.serial('custom basic', async t => {
   const opts: GenericOptions = { kind: 'Custom', name: 'My Contract' };
   const c = buildCustom(opts);
   await runTest(c, t, opts);
 });
 
+test.serial('custom transparent, managed', async t => {
+  const opts: GenericOptions = { kind: 'Custom',  name: 'My Contract', upgradeable: 'transparent', access: 'managed' };
+  const c = buildCustom(opts);
+  await runTest(c, t, opts);
+});
+
 async function runTest(c: Contract, t: ExecutionContext<Context>, opts: GenericOptions) {
   const zip = await zipFoundry(c, opts);
 
@@ -105,8 +123,8 @@ async function extractAndRunPackage(zip: JSZip, c: Contract, t: ExecutionContext
 
   const setGitUser = 'git init && git config user.email "test@test.test" && git config user.name "Test"';
   const setup = 'bash setup.sh';
-  const test = 'forge test';
-  const script = `forge script script/${c.name}.s.sol`;
+  const test = 'forge test' + (c.upgradeable ? ' --force' : '');
+  const script = `forge script script/${c.name}.s.sol` + (c.upgradeable ? ' --force' : '');
 
   const exec = (cmd: string) => util.promisify(child.exec)(cmd, { env: { ...process.env, NO_COLOR: '' } });
 
diff --git a/packages/core/src/zip-foundry.test.ts.md b/packages/core/src/zip-foundry.test.ts.md
index bb381cce..50c069b7 100644
--- a/packages/core/src/zip-foundry.test.ts.md
+++ b/packages/core/src/zip-foundry.test.ts.md
@@ -29,6 +29,9 @@ Generated by [AVA](https://avajs.dev).
       if ! [ -f "foundry.toml" ]␊
       then␊
         echo "Initializing Foundry project..."␊
+      ␊
+        # Backup Wizard template readme to avoid it being overwritten␊
+        mv README.md README-oz.md␊
       ␊
         # Initialize sample Foundry project␊
         forge init --force --no-commit --quiet␊
@@ -36,10 +39,14 @@ Generated by [AVA](https://avajs.dev).
         # Install OpenZeppelin Contracts␊
         forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z --no-commit --quiet␊
       ␊
-        # Remove template contracts␊
+        # Remove unneeded Foundry template files␊
         rm src/Counter.sol␊
         rm script/Counter.s.sol␊
         rm test/Counter.t.sol␊
+        rm README.md␊
+      ␊
+        # Restore Wizard template readme␊
+        mv README-oz.md README.md␊
       ␊
         # Add remappings␊
         if [ -f "remappings.txt" ]␊
@@ -90,18 +97,24 @@ Generated by [AVA](https://avajs.dev).
       `// SPDX-License-Identifier: MIT␊
       pragma solidity ^0.8.20;␊
       ␊
-      import "forge-std/Script.sol";␊
-      import "../src/MyToken.sol";␊
+      import {Script} from "forge-std/Script.sol";␊
+      import {console} from "forge-std/console.sol";␊
+      import {MyToken} from "src/MyToken.sol";␊
       ␊
       contract MyTokenScript is Script {␊
         function setUp() public {}␊
       ␊
         function run() public {␊
-          // TODO: Set addresses for the contract arguments below, then uncomment the following lines␊
-          // vm.startBroadcast();␊
-          // MyToken instance = new MyToken(defaultAdmin, pauser, minter);␊
-          // console.log("Contract deployed to %s", address(instance));␊
-          // vm.stopBroadcast();␊
+          // TODO: Set addresses for the variables below, then uncomment the following section:␊
+          /*␊
+          vm.startBroadcast();␊
+          address defaultAdmin = <Set defaultAdmin address here>;␊
+          address pauser = <Set pauser address here>;␊
+          address minter = <Set minter address here>;␊
+          MyToken instance = new MyToken(defaultAdmin, pauser, minter);␊
+          console.log("Contract deployed to %s", address(instance));␊
+          vm.stopBroadcast();␊
+          */␊
         }␊
       }␊
       `,
@@ -165,8 +178,8 @@ Generated by [AVA](https://avajs.dev).
       `// SPDX-License-Identifier: MIT␊
       pragma solidity ^0.8.20;␊
       ␊
-      import "forge-std/Test.sol";␊
-      import "../src/MyToken.sol";␊
+      import {Test} from "forge-std/Test.sol";␊
+      import {MyToken} from "src/MyToken.sol";␊
       ␊
       contract MyTokenTest is Test {␊
         MyToken public instance;␊
@@ -178,14 +191,14 @@ Generated by [AVA](https://avajs.dev).
           instance = new MyToken(defaultAdmin, pauser, minter);␊
         }␊
       ␊
-        function testName() public {␊
+        function testName() public view {␊
           assertEq(instance.name(), "My Token");␊
         }␊
       }␊
       `,
     ]
 
-## erc721 basic
+## erc20 uups, roles
 
 > Snapshot 1
 
@@ -210,24 +223,40 @@ Generated by [AVA](https://avajs.dev).
       if ! [ -f "foundry.toml" ]␊
       then␊
         echo "Initializing Foundry project..."␊
+      ␊
+        # Backup Wizard template readme to avoid it being overwritten␊
+        mv README.md README-oz.md␊
       ␊
         # Initialize sample Foundry project␊
         forge init --force --no-commit --quiet␊
       ␊
-        # Install OpenZeppelin Contracts␊
-        forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z --no-commit --quiet␊
+        # Install OpenZeppelin Contracts and Upgrades␊
+        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z --no-commit --quiet␊
+        forge install OpenZeppelin/openzeppelin-foundry-upgrades --no-commit --quiet␊
       ␊
-        # Remove template contracts␊
+        # Remove unneeded Foundry template files␊
         rm src/Counter.sol␊
         rm script/Counter.s.sol␊
         rm test/Counter.t.sol␊
+        rm README.md␊
+      ␊
+        # Restore Wizard template readme␊
+        mv README-oz.md README.md␊
       ␊
         # Add remappings␊
         if [ -f "remappings.txt" ]␊
         then␊
           echo "" >> remappings.txt␊
         fi␊
-        echo "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/" >> remappings.txt␊
+        echo "@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/" >> remappings.txt␊
+        echo "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/" >> remappings.txt␊
+      ␊
+        # Add settings in foundry.toml␊
+        echo "" >> foundry.toml␊
+        echo "ffi = true" >> foundry.toml␊
+        echo "ast = true" >> foundry.toml␊
+        echo "build_info = true" >> foundry.toml␊
+        echo "extra_output = [\\"storageLayout\\"]" >> foundry.toml␊
       ␊
         # Perform initial git commit␊
         git add .␊
@@ -255,7 +284,7 @@ Generated by [AVA](https://avajs.dev).
       ## Testing the contract␊
       ␊
       \`\`\`␊
-      forge test␊
+      forge test --force␊
       \`\`\`␊
       ␊
       ## Deploying the contract␊
@@ -263,7 +292,7 @@ Generated by [AVA](https://avajs.dev).
       You can simulate a deployment by running the script:␊
       ␊
       \`\`\`␊
-      forge script script/MyToken.s.sol␊
+      forge script script/MyToken.s.sol --force␊
       \`\`\`␊
       ␊
       See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.␊
@@ -271,17 +300,28 @@ Generated by [AVA](https://avajs.dev).
       `// SPDX-License-Identifier: MIT␊
       pragma solidity ^0.8.20;␊
       ␊
-      import "forge-std/Script.sol";␊
-      import "../src/MyToken.sol";␊
+      import {Script} from "forge-std/Script.sol";␊
+      import {console} from "forge-std/console.sol";␊
+      import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
+      import {MyToken} from "src/MyToken.sol";␊
       ␊
       contract MyTokenScript is Script {␊
         function setUp() public {}␊
       ␊
         function run() public {␊
+          // TODO: Set addresses for the variables below, then uncomment the following section:␊
+          /*␊
           vm.startBroadcast();␊
-          MyToken instance = new MyToken();␊
-          console.log("Contract deployed to %s", address(instance));␊
+          address defaultAdmin = <Set defaultAdmin address here>;␊
+          address upgrader = <Set upgrader address here>;␊
+          address proxy = Upgrades.deployUUPSProxy(␊
+            "MyToken.sol",␊
+            abi.encodeCall(MyToken.initialize, (defaultAdmin, upgrader))␊
+          );␊
+          MyToken instance = MyToken(proxy);␊
+          console.log("Proxy deployed to %s", address(instance));␊
           vm.stopBroadcast();␊
+          */␊
         }␊
       }␊
       `,
@@ -289,26 +329,240 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.0.0␊
       pragma solidity ^0.8.20;␊
       ␊
-      import "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
+      import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
+      import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
+      import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
+      import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      ␊
+      contract MyToken is Initializable, ERC20Upgradeable, ERC20PermitUpgradeable, AccessControlUpgradeable, UUPSUpgradeable {␊
+          bytes32 public constant UPGRADER_ROLE = keccak256("UPGRADER_ROLE");␊
+      ␊
+          /// @custom:oz-upgrades-unsafe-allow constructor␊
+          constructor() {␊
+              _disableInitializers();␊
+          }␊
+      ␊
+          function initialize(address defaultAdmin, address upgrader)␊
+              initializer public␊
+          {␊
+              __ERC20_init("My Token", "MTK");␊
+              __ERC20Permit_init("My Token");␊
+              __AccessControl_init();␊
+              __UUPSUpgradeable_init();␊
+      ␊
+              _grantRole(DEFAULT_ADMIN_ROLE, defaultAdmin);␊
+              _grantRole(UPGRADER_ROLE, upgrader);␊
+          }␊
       ␊
-      contract MyToken is ERC721 {␊
-          constructor() ERC721("My Token", "MTK") {}␊
+          function _authorizeUpgrade(address newImplementation)␊
+              internal␊
+              onlyRole(UPGRADER_ROLE)␊
+              override␊
+          {}␊
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
       pragma solidity ^0.8.20;␊
       ␊
-      import "forge-std/Test.sol";␊
-      import "../src/MyToken.sol";␊
+      import {Test} from "forge-std/Test.sol";␊
+      import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
+      import {MyToken} from "src/MyToken.sol";␊
       ␊
       contract MyTokenTest is Test {␊
         MyToken public instance;␊
       ␊
         function setUp() public {␊
-          instance = new MyToken();␊
+          address defaultAdmin = vm.addr(1);␊
+          address upgrader = vm.addr(2);␊
+          address proxy = Upgrades.deployUUPSProxy(␊
+            "MyToken.sol",␊
+            abi.encodeCall(MyToken.initialize, (defaultAdmin, upgrader))␊
+          );␊
+          instance = MyToken(proxy);␊
         }␊
       ␊
-        function testName() public {␊
+        function testName() public view {␊
+          assertEq(instance.name(), "My Token");␊
+        }␊
+      }␊
+      `,
+    ]
+
+## erc721 uups, ownable
+
+> Snapshot 1
+
+    [
+      `#!/usr/bin/env bash␊
+      ␊
+      # Check if git is installed␊
+      if ! which git &> /dev/null␊
+      then␊
+        echo "git command not found. Install git and try again."␊
+        exit 1␊
+      fi␊
+      ␊
+      # Check if Foundry is installed␊
+      if ! which forge &> /dev/null␊
+      then␊
+        echo "forge command not found. Install Foundry and try again. See https://book.getfoundry.sh/getting-started/installation"␊
+        exit 1␊
+      fi␊
+      ␊
+      # Setup Foundry project␊
+      if ! [ -f "foundry.toml" ]␊
+      then␊
+        echo "Initializing Foundry project..."␊
+      ␊
+        # Backup Wizard template readme to avoid it being overwritten␊
+        mv README.md README-oz.md␊
+      ␊
+        # Initialize sample Foundry project␊
+        forge init --force --no-commit --quiet␊
+      ␊
+        # Install OpenZeppelin Contracts and Upgrades␊
+        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z --no-commit --quiet␊
+        forge install OpenZeppelin/openzeppelin-foundry-upgrades --no-commit --quiet␊
+      ␊
+        # Remove unneeded Foundry template files␊
+        rm src/Counter.sol␊
+        rm script/Counter.s.sol␊
+        rm test/Counter.t.sol␊
+        rm README.md␊
+      ␊
+        # Restore Wizard template readme␊
+        mv README-oz.md README.md␊
+      ␊
+        # Add remappings␊
+        if [ -f "remappings.txt" ]␊
+        then␊
+          echo "" >> remappings.txt␊
+        fi␊
+        echo "@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/" >> remappings.txt␊
+        echo "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/" >> remappings.txt␊
+      ␊
+        # Add settings in foundry.toml␊
+        echo "" >> foundry.toml␊
+        echo "ffi = true" >> foundry.toml␊
+        echo "ast = true" >> foundry.toml␊
+        echo "build_info = true" >> foundry.toml␊
+        echo "extra_output = [\\"storageLayout\\"]" >> foundry.toml␊
+      ␊
+        # Perform initial git commit␊
+        git add .␊
+        git commit -m "openzeppelin: add wizard output" --quiet␊
+      ␊
+        echo "Done."␊
+      else␊
+        echo "Foundry project already initialized."␊
+      fi␊
+      `,
+      `# Sample Foundry Project␊
+      ␊
+      This project demonstrates a basic Foundry use case. It comes with a contract generated by [OpenZeppelin Wizard](https://wizard.openzeppelin.com/), a test for that contract, and a script that deploys that contract.␊
+      ␊
+      ## Installing Foundry␊
+      ␊
+      See [Foundry installation guide](https://book.getfoundry.sh/getting-started/installation).␊
+      ␊
+      ## Initializing the project␊
+      ␊
+      \`\`\`␊
+      bash setup.sh␊
+      \`\`\`␊
+      ␊
+      ## Testing the contract␊
+      ␊
+      \`\`\`␊
+      forge test --force␊
+      \`\`\`␊
+      ␊
+      ## Deploying the contract␊
+      ␊
+      You can simulate a deployment by running the script:␊
+      ␊
+      \`\`\`␊
+      forge script script/MyToken.s.sol --force␊
+      \`\`\`␊
+      ␊
+      See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.␊
+      `,
+      `// SPDX-License-Identifier: MIT␊
+      pragma solidity ^0.8.20;␊
+      ␊
+      import {Script} from "forge-std/Script.sol";␊
+      import {console} from "forge-std/console.sol";␊
+      import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
+      import {MyToken} from "src/MyToken.sol";␊
+      ␊
+      contract MyTokenScript is Script {␊
+        function setUp() public {}␊
+      ␊
+        function run() public {␊
+          // TODO: Set addresses for the variables below, then uncomment the following section:␊
+          /*␊
+          vm.startBroadcast();␊
+          address initialOwner = <Set initialOwner address here>;␊
+          address proxy = Upgrades.deployUUPSProxy(␊
+            "MyToken.sol",␊
+            abi.encodeCall(MyToken.initialize, (initialOwner))␊
+          );␊
+          MyToken instance = MyToken(proxy);␊
+          console.log("Proxy deployed to %s", address(instance));␊
+          vm.stopBroadcast();␊
+          */␊
+        }␊
+      }␊
+      `,
+      `// SPDX-License-Identifier: MIT␊
+      // Compatible with OpenZeppelin Contracts ^5.0.0␊
+      pragma solidity ^0.8.20;␊
+      ␊
+      import "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
+      import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      ␊
+      contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
+          /// @custom:oz-upgrades-unsafe-allow constructor␊
+          constructor() {␊
+              _disableInitializers();␊
+          }␊
+      ␊
+          function initialize(address initialOwner) initializer public {␊
+              __ERC721_init("My Token", "MTK");␊
+              __Ownable_init(initialOwner);␊
+              __UUPSUpgradeable_init();␊
+          }␊
+      ␊
+          function _authorizeUpgrade(address newImplementation)␊
+              internal␊
+              onlyOwner␊
+              override␊
+          {}␊
+      }␊
+      `,
+      `// SPDX-License-Identifier: MIT␊
+      pragma solidity ^0.8.20;␊
+      ␊
+      import {Test} from "forge-std/Test.sol";␊
+      import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
+      import {MyToken} from "src/MyToken.sol";␊
+      ␊
+      contract MyTokenTest is Test {␊
+        MyToken public instance;␊
+      ␊
+        function setUp() public {␊
+          address initialOwner = vm.addr(1);␊
+          address proxy = Upgrades.deployUUPSProxy(␊
+            "MyToken.sol",␊
+            abi.encodeCall(MyToken.initialize, (initialOwner))␊
+          );␊
+          instance = MyToken(proxy);␊
+        }␊
+      ␊
+        function testName() public view {␊
           assertEq(instance.name(), "My Token");␊
         }␊
       }␊
@@ -340,6 +594,9 @@ Generated by [AVA](https://avajs.dev).
       if ! [ -f "foundry.toml" ]␊
       then␊
         echo "Initializing Foundry project..."␊
+      ␊
+        # Backup Wizard template readme to avoid it being overwritten␊
+        mv README.md README-oz.md␊
       ␊
         # Initialize sample Foundry project␊
         forge init --force --no-commit --quiet␊
@@ -347,10 +604,14 @@ Generated by [AVA](https://avajs.dev).
         # Install OpenZeppelin Contracts␊
         forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z --no-commit --quiet␊
       ␊
-        # Remove template contracts␊
+        # Remove unneeded Foundry template files␊
         rm src/Counter.sol␊
         rm script/Counter.s.sol␊
         rm test/Counter.t.sol␊
+        rm README.md␊
+      ␊
+        # Restore Wizard template readme␊
+        mv README-oz.md README.md␊
       ␊
         # Add remappings␊
         if [ -f "remappings.txt" ]␊
@@ -401,18 +662,22 @@ Generated by [AVA](https://avajs.dev).
       `// SPDX-License-Identifier: MIT␊
       pragma solidity ^0.8.20;␊
       ␊
-      import "forge-std/Script.sol";␊
-      import "../src/MyToken.sol";␊
+      import {Script} from "forge-std/Script.sol";␊
+      import {console} from "forge-std/console.sol";␊
+      import {MyToken} from "src/MyToken.sol";␊
       ␊
       contract MyTokenScript is Script {␊
         function setUp() public {}␊
       ␊
         function run() public {␊
-          // TODO: Set addresses for the contract arguments below, then uncomment the following lines␊
-          // vm.startBroadcast();␊
-          // MyToken instance = new MyToken(initialOwner);␊
-          // console.log("Contract deployed to %s", address(instance));␊
-          // vm.stopBroadcast();␊
+          // TODO: Set addresses for the variables below, then uncomment the following section:␊
+          /*␊
+          vm.startBroadcast();␊
+          address initialOwner = <Set initialOwner address here>;␊
+          MyToken instance = new MyToken(initialOwner);␊
+          console.log("Contract deployed to %s", address(instance));␊
+          vm.stopBroadcast();␊
+          */␊
         }␊
       }␊
       `,
@@ -437,8 +702,8 @@ Generated by [AVA](https://avajs.dev).
       `// SPDX-License-Identifier: MIT␊
       pragma solidity ^0.8.20;␊
       ␊
-      import "forge-std/Test.sol";␊
-      import "../src/MyToken.sol";␊
+      import {Test} from "forge-std/Test.sol";␊
+      import {MyToken} from "src/MyToken.sol";␊
       ␊
       contract MyTokenTest is Test {␊
         MyToken public instance;␊
@@ -448,7 +713,185 @@ Generated by [AVA](https://avajs.dev).
           instance = new MyToken(initialOwner);␊
         }␊
       ␊
-        function testUri() public {␊
+        function testUri() public view {␊
+          assertEq(instance.uri(0), "https://myuri/{id}");␊
+        }␊
+      }␊
+      `,
+    ]
+
+## erc1155 transparent, ownable
+
+> Snapshot 1
+
+    [
+      `#!/usr/bin/env bash␊
+      ␊
+      # Check if git is installed␊
+      if ! which git &> /dev/null␊
+      then␊
+        echo "git command not found. Install git and try again."␊
+        exit 1␊
+      fi␊
+      ␊
+      # Check if Foundry is installed␊
+      if ! which forge &> /dev/null␊
+      then␊
+        echo "forge command not found. Install Foundry and try again. See https://book.getfoundry.sh/getting-started/installation"␊
+        exit 1␊
+      fi␊
+      ␊
+      # Setup Foundry project␊
+      if ! [ -f "foundry.toml" ]␊
+      then␊
+        echo "Initializing Foundry project..."␊
+      ␊
+        # Backup Wizard template readme to avoid it being overwritten␊
+        mv README.md README-oz.md␊
+      ␊
+        # Initialize sample Foundry project␊
+        forge init --force --no-commit --quiet␊
+      ␊
+        # Install OpenZeppelin Contracts and Upgrades␊
+        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z --no-commit --quiet␊
+        forge install OpenZeppelin/openzeppelin-foundry-upgrades --no-commit --quiet␊
+      ␊
+        # Remove unneeded Foundry template files␊
+        rm src/Counter.sol␊
+        rm script/Counter.s.sol␊
+        rm test/Counter.t.sol␊
+        rm README.md␊
+      ␊
+        # Restore Wizard template readme␊
+        mv README-oz.md README.md␊
+      ␊
+        # Add remappings␊
+        if [ -f "remappings.txt" ]␊
+        then␊
+          echo "" >> remappings.txt␊
+        fi␊
+        echo "@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/" >> remappings.txt␊
+        echo "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/" >> remappings.txt␊
+      ␊
+        # Add settings in foundry.toml␊
+        echo "" >> foundry.toml␊
+        echo "ffi = true" >> foundry.toml␊
+        echo "ast = true" >> foundry.toml␊
+        echo "build_info = true" >> foundry.toml␊
+        echo "extra_output = [\\"storageLayout\\"]" >> foundry.toml␊
+      ␊
+        # Perform initial git commit␊
+        git add .␊
+        git commit -m "openzeppelin: add wizard output" --quiet␊
+      ␊
+        echo "Done."␊
+      else␊
+        echo "Foundry project already initialized."␊
+      fi␊
+      `,
+      `# Sample Foundry Project␊
+      ␊
+      This project demonstrates a basic Foundry use case. It comes with a contract generated by [OpenZeppelin Wizard](https://wizard.openzeppelin.com/), a test for that contract, and a script that deploys that contract.␊
+      ␊
+      ## Installing Foundry␊
+      ␊
+      See [Foundry installation guide](https://book.getfoundry.sh/getting-started/installation).␊
+      ␊
+      ## Initializing the project␊
+      ␊
+      \`\`\`␊
+      bash setup.sh␊
+      \`\`\`␊
+      ␊
+      ## Testing the contract␊
+      ␊
+      \`\`\`␊
+      forge test --force␊
+      \`\`\`␊
+      ␊
+      ## Deploying the contract␊
+      ␊
+      You can simulate a deployment by running the script:␊
+      ␊
+      \`\`\`␊
+      forge script script/MyToken.s.sol --force␊
+      \`\`\`␊
+      ␊
+      See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.␊
+      `,
+      `// SPDX-License-Identifier: MIT␊
+      pragma solidity ^0.8.20;␊
+      ␊
+      import {Script} from "forge-std/Script.sol";␊
+      import {console} from "forge-std/console.sol";␊
+      import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
+      import {MyToken} from "src/MyToken.sol";␊
+      ␊
+      contract MyTokenScript is Script {␊
+        function setUp() public {}␊
+      ␊
+        function run() public {␊
+          // TODO: Set addresses for the variables below, then uncomment the following section:␊
+          /*␊
+          vm.startBroadcast();␊
+          address initialOwner = <Set initialOwner address here>;␊
+          address proxy = Upgrades.deployTransparentProxy(␊
+            "MyToken.sol",␊
+            initialOwner,␊
+            abi.encodeCall(MyToken.initialize, (initialOwner))␊
+          );␊
+          MyToken instance = MyToken(proxy);␊
+          console.log("Proxy deployed to %s", address(instance));␊
+          vm.stopBroadcast();␊
+          */␊
+        }␊
+      }␊
+      `,
+      `// SPDX-License-Identifier: MIT␊
+      // Compatible with OpenZeppelin Contracts ^5.0.0␊
+      pragma solidity ^0.8.20;␊
+      ␊
+      import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
+      import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      ␊
+      contract MyToken is Initializable, ERC1155Upgradeable, OwnableUpgradeable {␊
+          /// @custom:oz-upgrades-unsafe-allow constructor␊
+          constructor() {␊
+              _disableInitializers();␊
+          }␊
+      ␊
+          function initialize(address initialOwner) initializer public {␊
+              __ERC1155_init("https://myuri/{id}");␊
+              __Ownable_init(initialOwner);␊
+          }␊
+      ␊
+          function setURI(string memory newuri) public onlyOwner {␊
+              _setURI(newuri);␊
+          }␊
+      }␊
+      `,
+      `// SPDX-License-Identifier: MIT␊
+      pragma solidity ^0.8.20;␊
+      ␊
+      import {Test} from "forge-std/Test.sol";␊
+      import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
+      import {MyToken} from "src/MyToken.sol";␊
+      ␊
+      contract MyTokenTest is Test {␊
+        MyToken public instance;␊
+      ␊
+        function setUp() public {␊
+          address initialOwner = vm.addr(1);␊
+          address proxy = Upgrades.deployTransparentProxy(␊
+            "MyToken.sol",␊
+            initialOwner,␊
+            abi.encodeCall(MyToken.initialize, (initialOwner))␊
+          );␊
+          instance = MyToken(proxy);␊
+        }␊
+      ␊
+        function testUri() public view {␊
           assertEq(instance.uri(0), "https://myuri/{id}");␊
         }␊
       }␊
@@ -480,6 +923,9 @@ Generated by [AVA](https://avajs.dev).
       if ! [ -f "foundry.toml" ]␊
       then␊
         echo "Initializing Foundry project..."␊
+      ␊
+        # Backup Wizard template readme to avoid it being overwritten␊
+        mv README.md README-oz.md␊
       ␊
         # Initialize sample Foundry project␊
         forge init --force --no-commit --quiet␊
@@ -487,10 +933,14 @@ Generated by [AVA](https://avajs.dev).
         # Install OpenZeppelin Contracts␊
         forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z --no-commit --quiet␊
       ␊
-        # Remove template contracts␊
+        # Remove unneeded Foundry template files␊
         rm src/Counter.sol␊
         rm script/Counter.s.sol␊
         rm test/Counter.t.sol␊
+        rm README.md␊
+      ␊
+        # Restore Wizard template readme␊
+        mv README-oz.md README.md␊
       ␊
         # Add remappings␊
         if [ -f "remappings.txt" ]␊
@@ -541,8 +991,9 @@ Generated by [AVA](https://avajs.dev).
       `// SPDX-License-Identifier: MIT␊
       pragma solidity ^0.8.20;␊
       ␊
-      import "forge-std/Script.sol";␊
-      import "../src/MyContract.sol";␊
+      import {Script} from "forge-std/Script.sol";␊
+      import {console} from "forge-std/console.sol";␊
+      import {MyContract} from "src/MyContract.sol";␊
       ␊
       contract MyContractScript is Script {␊
         function setUp() public {}␊
@@ -565,8 +1016,8 @@ Generated by [AVA](https://avajs.dev).
       `// SPDX-License-Identifier: MIT␊
       pragma solidity ^0.8.20;␊
       ␊
-      import "forge-std/Test.sol";␊
-      import "../src/MyContract.sol";␊
+      import {Test} from "forge-std/Test.sol";␊
+      import {MyContract} from "src/MyContract.sol";␊
       ␊
       contract MyContractTest is Test {␊
         MyContract public instance;␊
@@ -581,3 +1032,177 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
     ]
+
+## custom transparent, managed
+
+> Snapshot 1
+
+    [
+      `#!/usr/bin/env bash␊
+      ␊
+      # Check if git is installed␊
+      if ! which git &> /dev/null␊
+      then␊
+        echo "git command not found. Install git and try again."␊
+        exit 1␊
+      fi␊
+      ␊
+      # Check if Foundry is installed␊
+      if ! which forge &> /dev/null␊
+      then␊
+        echo "forge command not found. Install Foundry and try again. See https://book.getfoundry.sh/getting-started/installation"␊
+        exit 1␊
+      fi␊
+      ␊
+      # Setup Foundry project␊
+      if ! [ -f "foundry.toml" ]␊
+      then␊
+        echo "Initializing Foundry project..."␊
+      ␊
+        # Backup Wizard template readme to avoid it being overwritten␊
+        mv README.md README-oz.md␊
+      ␊
+        # Initialize sample Foundry project␊
+        forge init --force --no-commit --quiet␊
+      ␊
+        # Install OpenZeppelin Contracts and Upgrades␊
+        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z --no-commit --quiet␊
+        forge install OpenZeppelin/openzeppelin-foundry-upgrades --no-commit --quiet␊
+      ␊
+        # Remove unneeded Foundry template files␊
+        rm src/Counter.sol␊
+        rm script/Counter.s.sol␊
+        rm test/Counter.t.sol␊
+        rm README.md␊
+      ␊
+        # Restore Wizard template readme␊
+        mv README-oz.md README.md␊
+      ␊
+        # Add remappings␊
+        if [ -f "remappings.txt" ]␊
+        then␊
+          echo "" >> remappings.txt␊
+        fi␊
+        echo "@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/" >> remappings.txt␊
+        echo "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/" >> remappings.txt␊
+      ␊
+        # Add settings in foundry.toml␊
+        echo "" >> foundry.toml␊
+        echo "ffi = true" >> foundry.toml␊
+        echo "ast = true" >> foundry.toml␊
+        echo "build_info = true" >> foundry.toml␊
+        echo "extra_output = [\\"storageLayout\\"]" >> foundry.toml␊
+      ␊
+        # Perform initial git commit␊
+        git add .␊
+        git commit -m "openzeppelin: add wizard output" --quiet␊
+      ␊
+        echo "Done."␊
+      else␊
+        echo "Foundry project already initialized."␊
+      fi␊
+      `,
+      `# Sample Foundry Project␊
+      ␊
+      This project demonstrates a basic Foundry use case. It comes with a contract generated by [OpenZeppelin Wizard](https://wizard.openzeppelin.com/), a test for that contract, and a script that deploys that contract.␊
+      ␊
+      ## Installing Foundry␊
+      ␊
+      See [Foundry installation guide](https://book.getfoundry.sh/getting-started/installation).␊
+      ␊
+      ## Initializing the project␊
+      ␊
+      \`\`\`␊
+      bash setup.sh␊
+      \`\`\`␊
+      ␊
+      ## Testing the contract␊
+      ␊
+      \`\`\`␊
+      forge test --force␊
+      \`\`\`␊
+      ␊
+      ## Deploying the contract␊
+      ␊
+      You can simulate a deployment by running the script:␊
+      ␊
+      \`\`\`␊
+      forge script script/MyContract.s.sol --force␊
+      \`\`\`␊
+      ␊
+      See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.␊
+      `,
+      `// SPDX-License-Identifier: MIT␊
+      pragma solidity ^0.8.20;␊
+      ␊
+      import {Script} from "forge-std/Script.sol";␊
+      import {console} from "forge-std/console.sol";␊
+      import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
+      import {MyContract} from "src/MyContract.sol";␊
+      ␊
+      contract MyContractScript is Script {␊
+        function setUp() public {}␊
+      ␊
+        function run() public {␊
+          // TODO: Set addresses for the variables below, then uncomment the following section:␊
+          /*␊
+          vm.startBroadcast();␊
+          address initialOwner = <Set initialOwner address here>;␊
+          address initialAuthority = <Set initialAuthority address here>;␊
+          address proxy = Upgrades.deployTransparentProxy(␊
+            "MyContract.sol",␊
+            initialOwner,␊
+            abi.encodeCall(MyContract.initialize, (initialAuthority))␊
+          );␊
+          MyContract instance = MyContract(proxy);␊
+          console.log("Proxy deployed to %s", address(instance));␊
+          vm.stopBroadcast();␊
+          */␊
+        }␊
+      }␊
+      `,
+      `// SPDX-License-Identifier: MIT␊
+      // Compatible with OpenZeppelin Contracts ^5.0.0␊
+      pragma solidity ^0.8.20;␊
+      ␊
+      import "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
+      import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      ␊
+      contract MyContract is Initializable, AccessManagedUpgradeable {␊
+          /// @custom:oz-upgrades-unsafe-allow constructor␊
+          constructor() {␊
+              _disableInitializers();␊
+          }␊
+      ␊
+          function initialize(address initialAuthority) initializer public {␊
+              __AccessManaged_init(initialAuthority);␊
+          }␊
+      }␊
+      `,
+      `// SPDX-License-Identifier: MIT␊
+      pragma solidity ^0.8.20;␊
+      ␊
+      import {Test} from "forge-std/Test.sol";␊
+      import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";␊
+      import {MyContract} from "src/MyContract.sol";␊
+      ␊
+      contract MyContractTest is Test {␊
+        MyContract public instance;␊
+      ␊
+        function setUp() public {␊
+          address initialOwner = vm.addr(1);␊
+          address initialAuthority = vm.addr(2);␊
+          address proxy = Upgrades.deployTransparentProxy(␊
+            "MyContract.sol",␊
+            initialOwner,␊
+            abi.encodeCall(MyContract.initialize, (initialAuthority))␊
+          );␊
+          instance = MyContract(proxy);␊
+        }␊
+      ␊
+        function testSomething() public {␊
+          // Add your test here␊
+        }␊
+      }␊
+      `,
+    ]
diff --git a/packages/core/src/zip-foundry.test.ts.snap b/packages/core/src/zip-foundry.test.ts.snap
index c2e9f120a4d81b968e75696b7bcc623f07309262..b3cd77b1451144419ef7c309a573b62b5c31aa72 100644
GIT binary patch
literal 3383
zcmV-74ao9ARzV<BZeeh9Xm4~Nb~6eC02ew&m9NKD3T)h3ZkbzBPl;K@^2=c4p09+Q
z)OVo)j30{#00000000B+T+MG3$rbN`z>)z%*xj6xm5L#WX3$Kx?G;I61HxbvSzzq=
zW3#}rrafIV)9e1CyV_=qI3zjbmK<`)$7%N;h?IX|r9I>n<rFFB{1rJx%B!#bnw}Zk
zj6Jq#B<Sg?SFc{ZdiCnPUsdyEYtwR@TfuL?!o(yN{sQ~WsR`5yEz1lX-3vM{34ZmZ
zVdzAE@?qz!@}5HflrEIc--72o_`7jVQLbH3l#3S?g}kpQAC%5tEuEY7eZ5;M$zNBl
zTv1A8rF2dyT>^?T%7>-1@OJgg#dFuMX<^`No2H{-XB%zmL8n~4j_!AGa|@X*)HVq+
z17tb@(Jc!bWhlFbb~<LW!|Hx~2WbZ0)*O(zOgh*pBZQkB7gcC&)3t5gF_7aD)N(_|
zP|*VC#2V8o;&+kW)=fvP(5A1Tc(U9wQ$jqTO@XeTAT8H#;{l@Z`T@eo4$=alRg6)G
z5HFb4v`yFDQrnocIH?+RG<YMX({2C{pI}21vgyQhou0w0ViI~$N1pF~ft!R6;u&hR
zsF0j7ac!%Do~K8!;F!eJEpr$8%Q8__P#sWSNB8vR7IgAUb659aAlUXm7>s<Z8#YG7
zMf$dD8VID?#FUY{jr|?pB!u;3Z=;p@*}27e)i%VhhPw+doOvVyMu85TanE3om<SUn
zQKJDbO$<-RZBW&-vX`NWiR8z1zvN-(DfT>UnGU+|I>gtTBuFspCDUAZ*%dFqT(r5n
z{i*syecHdv6>P(hQRp}r8`y{j5NWDqT9|h2+bHmx+I^@e*jEGB5`|6Q^hjJD*AN`U
z<s>eTG%6(si0k7%Q<R(puKH~IS;GKYTlYMeKPo905I3K=R3)znH6Vn92}vWWpgVU^
znvSa3jI8W#Qm<O1SM9cCZuZf6f+~+a6M7l@Fqby73$P$0J%dTRXMO-irHbEj-fUD!
z_BhRmcDUNyka!`CF)_J(0CTQ`VKHDUz)@MoN|A0+Wp|}CV9y3L0WApUSSm^H_}4SA
zY}2N`EKI$;)&XZESsGwhV5UCIWPo()M9pT@Bn-gy=m7?A!$t=rJ0|G>om3raV+Yg5
z2HNbRXQ>6j4dr=Nx*@IsHK`gEm}<2;Fr-FEmkmt3P9pYo=GJs!yu8l9p5=CfG@%N9
zDq5EbM^i3SNBAuA!U;Er+M#LSSiF6D$(rmk;oZP!Bac#k@#009?nx-1?i1Lt653`B
z#wy9>060DO8&nq&@f;g&FZmNUgt>80VA>&Dhq};=jU7TK!v|j>n{oY3Cp!@;6>ed%
zyXJ0TN4N#nH&fiIYng^gx`K}K8?H7If};SX1X>`PH=^b>Hpw=1B&I``7E`7gS@0QY
z!T&y^X=rtM?$gF2vx%JmHx>*Snb|V2KaCa_*2<o*w{5TuDdOi7>d(}viJ5ZQv_01+
z==Cb=^$lwIt}V7wm`g+B<#ec(nTQxv3kA5BT2y4ng~lW~^|_G}8DTkEBch!5N+SXB
z>os*@q0?m62v)N0Rcpu#H!WC#uiuoDwJ@29I_4NbJ!?yIOVf0FrXI$}K>!PsuOW=K
zb(n%p*b`vGwA`IK^Qf?YP$xw#gwnKJ3##a(2AK6T%{kv-k8N9JhJVj@bpzZ0sn%v#
zh3E|It)+(+nKf)!?YGe_DoCnK5_YhU@1)y$Iye_!wi0gx=z$%H>BU<Pz0fsZ=?-k-
zw~>Q)WN|eqUR`us7wp97<aAqZyIPT(x>#G_<{%XLQBbMNzN@mMnrP0n=6XF!yP?73
zP5Dh^>1U;-fAZciONaXVuI<56feGa<I6w42pWjp`)QRCsqwju6sG79-mHSf@{NJ?M
z@2MSr1yNZ5<`nRPd!g@8Qyc-SWtg#ju+p1Nm?LeLJ(!kUYZOvoA2#|CF#5y=Uq1pq
z4=mVd7Qu@9`5x+Z7-b!$rbN6-wboHeRkD^1SG+Kh#qX$F;gUAHQ1|ha^iy;t!P+2b
zd3Jquer022>Crr_$1U7!>RVGce^RX^Dk@@~^y9I(@OUkkN1}rAh}JOi!zS!Q)jV%i
z&-kHw#?RCk7y5^d6FTW4rbk%#mBqD(l?(ybP=butzmBLj+CB_o1^h~NZvMgS`lGcC
z2#yyXGqLL_*@PZ4trD7&ek(~x#je^xTMe*d(D6)7OiZ8~XcGRp0qmQm4f}Dmmd`w)
z!i+O~!}S^ML#*d`CvqLDn-#B?9JZj(XBIm9Wf!%`XUMc5XOg&e6hZ+Q3DRwv-t_j9
z7<j55#)vWy4O89GjW@M<%KjmMhOmZarapv70VEU<<NG``mVuO-5qTr@42a$$scAG3
zTVrwz+qxCv*zVXYIl2`U$bPHIbsjJ5c=2X!GYCCM{G=dU0NOF{FkjP-3tL_gN$u`9
z$wkA}9KCLvc&Cq;(zQHh{9+D1#LPY@v?@lQm6_KI(S<Nv2q|y8(SA#AwEro+eMm`T
z_udeZmcDg-NSRPS&7O3q(sv81m666wDl*K*je{aIh)rlsb+Xnc7?T83wLa08B=}em
z95l>IN4GTLd92$BPe4sZjs?P6pUl6EA}!Tnq|_5f?si55R|1WE$<fF#^kA!kjSL69
zpyc-+=7EwAq3ENsqWu1{qI|t?Q1ZX$3sABEC66O0$);l6gFWBC2SO+tA#Y4~lR;?Z
z-dT$Yl8l1_{5(SNGdZ2wficn{0;D?Gt1x>&WvMm;?kuPWL&>FHPH8Q-rqwcGzk>V#
z_oso(eJIUlXj;Ywg|UW`Lc-?j8yx%v;%A>#s6FXz{7COY>1UPay=_l40R43VK%Z;?
zT5dSw1ftV2j2V#LID5PSX}P&e`hk0`CaDWldz7fQP;Z1&NAH7>aNm8^g$B`#@YS=v
zzP!3jtEwXDtt2O+E(-NcQ^hcP1K$U~P?aRHf3BlUGA2c;@szsO7dDr<9Fs2(8)woT
zCNTcdx#I(jr$Uq-kbFI^+#8zPmt8*8{C52FQ1G|o$ZSFji3u(>+JHvDiyD2eWVvW|
zs#^hXC7Pz7>r{C^HPlh2_aUJ6`tr|LX6JGt=~Pt&N^4-Pcbg$B0(;usja+dfbOODF
z8#?t`N#wc*$xcC(hRJ}vIE(ayez0il4TgZ>k#9(#j1l`Js+W*sgXwvL66V0<Gg(4D
zAzAViU21|jWvV_iO%cWD!1mPqC0u5{dN=ftbRfRi#X_n`%MRXIpdm2bnt04M0KS!&
zbgJ{Xfy7O@{&Vro?g);|_l$3jDcl$zNSfH&`@y8gVk;lGg&#8R3O3#R>C~hEUfmsb
z#@GwJet-u-ufMpgDCe&h&}#v`7SL+}y%x}G0lgN`YXQ9$(CfPky<RJz*LMPX6~1kW
zUgVJwYN~9UFlthe69ArmHFV948$5+XQ9MQhZ!Ym{^ArM`X${p;?@0S$m&XZmOs$_B
zU@;3S!l?IxDhg$A(o`RN!3+-<&tr1z2f=$(Ab1Bs@G|>G-)oNJ+aksZ%Gua&PEOvu
z$pideH10c%L0@P8rK~8wzEpgjU7&HN1C2Wf09SmSU3{Hge4Sk&G{x81(t_K?*V(5L
zOd0a^bWVD8<X=nwYv@N@<M>*d#@F(>zi*R8{yOBtUCK8~{Dq0-edL;&p(yhd45}6B
z7VK{5o7!vBc$4^&RdBEN@_3z1k?C?+S*Swy)I4q2rNDiIr2yB|N0!{s5{bQNC`bo<
ztM|uu?pwVfN$g&iWN$LL?wfneC1Fmg6Ev61vy)6#`RWHUtpvq5fv5X0J%jFiTpe`h
z!@8^}zx!@+=cC9nPe+zn-1#W7+2YPeap$AB^HCrQ#hs6XAPl#PJ0As1aj-idYjHv{
z{9G^D*D1aZa^=`x2T4LGC+9-Q9<Oj@29<Y*;}l%kpraIbHu@n5l6u&+jiX1LyyEV~
z(cirov#Z|cwT#0-(k#B(`(4ktr1ZO<@xu#>^1p8@${)(b^^5{II~~B;L9nvodPZ?Q
zW0YXZ-wH70WP>S34x&i+b&PIk{CxxmsE2z)Ln<vDzs9QU31MZ`h%u195JlW$@9C?o
zsUGG%h}=y6H_8!a@;TZEt>t7-PmlJz{=l}AlL18o+kX-?#4LI<h*j7JNC(z&4iHE8
z_^uoJ+?`XnD|6!heUT`n4%{KM)!W$U%^TkTXTJk?1o^^0E-T8l;=sMg8%{~yP#m}y
z`AKo$UL3d|RgU;gkt3e$9C2(1?&)0dSe?25>D@SUKQ4*q$v%7+bhG?pY0}NKkIP4T
zfS;PBeH{!%E%VNXB5AWn`FRLHBF!7$f&RUr$CYC`&=;rgJTLXd|2n(Kv(%$Ii;w56
z=QzHfM9234KDN$bhw!Pfr4H9)9s|z6|9k?^z>f(Ow9oVK9Phc$|5fzZILTq2aYQKC
N{{eM^;BIn$008n5k@Nrn

literal 2266
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

diff --git a/packages/core/src/zip-foundry.ts b/packages/core/src/zip-foundry.ts
index 8be93766..96b88122 100644
--- a/packages/core/src/zip-foundry.ts
+++ b/packages/core/src/zip-foundry.ts
@@ -24,10 +24,14 @@ const test = (c: Contract, opts?: GenericOptions) => {
   );
 
   function getImports(c: Contract) {
-    return [
-      'import "forge-std/Test.sol";',
-      `import "../src/${c.name}.sol";`,
+    const result = [
+      'import {Test} from "forge-std/Test.sol";',
     ];
+    if (c.upgradeable) {
+      result.push('import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";');
+    }
+    result.push(`import {${c.name}} from "src/${c.name}.sol";`);
+    return result;
   }
 
   function getTestCase(c: Contract) {
@@ -40,10 +44,8 @@ const test = (c: Contract, opts?: GenericOptions) => {
         ],
         [
           'function setUp() public {',
-          getAddressVariables(args),
-          [
-            `instance = new ${getDeploymentCall(c, args)};`,
-          ],
+          getAddressVariables(c, args),
+          getDeploymentCode(c, args),
           '}',
         ],
         getContractSpecificTestFunction(),
@@ -52,11 +54,45 @@ const test = (c: Contract, opts?: GenericOptions) => {
     ];
   }
 
-  function getAddressVariables(args: string[]): Lines[] {
+  function getDeploymentCode(c: Contract, args: string[]): Lines[] {
+    if (c.upgradeable) {
+      if (opts?.upgradeable === 'transparent') {
+        return [
+          `address proxy = Upgrades.deployTransparentProxy(`,
+          [
+            `"${c.name}.sol",`,
+            `initialOwner,`,
+            `abi.encodeCall(${c.name}.initialize, (${args.join(', ')}))`
+          ],
+          ');',
+          `instance = ${c.name}(proxy);`,
+        ];
+      } else {
+        return [
+          `address proxy = Upgrades.deployUUPSProxy(`,
+          [
+            `"${c.name}.sol",`,
+            `abi.encodeCall(${c.name}.initialize, (${args.join(', ')}))`
+          ],
+          ');',
+          `instance = ${c.name}(proxy);`,
+        ];
+      }
+    } else {
+      return [
+        `instance = new ${c.name}(${args.join(', ')});`,
+      ];
+    }
+  }
+
+  function getAddressVariables(c: Contract, args: string[]): Lines[] {
     const vars = [];
-    for (let i = 0; i < args.length; i++) {
-      // use i + 1 as the private key since it must be non-zero
-      vars.push(`address ${args[i]} = vm.addr(${i + 1});`);
+    let i = 1; // private key index starts from 1 since it must be non-zero
+    if (c.upgradeable && opts?.upgradeable === 'transparent' && !args.includes('initialOwner')) {
+      vars.push(`address initialOwner = vm.addr(${i++});`);
+    }
+    for (const arg of args) {
+      vars.push(`address ${arg} = vm.addr(${i++});`);
     }
     return vars;
   }
@@ -67,7 +103,7 @@ const test = (c: Contract, opts?: GenericOptions) => {
         case 'ERC20':
         case 'ERC721':
           return [
-            'function testName() public {',
+            'function testName() public view {',
             [
               `assertEq(instance.name(), "${opts.name}");`
             ],
@@ -76,7 +112,7 @@ const test = (c: Contract, opts?: GenericOptions) => {
 
         case 'ERC1155':
           return [
-            'function testUri() public {',
+            'function testUri() public view {',
             [
               `assertEq(instance.uri(0), "${opts.uri}");`
             ],
@@ -111,11 +147,7 @@ function getAddressArgs(c: Contract): string[] {
   return args;
 }
 
-function getDeploymentCall(c: Contract, args: string[]): string {
-  return `${c.name}(${args.join(', ')})`;
-}
-
-const script = (c: Contract) => {
+const script = (c: Contract, opts?: GenericOptions) => {
   return formatLinesWithSpaces(
     2,
     ...spaceBetween(
@@ -126,18 +158,24 @@ const script = (c: Contract) => {
   );
 
   function getImports(c: Contract) {
-    return [
-      'import "forge-std/Script.sol";',
-      `import "../src/${c.name}.sol";`,
+    const result = [
+      'import {Script} from "forge-std/Script.sol";',
+      'import {console} from "forge-std/console.sol";',
     ];
+    if (c.upgradeable) {
+      result.push('import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";');
+    }
+    result.push(`import {${c.name}} from "src/${c.name}.sol";`);
+    return result;
   }
 
   function getScript(c: Contract) {
     const args = getAddressArgs(c);
     const deploymentLines = [
       'vm.startBroadcast();',
-      `${c.name} instance = new ${getDeploymentCall(c, args)};`,
-      'console.log("Contract deployed to %s", address(instance));',
+      ...getAddressVariables(c, args),
+      ...getDeploymentCode(c, args),
+      `console.log("${c.upgradeable ? 'Proxy' : 'Contract'} deployed to %s", address(instance));`,
       'vm.stopBroadcast();',
     ];
     return [
@@ -156,15 +194,59 @@ const script = (c: Contract) => {
     ];
   }
 
-  function addTodoAndCommentOut(lines: string[]) {
+  function getDeploymentCode(c: Contract, args: string[]): Lines[] {
+    if (c.upgradeable) {
+      if (opts?.upgradeable === 'transparent') {
+        return [
+          `address proxy = Upgrades.deployTransparentProxy(`,
+          [
+            `"${c.name}.sol",`,
+            `initialOwner,`,
+            `abi.encodeCall(${c.name}.initialize, (${args.join(', ')}))`
+          ],
+          ');',
+          `${c.name} instance = ${c.name}(proxy);`,
+        ];
+      } else {
+        return [
+          `address proxy = Upgrades.deployUUPSProxy(`,
+          [
+            `"${c.name}.sol",`,
+            `abi.encodeCall(${c.name}.initialize, (${args.join(', ')}))`
+          ],
+          ');',
+          `${c.name} instance = ${c.name}(proxy);`,
+        ];
+      }
+    } else {
+      return [
+        `${c.name} instance = new ${c.name}(${args.join(', ')});`,
+      ];
+    }
+  }
+
+  function getAddressVariables(c: Contract, args: string[]): Lines[] {
+    const vars = [];
+    if (c.upgradeable && opts?.upgradeable === 'transparent' && !args.includes('initialOwner')) {
+      vars.push('address initialOwner = <Set initialOwner address here>;');
+    }
+    for (const arg of args) {
+      vars.push(`address ${arg} = <Set ${arg} address here>;`);
+    }
+    return vars;
+  }
+
+  function addTodoAndCommentOut(lines: Lines[]) {
     return [
-      '// TODO: Set addresses for the contract arguments below, then uncomment the following lines',
-      ...lines.map(l => `// ${l}`),
+      '// TODO: Set addresses for the variables below, then uncomment the following section:',
+      '/*',
+      ...lines,
+      '*/',
     ];
   }
 };
 
-const setupSh = `\
+const setupSh = (c: Contract) => `\
 #!/usr/bin/env bash
 
 # Check if git is installed
@@ -186,23 +268,48 @@ if ! [ -f "foundry.toml" ]
 then
   echo "Initializing Foundry project..."
 
+  # Backup Wizard template readme to avoid it being overwritten
+  mv README.md README-oz.md
+
   # Initialize sample Foundry project
   forge init --force --no-commit --quiet
 
+${c.upgradeable ? `\
+  # Install OpenZeppelin Contracts and Upgrades
+  forge install OpenZeppelin/openzeppelin-contracts-upgradeable@v${contracts.version} --no-commit --quiet
+  forge install OpenZeppelin/openzeppelin-foundry-upgrades --no-commit --quiet\
+` : `\
   # Install OpenZeppelin Contracts
-  forge install OpenZeppelin/openzeppelin-contracts@v${contracts.version} --no-commit --quiet
+  forge install OpenZeppelin/openzeppelin-contracts@v${contracts.version} --no-commit --quiet\
+`}
 
-  # Remove template contracts
+  # Remove unneeded Foundry template files
   rm src/Counter.sol
   rm script/Counter.s.sol
   rm test/Counter.t.sol
+  rm README.md
+
+  # Restore Wizard template readme
+  mv README-oz.md README.md
 
   # Add remappings
   if [ -f "remappings.txt" ]
   then
     echo "" >> remappings.txt
   fi
-  echo "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/" >> remappings.txt
+${c.upgradeable ? `\
+  echo "@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/" >> remappings.txt
+  echo "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/" >> remappings.txt
+
+  # Add settings in foundry.toml
+  echo "" >> foundry.toml
+  echo "ffi = true" >> foundry.toml
+  echo "ast = true" >> foundry.toml
+  echo "build_info = true" >> foundry.toml
+  echo "extra_output = [\\"storageLayout\\"]" >> foundry.toml\
+` : `\
+  echo "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/" >> remappings.txt\
+`}
 
   # Perform initial git commit
   git add .
@@ -232,7 +339,7 @@ bash setup.sh
 ## Testing the contract
 
 \`\`\`
-forge test
+forge test${c.upgradeable ? ' --force' : ''}
 \`\`\`
 
 ## Deploying the contract
@@ -240,7 +347,7 @@ forge test
 You can simulate a deployment by running the script:
 
 \`\`\`
-forge script script/${c.name}.s.sol
+forge script script/${c.name}.s.sol${c.upgradeable ? ' --force' : ''}
 \`\`\`
 
 See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.
@@ -251,8 +358,8 @@ export async function zipFoundry(c: Contract, opts?: GenericOptions) {
 
   zip.file(`src/${c.name}.sol`, printContract(c));
   zip.file(`test/${c.name}.t.sol`, test(c, opts));
-  zip.file(`script/${c.name}.s.sol`, script(c));
-  zip.file('setup.sh', setupSh);
+  zip.file(`script/${c.name}.s.sol`, script(c, opts));
+  zip.file('setup.sh', setupSh(c));
   zip.file('README.md', readme(c));
 
   return zip;
diff --git a/packages/ui/src/App.svelte b/packages/ui/src/App.svelte
index 9c646739..420f44b3 100644
--- a/packages/ui/src/App.svelte
+++ b/packages/ui/src/App.svelte
@@ -243,7 +243,7 @@
         </button>
         {/if}
 
-        {#if opts?.kind !== "Governor" && opts?.upgradeable === false}
+        {#if opts?.kind !== "Governor"}
         <button class="download-option" on:click={downloadFoundryHandler}>
           <ZipIcon />
           <div class="download-option-content">