[not for merging] Post Audit changes

.env.sample

@@ -2,8 +2,12 @@ ALCHEMY_MAINNET_API_KEY=
 ALCHEMY_GOERLI_API_KEY=
 ALCHEMY_ARBITRUM_API_KEY=
 MAINNET_RPC_URL=
+SEPOLIA_RPC_URL=
+GOERLI_RPC_URL=
 ARBITRUM_RPC_URL=
+BASE_RPC_URL=
 ETHERSCAN_API_KEY=
 ARBISCAN_API_KEY=
+BASESCAN_API_KEY=
 DEPLOYER_PRIVATE_KEY=0x......
 SENDER=

.gitmodules

@@ -1,7 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-	branch = v1.3.0
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+./script/preCommitGenAddresses.sh

addresses.json

@@ -1,18 +1,113 @@
 {
+  "mainnet": {
+    "CreateVaultZap": "0x56dab32697B4A313f353DA0CE42B5113eD8E6f74",
+    "DefaultProxyAdmin": "0xf8Cab5e4912e08c475033776d9472b81c1325e58",
+    "FailSafe": "0x6bB724F11a8D7254800Cf34922E0D54407B0e698",
+    "MarketplaceUniversalRouterZap": "0x293A0c49c85F1D8851C665Ac3cE1f1DC2a79bE3d",
+    "MigratorZap": "0xD0999df61929E9d83d4236Cf0e1A0755869B9FE3",
+    "NFTXEligibilityManager": "0x4086e98Cce041d286112d021612fD894cFed94D5",
+    "NFTXFeeDistributorV3": "0x6845fF5f102bEF9D785468F0bEb535b4687406E7",
+    "NFTXInventoryStakingV3Upgradeable": "0x889f313e2a3FDC1c9a45bC6020A8a18749CD6152",
+    "NFTXRouter": "0x70A741A12262d4b5Ff45C0179c783a380EebE42a",
+    "nftxUniversalRouter": "0x250d62a67254A46c0De472d2c9215E1d890cC90f",
+    "NFTXVaultFactoryUpgradeableV3": "0xC255335bc5aBd6928063F5788a5E420554858f01",
+    "NonfungiblePositionManager": "0x26387fcA3692FCac1C1e8E4E2B22A6CF0d4b71bF",
+    "permit2": "0x000000000022d473030f116ddee9f6b43ac78ba3",
+    "QuoterV2": "0x5493dF723c17B6A768aA61F79405bA56ffC5294a",
+    "ShutdownRedeemerUpgradeable": "0x96cf14C2A61b7142421397735e702e25f1aa7F30",
+    "SwapRouter": "0x1703f8111B0E7A10e1d14f9073F53680d64277A3",
+    "TickLens": "0x1650115DDD287bE6F4972180d290D0FF89a42c40",
+    "UniswapV3FactoryUpgradeable": "0xa70e10beB02fF9a44007D9D3695d4b96003db101",
+    "V3MigrateSwap": "",
+    "WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+  },
+  "arbitrum": {
+    "CreateVaultZap": "0xF9E891AB1ECa89B7A4B3cBD45aEBFDF3Ec38946F",
+    "DefaultProxyAdmin": "0xdA7C2F023Dd30329d41483B95AFd24962f468A54",
+    "FailSafe": "0xBDA73b600435BF4309270438842dcE06f9a06fb7",
+    "MarketplaceUniversalRouterZap": "0xf56296B3010a59Ef7F0915569DD44E1302b9Ca40",
+    "MigratorZap": "0x6E1537eD56f52414f0182FaebF79A5fB2Ad2CABd",
+    "NFTXEligibilityManager": "0x6DCdfD7e94957cBAE9023c232dE18c0F72c2aD16",
+    "NFTXFeeDistributorV3": "0x0d50970C7848ebbE52661e70057D7D063B7de886",
+    "NFTXInventoryStakingV3Upgradeable": "0xe39a7E67d3E3b6eAF58BC02C4E80C3688847d155",
+    "NFTXRouter": "0x52731751Dede22827ad47109f5e9697d75a3ef4d",
+    "nftxUniversalRouter": "0x0DA69287B4C1B28181E5d155dDDda7Fa5C32E5Ad",
+    "NFTXVaultFactoryUpgradeableV3": "0x4dEeb9D2Bff2e9C35ce1f013DcC4582F891cb711",
+    "NonfungiblePositionManager": "0x8AD238377531547838370B9C4aC346b9Ed5466Ea",
+    "permit2": "0x000000000022d473030f116ddee9f6b43ac78ba3",
+    "QuoterV2": "0xff3957CB28aB34186543281e0bbe0De05C9e7D6D",
+    "ShutdownRedeemerUpgradeable": "",
+    "SwapRouter": "0xeA60242d7183E3d13Dc17fb2A4D0230d34eef502",
+    "TickLens": "0x3f2797b0E19CBf2377B8DE2d1CEC2698AcA7b081",
+    "UniswapV3FactoryUpgradeable": "0xF4D0512FB47319B0CE9144EF582862e2921CaBF8",
+    "UniswapV3Staker": "0xd4E155135b7dFf66c9C3B34EcA4aE7d9555FE31F",
+    "V3MigrateSwap": "",
+    "WETH": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1"
+  },
+  "base": {
+    "CreateVaultZap": "0x2D77756C139ed3c25472Daf233F332E8F605Dd8E",
+    "DefaultProxyAdmin": "0x33b381E2e0c4adC1dbd388888e9A29079e5b6702",
+    "FailSafe": "0xb13907103606118D01D18c9Deb249B89F6c31545",
+    "MarketplaceUniversalRouterZap": "0x31cB832F661Cd90fc9Fca6fB70A39cA811a02aEd",
+    "MigratorZap": "",
+    "NFTXEligibilityManager": "0xcB62303a5Ecc5f9C5cF7B5AA967a25d9Bb2B4b08",
+    "NFTXFeeDistributorV3": "0xA64c2F3f965f055E51482bF0960Ebb5f2904BF68",
+    "NFTXInventoryStakingV3Upgradeable": "0x47D9ACEE6aa260C36F4368091bE92F0824876C72",
+    "NFTXRouter": "0x590F8679964D4dEfB54DCD307b2941B053eb1821",
+    "nftxUniversalRouter": "0x7c656F0691Db983ee78f68189c55C36d1862c901",
+    "NFTXVaultFactoryUpgradeableV3": "0x0D74B761eAB5cC7Cc0E4e625A2e2B8251A4915c6",
+    "NonfungiblePositionManager": "0x4f566a711901168804A74F252680d85C9246188e",
+    "permit2": "0x000000000022d473030f116ddee9f6b43ac78ba3",
+    "QuoterV2": "0xFf40913CA69912212e00e93Ad4DD1480A7aeF13A",
+    "ShutdownRedeemerUpgradeable": "",
+    "SwapRouter": "0x27124948dcc9EbF3113681898FF217d3E4f56900",
+    "TickLens": "0x95Eaddd888c0063B392B771d11Db9704843df8bE",
+    "UniswapV3FactoryUpgradeable": "0x5FD88cD0034A0B2FC77E75Ea09b6e512511b0Eb9",
+    "V3MigrateSwap": "",
+    "WETH": "0x4200000000000000000000000000000000000006"
+  },
+  "sepolia": {
+    "CreateVaultZap": "0xD80b916470F8e79FD8d09874cb159CbB8D13d8da",
+    "DefaultProxyAdmin": "0x36cBBb16F2FA71d4B773E9F4A11cF7FC53B13EfD",
+    "FailSafe": "",
+    "MarketplaceUniversalRouterZap": "0xd88a3B9D0Fb2d39ec8394CfFD983aFBB2D4a6410",
+    "MigratorZap": "0x19762e505aF085284E287c8DAb931fb28545461f",
+    "NFTXEligibilityManager": "0xa1ad09f8Fd789E3A940Ba9Dc5aE4D17021eF290D",
+    "NFTXFeeDistributorV3": "0x53AE38742C78EE64fC077EF840B2Aa47A7E9c603",
+    "NFTXInventoryStakingV3Upgradeable": "0xfBFf0635f7c5327FD138E1EBa72BD9877A6a7C1C",
+    "NFTXRouter": "0x441b7DE4340AAa5aA86dB4DA43d9Badf7B2DAA66",
+    "nftxUniversalRouter": "0x12156cCA1958B6591CC49EaE03a5553458a4b424",
+    "NFTXVaultFactoryUpgradeableV3": "0x31C56CaF49125043e80B4d3C7f8734f949d8178C",
+    "NonfungiblePositionManager": "0xA9bCC1e29d3460177875f68fDCC0264D22c40BF0",
+    "permit2": "0x000000000022d473030f116ddee9f6b43ac78ba3",
+    "QuoterV2": "0xb8EB27ca4715f7A04228c6F83935379D1f5AbABd",
+    "ShutdownRedeemerUpgradeable": "0x4b25288f40C7e00F93f0DA261C314d67b640c9dF",
+    "SwapRouter": "0xa7069da6a7e600e0348620484fD2B1f24E075d5f",
+    "TickLens": "0xA13E04fAEe08E784A44C27e9E77Ca7a02D45BFd7",
+    "UniswapV3FactoryUpgradeable": "0xDD2dce9C403f93c10af1846543870D065419E70b",
+    "V3MigrateSwap": "0xd26b2BFBB6E8c1B3B849751549B20abf5E5fb125",
+    "WETH": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14"
+  },
   "goerli": {
-    "CreateVaultZap": "0x040fE06ABc3c099772DEe413dE138937bf053543",
-    "MarketplaceUniversalRouterZap": "0x156c755fc749f150DfF307520063F9B85d012d2c",
-    "NFTXFeeDistributorV3": "0x17Ee4Acc187FBE2077F744598d4090f4386C560c",
+    "CreateVaultZap": "0xc6464CC63bC20b64e1633A0293C2C9b202F4f1b6",
+    "DefaultProxyAdmin": "0xa0d26F02D5e94C8E9ED524875D9fce36ab4838a2",
+    "FailSafe": "",
+    "MarketplaceUniversalRouterZap": "0x0be2D766Eef4b6a72F1fAe2e49619F013d647B8A",
+    "MigratorZap": "0xD4B67Fe6a1258fd5e1C4dF84f3De01F62e7ac127",
+    "NFTXEligibilityManager": "0xA4e9e286CE7A34d19f774c36844225468290C3A8",
+    "NFTXFeeDistributorV3": "0xA8076Ec5Dbb95165e14624Ff43dE2290e78A6905",
     "NFTXInventoryStakingV3Upgradeable": "0xEf771a17e6970d8B4b208a76e94F175277554230",
-    "NFTXRouter": "0x3b79692Eb189a68E513ad5628A419950E5773e35",
+    "NFTXRouter": "0x8E16cdd0D9A15d2d0EFeA531660e8DbD0F6eE12D",
     "nftxUniversalRouter": "0xF7c4FC5C2e30258e1E4d1197fc63aeDE371508f3",
     "NFTXVaultFactoryUpgradeableV3": "0x1d552A0e6c2f680872C4a88b1e7def05F1858dF0",
-    "NonfungiblePositionManager": "0xaEC6537206e8e590603399c714c39947680f1181",
+    "NonfungiblePositionManager": "0xDa9411C5455a1bfDb527d0988c0A2764E2a104be",
     "permit2": "0x000000000022d473030f116ddee9f6b43ac78ba3",
     "QuoterV2": "0xBb473dbEF3363b5d7CDD5f12429Fd1C5F0c10499",
+    "ShutdownRedeemerUpgradeable": "",
     "SwapRouter": "0x2E77A788fc66c5312354aaE0df1dC1895ce556f8",
     "TickLens": "0x32A7703773cBc265cf79D49340F656837169FEcD",
     "UniswapV3FactoryUpgradeable": "0xf25081B098c5929A26F562aa2502795fE89BC73f",
+    "V3MigrateSwap": "",
     "WETH": "0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6"
   }
 }

deploy/MigratorZap.ts

@@ -0,0 +1,24 @@
+import { HardhatRuntimeEnvironment, Network } from "hardhat/types";
+import { DeployFunction } from "hardhat-deploy/types";
+import { deployMigratorZap } from "./modules/MigratorZap";
+import { getConfig } from "./utils";
+
+const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
+  const { deployments } = await getConfig(hre);
+
+  const vaultFactory = await deployments.get("NFTXVaultFactoryUpgradeableV3");
+  const positionManager = await deployments.get("NonfungiblePositionManager");
+  const inventoryStaking = await deployments.get(
+    "NFTXInventoryStakingV3Upgradeable"
+  );
+
+  const { migratorZap } = await deployMigratorZap({
+    hre,
+    vaultFactory: vaultFactory.address,
+    positionManager: positionManager.address,
+    inventoryStaking: inventoryStaking.address,
+  });
+};
+export default func;
+func.tags = ["MigratorZap"];
+func.dependencies = [];

deploy/individual/Mocks.ts → deploy/Mocks.ts

@@ -8,17 +8,29 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployer } = await getNamedAccounts();
 
   const nft = await deploy("MockRoyaltyNFT", {
-    args: ["CryptoPunks", "CryptoPunks"],
+    args: [
+      "CryptoPunks",
+      "CryptoPunks",
+      "https://ipfs.io/ipfs/QmcsX1EprrBwjPRT7dyDWvmGX7zvcRsmKKDaMTiFbSsZh2/",
+    ],
     from: deployer,
     log: true,
   });
   await deploy("MockRoyaltyNFT", {
-    args: ["Milady Maker", "Milady Maker"],
+    args: [
+      "Milady Maker",
+      "Milady Maker",
+      "https://www.miladymaker.net/milady/json/",
+    ],
     from: deployer,
     log: true,
   });
   await deploy("MockRoyaltyNFT", {
-    args: ["BoredApe", "BoredApe"],
+    args: [
+      "BoredApe",
+      "BoredApe",
+      "https://ipfs.io/ipfs/QmeSjSinHpPnmXmspMjwiXyN6zS4E9zccariGR3jxcaWtq/",
+    ],
     from: deployer,
     log: true,
   });