remove deprecated ABI files and update contract references in the EVM DAO creation store; add Firestore network name utility function

Author: ashutoshpw

src/assets/abis/hb_wrapper_v2.json src/assets/abis/hb_wrapper_standard.jsonsrc/assets/abis/hb_wrapper_v2.json renamed to src/assets/abis/hb_wrapper_standard.json

@@ -47,8 +47,7 @@
             { "internalType": "address[]","name": "initialMembers",    "type": "address[]" },
             { "internalType": "uint256[]","name": "initialAmounts",    "type": "uint256[]" },
             { "internalType": "string[]","name": "keys",               "type": "string[]" },
-            { "internalType": "string[]","name": "values",             "type": "string[]" },
-            { "internalType": "bool",    "name": "transferrable",      "type": "bool" }
+            { "internalType": "string[]","name": "values",             "type": "string[]" }
           ],
           "internalType": "struct WrapperContract.DaoParams",
           "name": "params",

src/assets/abis/hb_wrapper_w_legacy.json src/assets/abis/hb_wrapper_wrapped.jsonsrc/assets/abis/hb_wrapper_w_legacy.json renamed to src/assets/abis/hb_wrapper_wrapped.json

@@ -7,7 +7,7 @@ export interface IEvmFirebaseContract {
   daoFactory: IEthereumAddress
   timelockFactory: IEthereumAddress
   registryFactory: IEthereumAddress
-  // wrapper: IEthereumAddress // Not in use and deprecated
+  wrapper?: IEthereumAddress
   wrapper_t: IEthereumAddress
   wrapper_w: IEthereumAddress
   nativeCurrency: string

src/modules/etherlink/types.d.ts

@@ -21,6 +21,13 @@ export const networkConfig = {
   }
 }
 
+export function getFirestoreNetworkName(internalNetwork: string): string {
+  if (internalNetwork === "etherlink_testnet") return "Etherlink-Testnet"
+  if (internalNetwork === "etherlink_mainnet") return "Etherlink"
+  if (internalNetwork === "localhost") return "Localhost"
+  return internalNetwork
+}
+
 export const isInvalidEvmAddress = (address: string) => {
   return !ethers.isAddress(address)
 }

src/modules/etherlink/utils.ts

