From cf0d991a6e3fefe1a597f0af6ae1b2e949ed0280 Mon Sep 17 00:00:00 2001
From: Ricki Moore <mrricki.m.usmc@gmail.com>
Date: Mon, 16 Dec 2024 14:33:43 +0100
Subject: [PATCH] Fix/deposit json (#282)

---
 src/hooks/useLodestarDepositData.ts | 39 ++++++++++++++---------------
 src/hooks/useValidatorDeposit.ts    | 10 +++++---
 src/locales/translations/en-US.json |  1 +
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/hooks/useLodestarDepositData.ts b/src/hooks/useLodestarDepositData.ts
index 55d618d3..0c0feb4e 100644
--- a/src/hooks/useLodestarDepositData.ts
+++ b/src/hooks/useLodestarDepositData.ts
@@ -3,8 +3,7 @@ import { fromHexString, toHexString, Type } from '@chainsafe/ssz'
 import { DOMAIN_DEPOSIT } from '@lodestar/params'
 import { DomainType, Domain, Root, Version } from '@lodestar/types'
 import { ssz } from '@lodestar/types/phase0'
-import { isAddress, getBytes } from 'ethers'
-import { useState } from 'react'
+import { getAddress, getBytes } from 'ethers'
 import useChainSafeKeygen from './useChainSafeKeygen'
 
 interface DepositDataJson {
@@ -25,7 +24,6 @@ export interface KeyStoreData {
 }
 
 export type useLodestarDepositDataReturnType = {
-  isLoading: boolean
   generateDepositData: (
     mnemonic: string,
     index: number,
@@ -41,7 +39,6 @@ export type useLodestarDepositDataReturnType = {
 }
 
 const useLodestarDepositData = (genesisForkVersion: string): useLodestarDepositDataReturnType => {
-  const [isLoading, setLoading] = useState<boolean>(false)
   const { deriveValidatorKeys } = useChainSafeKeygen()
 
   const computeForkDataRoot = (currentVersion: Version, genesisValidatorsRoot: Root) => {
@@ -77,8 +74,6 @@ const useLodestarDepositData = (genesisForkVersion: string): useLodestarDepositD
     index: number,
     keyStorePassword: string,
   ): Promise<KeyStoreData> => {
-    setLoading(true)
-
     try {
       const { secretKey, publicKey } = await deriveValidatorKeys(mnemonic, index)
       const keystore = await create(
@@ -96,29 +91,36 @@ const useLodestarDepositData = (genesisForkVersion: string): useLodestarDepositD
     } catch (e) {
       console.error(e)
       throw e
-    } finally {
-      setLoading(false)
     }
   }
 
+  const generateWithdrawalCredentials = (withdrawalAddress: string): Uint8Array => {
+    const checkSumAddress = getAddress(withdrawalAddress)
+    const addressBytes = fromHexString(checkSumAddress.replace('0x', ''))
+
+    if (addressBytes.length !== 20) {
+      throw new Error('INVALID_ADDRESS_LENGTH')
+    }
+
+    const withdrawalCredentials = new Uint8Array(32)
+
+    withdrawalCredentials[0] = 0x01
+
+    withdrawalCredentials.set(addressBytes, 12)
+
+    return withdrawalCredentials
+  }
+
   const generateDepositData = async (
     mnemonic: string,
     index: number,
     withdrawalAddress: string,
     amount: number,
   ): Promise<DepositData> => {
-    if (!isAddress(withdrawalAddress)) {
-      throw new Error('INVALID_ADDRESS')
-    }
-
-    setLoading(true)
-
     try {
       const { secretKey, publicKey } = await deriveValidatorKeys(mnemonic, index)
 
-      const withdrawalCredentials = fromHexString(
-        '0x010000000000000000000000' + withdrawalAddress.replace('0x', ''),
-      )
+      const withdrawalCredentials = generateWithdrawalCredentials(withdrawalAddress)
 
       const depositMessage = { pubkey: publicKey.toBytes(), withdrawalCredentials, amount }
 
@@ -139,15 +141,12 @@ const useLodestarDepositData = (genesisForkVersion: string): useLodestarDepositD
     } catch (e) {
       console.error(e)
       throw e
-    } finally {
-      setLoading(false)
     }
   }
 
   return {
     generateDepositData,
     generateKeystore,
-    isLoading,
   }
 }
 
diff --git a/src/hooks/useValidatorDeposit.ts b/src/hooks/useValidatorDeposit.ts
index b85576ac..6e929b24 100644
--- a/src/hooks/useValidatorDeposit.ts
+++ b/src/hooks/useValidatorDeposit.ts
@@ -38,19 +38,22 @@ const useValidatorDeposit = ({
   const { generateDepositData, generateKeystore } = useLodestarDepositData(GENESIS_FORK_VERSION)
 
   const handleDepositError = (e: any) => {
-    const error = (e as Error).message.toLowerCase()
+    const error = (e as Error).message
     let errorMessage = 'error.unexpectedDepositError'
-    if (error.includes('user rejected the request')) {
+    if (error.toLowerCase().includes('user rejected the request')) {
       errorMessage = 'error.userRejectedTransaction'
     }
 
-    console.error(e)
+    if (error.includes('INVALID_ADDRESS_LENGTH')) {
+      errorMessage = 'error.invalidAddressLength'
+    }
 
     setError(errorMessage)
   }
 
   const makeDeposit = async () => {
     setLoading(true)
+    setError('')
 
     try {
       if (!keyStorePassword) {
@@ -102,6 +105,7 @@ const useValidatorDeposit = ({
       )
     } catch (e) {
       handleDepositError(e)
+      setLoading(false)
       console.log(e)
     }
   }
diff --git a/src/locales/translations/en-US.json b/src/locales/translations/en-US.json
index d01243ca..8a04a3f6 100644
--- a/src/locales/translations/en-US.json
+++ b/src/locales/translations/en-US.json
@@ -290,6 +290,7 @@
     "missingValidatorData": "Invalid Validator Node Data",
     "apiTokenRequired": "Api Token is required",
     "invalidApiToken": "Invalid Api Token",
+    "invalidAddressLength": "Invalid withdrawal address length. Please review and try again.",
     "beaconDataRequired": "Beacon Node requires protocol, address and port",
     "validatorDataRequired": "Validator Node requires protocol, address and port",
     "unableToSignExit": "Unable to sign voluntary exit message",