Mumbai upgrade deployment 3-14-24

contracts/Market.sol

@@ -143,7 +143,7 @@
    * @notice Deprecated. Previously the address of the RestrictedNORI contract.
    * This storage gap remains to maintain the storage layout of the contract.
    */
-  address private _storageGap;
+  address private _restrictedNORI;
 
   /**
    * @notice The number of base tokens required to purchase one NRT.

contracts/Removal.sol

@@ -144,14 +144,14 @@
   ICertificate private _certificate;
 
   /**
-   * @dev Maps from a removal ID to the project ID it belongs to.
+   * @dev Deprecated. This storage gap remains to maintain the storage layout of the contract.
    */
-  mapping(uint256 => uint256) private _removalIdToProjectId;
+  mapping(uint256 => uint8) private _projectIdToHoldbackPercentage;
 
   /**
-   * @dev Deprecated. This storage gap remains to maintain the storage layout of the contract.
+   * @dev Maps from a removal ID to the project ID it belongs to.
    */
-  mapping(uint256 => uint8) private _storageGap;
+  mapping(uint256 => uint256) private _removalIdToProjectId;
 
   /**
    * @notice Maps from an address to an EnumerableSet of the token IDs for which that address has a non-zero balance.

deploy/configure-assets-after-deployment.ts

@@ -17,6 +17,13 @@
   getRemoval,
 } from '@/utils/contracts';
 
+interface NetworkMarketConfig {
+  priceMultiple: number;
+  feePercentage: number;
+  purchaseTokenAddress: string;
+  feeWalletAddress: string;
+}
+
 export const deploy: DeployFunction = async (environment) => {
   const hre = environment as unknown as CustomHardHatRuntimeEnvironment;
   const CONFIRMATIONS =
@@ -39,30 +46,48 @@
   // );
 
   const [signer] = await hre.getSigners();
   const market = await getMarket({ hre, signer });
   const certificate = await getCertificate({ hre, signer });
   const removal = await getRemoval({ hre, signer });
   const bpNori = await getBridgedPolygonNori({ hre, signer });
 
+  const networkMarketConfig: Record<string, NetworkMarketConfig> = {
+    polygon: {
+      priceMultiple: 2000,
+      feePercentage: 25,
+      purchaseTokenAddress: PROD_USDC_TOKEN_ADDRESS,
+      feeWalletAddress: PROD_NORI_FEE_WALLET_ADDRESS,
+    },
+    mumbai: {
+      priceMultiple: 2000,
+      feePercentage: 25,
+      purchaseTokenAddress: STAGING_USDC_TOKEN_ADDRESS,
+      feeWalletAddress: STAGING_NORI_FEE_WALLET_ADDRESS,
+    },
+    localhost: {
+      priceMultiple: 100,
+      feePercentage: 25,
+      purchaseTokenAddress: bpNori.address,
+      feeWalletAddress: hre?.namedAccounts?.noriWallet,
+    },
+    hardhat: {
+      priceMultiple: 100,
+      feePercentage: 25,
+      purchaseTokenAddress: bpNori.address,
+      feeWalletAddress: hre?.namedAccounts?.noriWallet,
+    },
+  };
+
   // SW: Leaving the default local configuration as bridged polygon NORI
   // for the purchase token to minimize test breakage.
-  let purchaseTokenAddress = bpNori.address;
-  let priceMultiple = BigNumber.from(100);
-  if (hre.network.name === 'polygon') {
-    purchaseTokenAddress = PROD_USDC_TOKEN_ADDRESS;
-    priceMultiple = BigNumber.from(2000);
-  } else if (hre.network.name === 'mumbai') {
-    purchaseTokenAddress = STAGING_USDC_TOKEN_ADDRESS;
-    priceMultiple = BigNumber.from(2000);
-  }
-  const restrictionScheduleDuration = 315_569_520; // seconds in 10 years
-  const feeWalletAddress = ['hardhat', 'localhost'].includes(hre.network.name)
-    ? hre.namedAccounts.noriWallet
-    : hre.network.name === 'polygon'
-    ? PROD_NORI_FEE_WALLET_ADDRESS
-    : STAGING_NORI_FEE_WALLET_ADDRESS;
+  const purchaseTokenAddress =
+    networkMarketConfig[hre.network.name].purchaseTokenAddress;
+  const priceMultiple = networkMarketConfig[hre.network.name].priceMultiple;
+  const feePercentage = networkMarketConfig[hre.network.name].feePercentage;
+  const feeWalletAddress =
+    networkMarketConfig[hre.network.name].feeWalletAddress;
   let txn: ContractTransaction;
   if ((await certificate.getRemovalAddress()) !== removal.address) {
     hre.trace('Setting removal address in Certificate contract...');
     txn = await certificate.registerContractAddresses(removal.address);
     await txn.wait(CONFIRMATIONS);
@@ -85,7 +110,7 @@
 
   if (
     (await market.getPurchasingTokenAddress()) !== purchaseTokenAddress ||
-    (await market.getPriceMultiple()) !== priceMultiple
+    (await market.getPriceMultiple()) !== BigNumber.from(priceMultiple)
   ) {
     txn = await market.setPurchasingTokenAndPriceMultiple(
       purchaseTokenAddress,
@@ -98,11 +123,10 @@
       } as purchase token with price multiple of ${priceMultiple}`
     );
   }
-  // TODO: Configure the purchasing token and fee percentage somewhere more global
-  if ((await market.getNoriFeePercentage()) !== BigNumber.from(25)) {
-    txn = await market.setNoriFeePercentage(25);
+  if ((await market.getNoriFeePercentage()) !== BigNumber.from(feePercentage)) {
+    txn = await market.setNoriFeePercentage(feePercentage);
     await txn.wait(CONFIRMATIONS);
-    hre.trace('Set fee percentage to 25');
+    hre.trace(`Set fee percentage to ${feePercentage}`);
   }
 
   if ((await market.getNoriFeeWallet()) !== feeWalletAddress) {
@@ -115,7 +139,7 @@
 export default deploy;
 deploy.tags = ['configure'];
 // TODO is there a way to remove this 'Market' dependency?
-deploy.dependencies = ['Market'];
+deploy.dependencies = ['Market', 'Removal', 'market'];
 deploy.skip = async (hre) =>
   Promise.resolve(
     !['polygon', 'mumbai', 'localhost', 'hardhat'].includes(hre.network.name)