@@ -18,6 +18,7 @@ export enum EnvKey {
   REACT_APP_BASE_URL = "REACT_APP_BASE_URL",
   REACT_APP_DAO_DEPLOYER_API = "REACT_APP_DAO_DEPLOYER_API",
   // Optional overrides for Etherlink wrapper contract addresses (dev/debug)
+  REACT_APP_EVM_WRAPPER_ADDRESS = "REACT_APP_EVM_WRAPPER_ADDRESS",
   REACT_APP_EVM_WRAPPER_T_ADDRESS = "REACT_APP_EVM_WRAPPER_T_ADDRESS",
   REACT_APP_EVM_WRAPPER_W_ADDRESS = "REACT_APP_EVM_WRAPPER_W_ADDRESS",
   REACT_APP_RPC_NETWORK_GHOSTNET = "REACT_APP_RPC_NETWORK_GHOSTNET",

src/services/config/constants.ts

@@ -6,8 +6,7 @@ import { persist, createJSONStorage } from "zustand/middleware"
 import { STEPS } from "modules/etherlink/config"
 import { useHistory } from "react-router-dom"
 
-import WrapperContractAbi from "assets/abis/hb_wrapper_v2.json"
-import HbWrapperWLegacyAbi from "assets/abis/hb_wrapper_w_legacy.json"
+import WrapperStandardAbi from "assets/abis/hb_wrapper_standard.json"
 
 import { useCallback, useContext, useState } from "react"
 import { useTezos } from "services/beacon/hooks/useTezos"
@@ -165,12 +164,6 @@ const useEvmDaoCreateStore = () => {
   const data = useEvmDaoCreateZustantStore()
   const history = useHistory()
   const { contractData } = useContext(EtherlinkContext)
-  const wrapperAddressOverride = getEnv(EnvKey.REACT_APP_EVM_WRAPPER_T_ADDRESS)
-  const wrapperWrappedOverride = getEnv(EnvKey.REACT_APP_EVM_WRAPPER_W_ADDRESS)
-  const wrapperAddress = wrapperAddressOverride || contractData?.wrapper
-  const wrapperAddressForWrapped = wrapperWrappedOverride || contractData?.wrapper
-  console.log("Wrapper wrapped address:", wrapperAddressForWrapped)
-  console.log("Wrapper address:", wrapperAddress)
 
   const { etherlink, network } = useTezos()
   const notify = useNotification()
@@ -180,9 +173,18 @@ const useEvmDaoCreateStore = () => {
     console.log("=== Starting DAO Deployment ===")
     console.log("Full DAO Data:", daoData)
 
-    // Determine wrapper address before attempting deployment (for error reporting)
-    const selectedWrapperAddress =
-      daoData.tokenDeploymentMechanism === "wrapped" ? wrapperAddressForWrapped : wrapperAddress
+    const wrapperAddressOverride = getEnv(EnvKey.REACT_APP_EVM_WRAPPER_ADDRESS)
+    const wrapperTAddressOverride = getEnv(EnvKey.REACT_APP_EVM_WRAPPER_T_ADDRESS)
+    const wrapperWrappedOverride = getEnv(EnvKey.REACT_APP_EVM_WRAPPER_W_ADDRESS)
+
+    let selectedWrapperAddress: string | undefined
+    if (daoData.tokenDeploymentMechanism === "wrapped") {
+      selectedWrapperAddress = wrapperWrappedOverride || contractData?.wrapper_w
+    } else if (daoData.nonTransferable) {
+      selectedWrapperAddress = wrapperAddressOverride || contractData?.wrapper
+    } else {
+      selectedWrapperAddress = wrapperTAddressOverride || contractData?.wrapper_t
+    }
 
     try {
       const proposalThreshold = daoData.quorum.proposalThreshold || daoData.quorum.proposalThresholdPercentage || 0
@@ -213,12 +215,20 @@ const useEvmDaoCreateStore = () => {
       console.log("Signer:", etherlink.signer)
 
       if (!selectedWrapperAddress) {
+        const factoryType =
+          daoData.tokenDeploymentMechanism === "wrapped"
+            ? "wrapped ERC20"
+            : daoData.nonTransferable
+            ? "non-transferable"
+            : "transferable"
         console.error("No wrapper address found!", {
-          wrapperAddress,
-          wrapperAddressForWrapped,
-          tokenDeploymentMechanism: daoData.tokenDeploymentMechanism
+          factoryType,
+          tokenDeploymentMechanism: daoData.tokenDeploymentMechanism,
+          nonTransferable: daoData.nonTransferable
         })
-        throw new Error("Wrapper contract address not found. Please check your network configuration.")
+        throw new Error(
+          `Wrapper contract address not found for ${factoryType} token DAO. Please check your network configuration.`
+        )
       }
 
       // Validate signer
@@ -227,20 +237,7 @@ const useEvmDaoCreateStore = () => {
         throw new Error("Wallet not connected. Please connect your wallet.")
       }
 
-      // Use legacy ABI if using the fallback address
-      // TODO: Move to use wrapper only
-      // const isUsingFallbackAddress = selectedWrapperAddress === "0xf4B3022b0fb4e8A73082ba9081722d6a276195c2"
-      // const wrapperAbi = Array.isArray(WrapperContractAbi)
-      //   ? (WrapperContractAbi as any)
-      //   : (WrapperContractAbi as any)?.abi
-      // const selectedAbi =
-      //   daoData.tokenDeploymentMechanism === "wrapped"
-      //     ? isUsingFallbackAddress
-      //       ? HbWrapperWLegacyAbi.abi
-      //       : wrapperAbi
-      //     : wrapperAbi
-
-      const selectedAbi = HbWrapperWLegacyAbi.abi
+      const selectedAbi = WrapperStandardAbi.abi
 
       // Preflight: verify contract code exists at address
       const onChainCode = await etherlink.provider.getCode(selectedWrapperAddress)
@@ -299,8 +296,8 @@ const useEvmDaoCreateStore = () => {
         })
 
         const wrappedDaoPayload = {
-          // Legacy structure without wrappedTokenName
           daoName: daoData.name || "",
+          wrappedTokenName: daoData.wrappedTokenName || `Wrapped ${daoData.wrappedTokenSymbol || "Token"}`,
           wrappedTokenSymbol: daoData.wrappedTokenSymbol || "",
           description: daoData.description || "",
           executionDelay: Math.floor(executationDelayinSeconds),
@@ -403,8 +400,7 @@ const useEvmDaoCreateStore = () => {
           initialMembers: daoData.members.map((member: any) => member.address),
           initialAmounts: initialAmountsWithSettings,
           keys: Object.keys(registryForDeploy),
-          values: Object.values(registryForDeploy).map(v => String(v)),
-          transferrable: !daoData.nonTransferable // Note: fixed spelling to match ABI
+          values: Object.values(registryForDeploy).map(v => String(v))
         }
 
         try {
@@ -450,7 +446,7 @@ const useEvmDaoCreateStore = () => {
     }
     setIsDeploying(false)
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [data.data, etherlink.signer, wrapperAddress, wrapperAddressForWrapped])
+  }, [data.data, etherlink.signer, contractData])
   const isFinalStep = data.currentStep === STEPS.length - 1
 
   return {

src/services/contracts/etherlinkDAO/hooks/useEvmDaoCreateStore.tsx

@@ -3,7 +3,7 @@ import useFirestoreStore from "services/contracts/etherlinkDAO/hooks/useFirestor
 import dayjs from "dayjs"
 import BigNumber from "bignumber.js"
 import { Timestamp } from "firebase/firestore"
-import { networkConfig } from "modules/etherlink/utils"
+import { networkConfig, getFirestoreNetworkName } from "modules/etherlink/utils"
 import { getCallDataFromBytes, getBlockExplorerUrl } from "modules/etherlink/utils"
 import { fetchOffchainProposals } from "services/services/lite/lite-services"
 import { IEvmDAO, IEvmFirebaseContract, IEvmFirebaseDAOMember, IEvmFirebaseProposal } from "modules/etherlink/types"
@@ -25,7 +25,7 @@ export const useDaoState = ({ network }: { network: string }) => {
 
   const [isLoadingDaos, setIsLoadingDaos] = useState(!!firebaseRootCollection)
   const [isLoadingDaoProposals, setIsLoadingDaoProposals] = useState(true)
-  const [contractData, setContractData] = useState<any[]>([])
+  const [contractData, setContractData] = useState<IEvmFirebaseContract | null>(null)
   const [daoData, setDaoData] = useState<IEvmDAO[]>([])
   const [daoSelected, setDaoSelected] = useState<IEvmDAO | null>(null)
   const [daoProposals, setDaoProposals] = useState<any[]>([])
@@ -73,10 +73,11 @@ export const useDaoState = ({ network }: { network: string }) => {
 
   // Initial fetch triggers
   useEffect(() => {
-    fetchCollection("contracts")
+    const firestoreNetworkName = getFirestoreNetworkName(network)
+    fetchDoc("contracts", firestoreNetworkName)
     if (firebaseRootCollection) fetchCollection(firebaseRootCollection)
     if (firebaseRootTokenCollection) fetchCollection(firebaseRootTokenCollection)
-  }, [fetchCollection, firebaseRootCollection, firebaseRootTokenCollection])
+  }, [fetchCollection, fetchDoc, firebaseRootCollection, firebaseRootTokenCollection, network])
 
   // When the root collection changes (i.e., network change), clear previous data promptly
   useEffect(() => {
@@ -103,16 +104,13 @@ export const useDaoState = ({ network }: { network: string }) => {
       setDaoData(allDaoList)
       setIsLoadingDaos(false)
     }
-    if (firestoreData?.["contracts"]) {
-      const isTestnet = firebaseRootCollection?.toLowerCase().includes("testnet")
-      const contractDataForNetwork = firestoreData["contracts"]?.find((contract: IEvmFirebaseContract) => {
-        return isTestnet
-          ? contract.id?.toLowerCase().includes("testnet")
-          : !contract.id?.toLowerCase().includes("testnet")
-      })
-      setContractData(contractDataForNetwork)
+    const firestoreNetworkName = getFirestoreNetworkName(network)
+    const contractDocKey = `contracts/${firestoreNetworkName}`
+    if (firestoreData?.[contractDocKey]) {
+      const contractDoc = firestoreData[contractDocKey]
+      setContractData(Array.isArray(contractDoc) ? contractDoc[0] : contractDoc)
     }
-  }, [firestoreData, firebaseRootCollection])
+  }, [firestoreData, firebaseRootCollection, network])
 
   // When a DAO is selected, subscribe to its subcollections and compute proposal summaries
   useEffect(() => {