chore: remove JB deprecated contracts

jbx-protocol · May 26, 2024 · e70396b · e70396b
1 parent 8901b28
commit e70396b
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 196 deletions.
diff --git a/package.json b/package.json
@@ -62,7 +62,6 @@
     "@headlessui/react": "^1.7.18",
     "@heroicons/react": "^2.0.17",
     "@jbx-protocol/contracts-v1": "2.0.0",
-    "@jbx-protocol/contracts-v2-4.0.0": "npm:@jbx-protocol/[email protected]",
     "@jbx-protocol/contracts-v2-latest": "npm:@jbx-protocol/[email protected]",
     "@jbx-protocol/juice-721-delegate-v3": "npm:@jbx-protocol/[email protected]",
     "@jbx-protocol/juice-721-delegate-v3-1": "npm:@jbx-protocol/[email protected]",

diff --git a/...mponents/v2v3/V2V3Project/V2V3ProjectContractsDashboard/V2V3ProjectContractsDashboard.tsx b/...mponents/v2v3/V2V3Project/V2V3ProjectContractsDashboard/V2V3ProjectContractsDashboard.tsx
@@ -24,8 +24,6 @@ import { V2V3ProjectHeaderActions } from '../V2V3ProjectHeaderActions/V2V3Projec
  * Typically this list consists of contracts that are project-specific (e.g. PaymentTerminal, Controller etc.)
  */
 const CONTRACT_EXCLUSIONS = [
-  V2V3ContractName.DeprecatedJBDirectory,
-  V2V3ContractName.DeprecatedJBSplitsStore,
   V2V3ContractName.JBSingleTokenPaymentTerminalStore,
   V2V3ContractName.JBFundAccessConstraintsStore,
   ...SUPPORTED_CONTROLLERS,

diff --git a/src/hooks/JBPrices/loadJBPrices.ts b/src/hooks/JBPrices/loadJBPrices.ts
@@ -31,11 +31,7 @@ export async function loadJBPrices({
   }
 
   if (cv === CV_V3) {
-    if (readNetwork.name === NetworkName.goerli) {
-      contractJson = await import(
-        '@jbx-protocol/juice-contracts-v3/deployments/goerli/JBPrices.json'
-      )
-    } else if (readNetwork.name === NetworkName.sepolia) {
+    if (readNetwork.name === NetworkName.sepolia) {
       contractJson = await import(
         '@jbx-protocol/juice-contracts-v3/deployments/sepolia/JBPrices.json'
       )

diff --git a/src/hooks/v2v3/contractReader/useProjectControllerAddress.ts b/src/hooks/v2v3/contractReader/useProjectControllerAddress.ts
@@ -5,19 +5,12 @@ import useV2ContractReader from './useV2ContractReader'
 export default function useProjectControllerAddress({
   projectId,
   contract,
-  useDeprecatedContract,
 }: {
   projectId?: number
   contract?: ContractConfig<V2V3ContractName> | undefined
-  useDeprecatedContract?: boolean
 }) {
-  if (!contract) {
-    contract = useDeprecatedContract
-      ? V2V3ContractName.DeprecatedJBDirectory
-      : V2V3ContractName.JBDirectory
-  }
   return useV2ContractReader<string>({
-    contract,
+    contract: contract ?? V2V3ContractName.JBDirectory,
     functionName: 'controllerOf',
     args: projectId ? [projectId] : null,
   })

diff --git a/src/hooks/v2v3/contractReader/useProjectSplits.ts b/src/hooks/v2v3/contractReader/useProjectSplits.ts
@@ -33,17 +33,13 @@ export default function useProjectSplits({
   projectId,
   splitGroup,
   domain,
-  useDeprecatedContract,
 }: {
   projectId: number | undefined
   splitGroup: SplitGroup
   domain: string | undefined
-  useDeprecatedContract?: boolean
 }) {
   return useV2ContractReader<Split[]>({
-    contract: useDeprecatedContract
-      ? V2V3ContractName.DeprecatedJBSplitsStore
-      : V2V3ContractName.JBSplitsStore,
+    contract: V2V3ContractName.JBSplitsStore,
     functionName: 'splitsOf',
     args: projectId && domain ? [projectId, domain, splitGroup] : null,
     formatter: useCallback((value: unknown): Split[] => {

diff --git a/src/hooks/v2v3/contractReader/useProjectTerminals.ts b/src/hooks/v2v3/contractReader/useProjectTerminals.ts
@@ -4,15 +4,11 @@ import useV2ContractReader from './useV2ContractReader'
 
 export default function useProjectTerminals({
   projectId,
-  useDeprecatedContract,
 }: {
   projectId?: number
-  useDeprecatedContract?: boolean
 }) {
   return useV2ContractReader<string[]>({
-    contract: useDeprecatedContract
-      ? V2V3ContractName.DeprecatedJBDirectory
-      : V2V3ContractName.JBDirectory,
+    contract: V2V3ContractName.JBDirectory,
     functionName: 'terminalsOf',
     args: projectId ? [projectId] : null,
   })

diff --git a/src/models/v2v3/contracts.ts b/src/models/v2v3/contracts.ts
@@ -22,9 +22,6 @@ export enum V2V3ContractName {
   JBETHPaymentTerminal3_1 = 'JBETHPaymentTerminal3_1',
   JBETHPaymentTerminal3_1_1 = 'JBETHPaymentTerminal3_1_1',
   JBETHPaymentTerminal3_1_2 = 'JBETHPaymentTerminal3_1_2',
-
-  DeprecatedJBSplitsStore = 'DeprecatedJBSplitsStore',
-  DeprecatedJBDirectory = 'DeprecatedJBDirectory',
 }
 export type V2V3Contracts = Record<V2V3ContractName, Contract>
 

diff --git a/src/utils/v2v3/contractLoaders/JuiceboxV2.ts b/src/utils/v2v3/contractLoaders/JuiceboxV2.ts
@@ -96,18 +96,6 @@ export const loadJuiceboxV2Contract = async (
   try {
     let contractJson: ContractJson | undefined
     switch (contractName) {
-      case V2V3ContractName.DeprecatedJBDirectory: {
-        contractJson = (await import(
-          `@jbx-protocol/contracts-v2-4.0.0/deployments/mainnet/JBDirectory.json`
-        )) as ContractJson
-        break
-      }
-      case V2V3ContractName.DeprecatedJBSplitsStore: {
-        contractJson = (await import(
-          `@jbx-protocol/contracts-v2-4.0.0/deployments/mainnet/JBSplitsStore.json`
-        )) as ContractJson
-        break
-      }
       case V2V3ContractName.JBController: {
         contractJson = (await import(
           `@jbx-protocol/contracts-v2-latest/deployments/mainnet/JBController.json`