Remove get preimage helpers

oasisprotocol · Oct 11, 2024 · 93a9aa5 · 93a9aa5
1 parent 781d415
commit 93a9aa5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 61 deletions.
diff --git a/src/app/utils/__tests__/getEthAccountAddress.test.ts b/src/app/utils/__tests__/getEthAccountAddress.test.ts
diff --git a/src/app/utils/helpers.ts b/src/app/utils/helpers.ts
@@ -84,27 +84,6 @@ export function getEthAccountAddressFromBase64(base64Address: string): string {
   return toChecksumAddress(base64ToHex(base64Address))
 }
 
-export function getEthAccountAddressFromPreimage(preimage: AddressPreimage | undefined): string | undefined {
-  if (preimage?.context !== 'oasis-runtime-sdk/address: secp256k1eth' || !preimage.address_data) {
-    // We can only determine the ETH address if there was a preimage,
-    // and the generation context was secp256k1eth
-    return undefined
-  }
-  // We need to convert from base64 to hex, add the prefix, and convert to checksum address
-  return getEthAccountAddressFromBase64(preimage.address_data)
-}
-
-export function getEthAddressForAccount(
-  account: RuntimeAccount,
-  possibleEthAddress?: string,
-): string | undefined {
-  // In case of an empty account
-  if (account.stats.num_txns <= 0 && possibleEthAddress && isValidEthAddress(possibleEthAddress))
-    return possibleEthAddress
-
-  return getEthAccountAddressFromPreimage(account.address_preimage)
-}
-
 export function uniq<T>(input: T[] | undefined): T[] {
   return input === undefined ? [] : [...new Set(input)]
 }

diff --git a/src/oasis-nexus/api.ts b/src/oasis-nexus/api.ts
@@ -16,12 +16,7 @@ import {
   RuntimeAccount,
   RuntimeEventType,
 } from './generated/api'
-import {
-  getAccountSize,
-  getEthAddressForAccount,
-  getOasisAddressOrNull,
-  isValidEthAddress,
-} from '../app/utils/helpers'
+import { getAccountSize, getOasisAddressOrNull, isValidEthAddress } from '../app/utils/helpers'
 import { getCancelTitle, getParameterChangeTitle, getProposalTitle } from '../app/utils/proposals'
 import { Network } from '../types/network'
 import { SearchScope } from '../types/searchScope'
@@ -438,7 +433,7 @@ export const useGetRuntimeAccountsAddress: typeof generated.useGetRuntimeAccount
           if (status !== 200) return data
           return groupAccountTokenBalances({
             ...data,
-            address_eth: isValidEthAddress(address) ? address : getEthAddressForAccount(data, address),
+            address_eth: isValidEthAddress(address) ? address : undefined,
             evm_contract: data.evm_contract && {
               ...data.evm_contract,
               eth_creation_tx: data.evm_contract.eth_creation_tx