From 3be46b4cbbe437978026986293cc5f771d507fdc Mon Sep 17 00:00:00 2001
From: Joey Santoro <joseph.santoro@duke.edu>
Date: Thu, 21 Apr 2022 09:08:58 -0700
Subject: [PATCH 1/4] release: update hardhat block

---
 hardhat.config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hardhat.config.ts b/hardhat.config.ts
index 9ee2082fa..e20cb30a3 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -52,8 +52,8 @@ export default {
       chainId: 5777, // Any network (default: none)
       forking: enableMainnetForking
         ? {
-            url: `https://eth-mainnet.alchemyapi.io/v2/${mainnetAlchemyApiKey}`
-            // blockNumber: 13968350
+            url: `https://eth-mainnet.alchemyapi.io/v2/${mainnetAlchemyApiKey}`,
+            blockNumber: 14541300
           }
         : undefined
     },

From 1af682ef712671ddcd2df296817686c76c54f4fb Mon Sep 17 00:00:00 2001
From: Joey Santoro <joseph.santoro@duke.edu>
Date: Thu, 21 Apr 2022 09:16:22 -0700
Subject: [PATCH 2/4] release: hardhat block + .only

---
 hardhat.config.ts                        | 2 +-
 test/integration/tests/fip-38-tokemak.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hardhat.config.ts b/hardhat.config.ts
index e20cb30a3..a56ccaf37 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -53,7 +53,7 @@ export default {
       forking: enableMainnetForking
         ? {
             url: `https://eth-mainnet.alchemyapi.io/v2/${mainnetAlchemyApiKey}`,
-            blockNumber: 14541300
+            blockNumber: 14551200
           }
         : undefined
     },
diff --git a/test/integration/tests/fip-38-tokemak.ts b/test/integration/tests/fip-38-tokemak.ts
index 94f2681cc..7d78c1764 100644
--- a/test/integration/tests/fip-38-tokemak.ts
+++ b/test/integration/tests/fip-38-tokemak.ts
@@ -14,7 +14,7 @@ const TOKEMAK_MANAGER_ROLLOVER_ADDRESS = '0x90b6C61B102eA260131aB48377E143D6EB3A
 const TOKEMAK_MANAGER_ADDRESS = '0xa86e412109f77c45a3bc1c5870b880492fb86a14'; // tokemak manager
 const IPFS_JSON_FILE_HASH = 'QmP4Vzg45jExr3mcNsx9xxV1fNft95uVzgZGeLtkBXgpkx';
 
-describe.only('e2e-fip-38-tokemak', function () {
+describe('e2e-fip-38-tokemak', function () {
   let contracts: NamedContracts;
   let deployAddress: string;
   let e2eCoord: TestEndtoEndCoordinator;

From 9737d6e895f50920858765d09096272c955e8e5b Mon Sep 17 00:00:00 2001
From: Joey Santoro <joseph.santoro@duke.edu>
Date: Thu, 21 Apr 2022 09:28:20 -0700
Subject: [PATCH 3/4] release: clean proposals config

---
 test/integration/proposals_config.ts | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/test/integration/proposals_config.ts b/test/integration/proposals_config.ts
index 0f1d37b2a..98ab69fc6 100644
--- a/test/integration/proposals_config.ts
+++ b/test/integration/proposals_config.ts
@@ -1,17 +1,5 @@
 import { ProposalCategory, ProposalsConfigMap } from '@custom-types/types';
 
-import fip_94 from '@proposals/description/fip_94';
-
-const proposals: ProposalsConfigMap = {
-  fip_94: {
-    deploy: false,
-    proposalId: null,
-    affectedContractSignoff: ['rariTimelock'],
-    deprecatedContractSignoff: [],
-    category: ProposalCategory.DAO,
-    totalValue: 0,
-    proposal: fip_94
-  }
-};
+const proposals: ProposalsConfigMap = {};
 
 export default proposals;

From ebd3372abbb81d475b0e8de748c002a8c3c82c3d Mon Sep 17 00:00:00 2001
From: Joey Santoro <joseph.santoro@duke.edu>
Date: Thu, 21 Apr 2022 15:04:25 -0700
Subject: [PATCH 4/4] release: fix e2e

---
 protocol-configuration/collateralizationOracle.ts |  4 +++-
 protocol-configuration/mainnetAddresses.ts        | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/protocol-configuration/collateralizationOracle.ts b/protocol-configuration/collateralizationOracle.ts
index 9a5245799..f05f455ce 100644
--- a/protocol-configuration/collateralizationOracle.ts
+++ b/protocol-configuration/collateralizationOracle.ts
@@ -15,7 +15,9 @@ const collateralizationAddresses = {
     'rariPool72FeiPCVDepositWrapper',
     'rariPool128FeiPCVDepositWrapper',
     'rariPool22FeiPCVDepositWrapper',
-    'feiBuybackLensNoFee'
+    'feiBuybackLensNoFee',
+    'convexPoolPCVDepositWrapper',
+    'compoundPCVDepositWrapper'
   ],
   lusd: [
     'liquityFusePoolLusdPCVDeposit',
diff --git a/protocol-configuration/mainnetAddresses.ts b/protocol-configuration/mainnetAddresses.ts
index 3da070ed6..2016d4e00 100644
--- a/protocol-configuration/mainnetAddresses.ts
+++ b/protocol-configuration/mainnetAddresses.ts
@@ -1855,6 +1855,16 @@ const MainnetAddresses: MainnetAddresses = {
     artifactName: 'RariGovernanceTokenUniswapDistributor',
     address: '0x1fa69a416bcf8572577d3949b742fbb0a9cd98c7',
     category: AddressCategory.Governance
+  },
+  convexPoolPCVDepositWrapper: {
+    artifactName: 'PCVDepositWrapper',
+    address: '0x1370CA8655C255948d6c6110066d78680601B7c2',
+    category: AddressCategory.PCV
+  },
+  compoundPCVDepositWrapper: {
+    artifactName: 'PCVDepositWrapper',
+    address: '0xB80B3dc4F8B30589477b2bA0e4EF2b8224bDf0a5',
+    category: AddressCategory.PCV
   }
 };