Bugs Fixes and Improvements

Signed-off-by: Manank Patni <[email protected]>

src/modules/creator/deployment/steps/Distribution.tsx

@@ -108,6 +108,9 @@ const validateForm = (values: TokenDistributionSettings) => {
     if (values.totalAmount && values.totalAmount.minus(new BigNumber(getTotal(values.holders))) < new BigNumber(0)) {
       errors.totalAmount = "Available balance has to be greater that the total supply"
     }
+    if (values.totalAmount && values.totalAmount.gt(new BigNumber(getTotal(values.holders)))) {
+      errors.totalAmount = "Total Supply not fully allocated"
+    }
   })
 
   return errors

src/modules/creator/deployment/steps/Summary.tsx

@@ -98,7 +98,7 @@ export const ContractSummary: React.FC = () => {
   }
 
   const {
-    mutation: { mutate, data, error }
+    mutation: { mutate, data }
   } = useTokenOriginate(state.data)
 
   useEffect(() => {
@@ -107,19 +107,10 @@ export const ContractSummary: React.FC = () => {
         type: ActionTypes.CLEAR_CACHE
       })
       history.push("/creator/success", { address: data.address })
-    }
-  }, [data, dispatch, history])
-
-  useEffect(() => {
-    if (error) {
+    } else if (data && !data.address) {
       setIsLoading(false)
-      openNotification({
-        message: "Error deploying token... try again later",
-        variant: "error",
-        autoHideDuration: 2000
-      })
     }
-  }, [error, openNotification])
+  }, [data, dispatch, history])
 
   useEffect(() => {
     dispatch({

src/services/beacon/hooks/useTezos.ts

@@ -1,7 +1,7 @@
 import { useQueryClient } from "react-query"
 import { useCallback, useContext } from "react"
 import { MichelCodecPacker, TezosToolkit } from "@taquito/taquito"
-import { connectWithBeacon, Network, rpcNodes, TezosActionType } from "services/beacon"
+import { connectWithBeacon, createTezos, Network, rpcNodes, TezosActionType } from "services/beacon"
 import { TezosContext } from "services/beacon/context"
 import { Tzip16Module } from "@taquito/tzip16"
 import mixpanel from "mixpanel-browser"
@@ -17,14 +17,6 @@ type WalletConnectReturn = {
   wallet: BeaconWallet | undefined
 }
 
-export const initTezosInstance = (network: Network) => {
-  const newTezos = new TezosToolkit(rpcNodes[network])
-  newTezos.setPackerProvider(new MichelCodecPacker())
-  newTezos.addExtension(new Tzip16Module())
-
-  return newTezos
-}
-
 export const useTezos = (): WalletConnectReturn => {
   const {
     state: { tezos, network, account, wallet },
@@ -37,7 +29,7 @@ export const useTezos = (): WalletConnectReturn => {
     async (newNetwork?: Network) => {
       const { wallet } = await connectWithBeacon(network)
 
-      const newTezos: TezosToolkit = initTezosInstance(network || newNetwork)
+      const newTezos: TezosToolkit = createTezos(network || newNetwork)
       newTezos.setProvider({ wallet })
 
       const account = await newTezos.wallet.pkh()
@@ -74,28 +66,35 @@ export const useTezos = (): WalletConnectReturn => {
     }, [dispatch, wallet]),
     changeNetwork: async (newNetwork: Network) => {
       mixpanel.register({ Network: newNetwork })
-
       localStorage.setItem("homebase:network", newNetwork)
-
+      const newTezos: TezosToolkit = createTezos(newNetwork)
       if (!("_pkh" in tezos.wallet)) {
-        const Tezos = new TezosToolkit(rpcNodes[newNetwork])
-        Tezos.setPackerProvider(new MichelCodecPacker())
-        Tezos.addExtension(new Tzip16Module())
-
         dispatch({
           type: TezosActionType.UPDATE_TEZOS,
           payload: {
             network: newNetwork,
-            tezos: Tezos,
-            account,
+            tezos: newTezos,
+            account: "",
             wallet: undefined
           }
         })
       } else {
-        await connect(newNetwork)
+        const { wallet } = await connectWithBeacon(newNetwork)
+        newTezos.setProvider({ wallet })
+        const newAccount = await newTezos.wallet.pkh()
+
+        dispatch({
+          type: TezosActionType.UPDATE_TEZOS,
+          payload: {
+            network: newNetwork,
+            tezos: newTezos,
+            account: newAccount,
+            wallet
+          }
+        })
       }
+
       queryClient.resetQueries()
-      location.reload()
     },
     account,
     network,

src/services/beacon/utils.ts

@@ -31,23 +31,16 @@ export const getTezosNetwork = (): Network => {
   return envNetwork
 }
 
-let beaconWallet: BeaconWallet
-
-export const createWallet = (network: Network) => {
-  if (!beaconWallet) {
-    beaconWallet = new BeaconWallet({
-      name: "Homebase",
-      iconUrl: "https://tezostaquito.io/img/favicon.png",
-      preferredNetwork: network as NetworkType,
-      walletConnectOptions: {
-        projectId: "1641355e825aeaa926e843dd38b04f6f", // Project ID can be customised
-        relayUrl: "wss://relay.walletconnect.com" // WC2 relayUrl can be customised
-      }
-    })
-  }
-
-  return beaconWallet
-}
+export const createWallet = (network: Network) =>
+  new BeaconWallet({
+    name: "Homebase",
+    iconUrl: "https://tezostaquito.io/img/favicon.png",
+    preferredNetwork: network as NetworkType,
+    walletConnectOptions: {
+      projectId: "1641355e825aeaa926e843dd38b04f6f", // Project ID can be customised
+      relayUrl: "wss://relay.walletconnect.com" // WC2 relayUrl can be customised
+    }
+  })
 
 export const createTezos = (network: Network) => {
   const tezos = new TezosToolkit(rpcNodes[network])

src/services/contracts/baseDAO/hooks/useOriginate.ts

@@ -5,7 +5,7 @@ import { ContractAbstraction, ContractProvider, TezosToolkit, Wallet } from "@ta
 import { useMutation, useQueryClient } from "react-query"
 
 import { deployMetadataCarrier } from "services/contracts/metadataCarrier/deploy"
-import { initTezosInstance, useTezos } from "services/beacon/hooks/useTezos"
+import { useTezos } from "services/beacon/hooks/useTezos"
 import { BaseDAO, replacer } from ".."
 import { getDAO } from "services/services/dao/services"
 import mixpanel from "mixpanel-browser"

src/services/contracts/token/hooks/useToken.ts

@@ -9,51 +9,62 @@ import mixpanel from "mixpanel-browser"
 import { TokenContractParams } from "modules/creator/deployment/state/types"
 import { getCurrentBlock } from "services/utils/utils"
 import { deployTokenContract } from "services/contracts/token"
+import { useNotification } from "modules/common/hooks/useNotification"
 
 export const useTokenOriginate = (tokenData: TokenContractParams) => {
   const queryClient = useQueryClient()
 
   const { tezos, connect, network, account } = useTezos()
+  const openNotification = useNotification()
 
   const result = useMutation<ContractAbstraction<ContractProvider | Wallet>, Error, TokenContractParams>(
     async ({ tokenDistribution, tokenSettings }) => {
-      let tezosToolkit = tezos
+      try {
+        let tezosToolkit = tezos
 
-      if (!account) {
-        tezosToolkit = await connect()
-      }
+        if (!account) {
+          tezosToolkit = await connect()
+        }
 
-      mixpanel.track("Started Token origination", {
-        contract: "FA2Token",
-        tokenName: tokenSettings.name,
-        tokenSymbol: tokenSettings.symbol
-      })
+        mixpanel.track("Started Token origination", {
+          contract: "FA2Token",
+          tokenName: tokenSettings.name,
+          tokenSymbol: tokenSettings.symbol
+        })
 
-      const mutateTokenData: TokenContractParams = {
-        tokenDistribution,
-        tokenSettings
-      }
+        const mutateTokenData: TokenContractParams = {
+          tokenDistribution,
+          tokenSettings
+        }
 
-      const currentBlock = await getCurrentBlock(network)
+        const currentBlock = await getCurrentBlock(network)
 
-      const contract = await deployTokenContract({
-        ...mutateTokenData,
-        tezos: tezosToolkit,
-        account,
-        currentBlock
-      })
+        const contract = await deployTokenContract({
+          ...mutateTokenData,
+          tezos: tezosToolkit,
+          account,
+          currentBlock
+        })
 
-      if (!contract) {
-        throw new Error(`Error deploying ${tokenData.tokenSettings.name} Token`)
-      }
+        if (!contract) {
+          throw new Error(`Error deploying ${tokenData.tokenSettings.name} Token`)
+        }
 
-      mixpanel.track("Completed Token Deployment", {
-        contract: "FA2Token",
-        tokenName: tokenSettings.name,
-        tokenSymbol: tokenSettings.symbol
-      })
+        mixpanel.track("Completed Token Deployment", {
+          contract: "FA2Token",
+          tokenName: tokenSettings.name,
+          tokenSymbol: tokenSettings.symbol
+        })
 
-      return contract
+        return contract
+      } catch (error) {
+        openNotification({
+          message: (error as Error).message,
+          variant: "error",
+          autoHideDuration: 2000
+        })
+        return error
+      }
     },
     {
       onSuccess: () => {

src/services/contracts/token/index.ts

@@ -90,6 +90,6 @@ export const deployTokenContract = async ({
 
     return contract
   } catch (e) {
-    console.error(e)
+    throw e
   }
 }

src/services/services/lite/lite-services.ts

@@ -70,7 +70,14 @@ export const getLiteDAOs = async (network: string) => {
         name: dao.name,
         decimals: Number(dao.decimals),
         standard: dao.tokenType
-      }
+      },
+      ledgers: dao.members.map(member => {
+        return {
+          holder: {
+            address: member
+          }
+        }
+      })
     }
     return new_dao
   })