From 6afea5043e71459714f50c05936642b2c62b6057 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Tue, 26 Oct 2021 14:40:58 +0200
Subject: [PATCH] Add and dedupe EthereumAddress (#4118)

* Add and dedupe EthereumAddress

* Override for Polkadot claims
---
 packages/types/src/generic/PortableRegistry/PortableRegistry.ts | 2 ++
 packages/types/src/interfaces/claims/definitions.ts             | 1 -
 packages/types/src/interfaces/eth/definitions.ts                | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/types/src/generic/PortableRegistry/PortableRegistry.ts b/packages/types/src/generic/PortableRegistry/PortableRegistry.ts
index fc7ace4a57..74d01ba7ae 100644
--- a/packages/types/src/generic/PortableRegistry/PortableRegistry.ts
+++ b/packages/types/src/generic/PortableRegistry/PortableRegistry.ts
@@ -36,6 +36,8 @@ const PATHS_PRIMITIVE = splitNamespace([
   'sp_core::crypto::AccountId32',
   'sp_runtime::generic::era::Era',
   'sp_runtime::multiaddress::MultiAddress',
+  // ethereum overrides
+  'polkadot_runtime_common::claims::EthereumAddress',
   // shorten some well-known types
   'primitive_types::*',
   'sp_arithmetic::per_things::*',
diff --git a/packages/types/src/interfaces/claims/definitions.ts b/packages/types/src/interfaces/claims/definitions.ts
index 364c1f41e3..7753f84325 100644
--- a/packages/types/src/interfaces/claims/definitions.ts
+++ b/packages/types/src/interfaces/claims/definitions.ts
@@ -9,7 +9,6 @@ import type { Definitions } from '../../types';
 export default {
   rpc: {},
   types: {
-    EthereumAddress: 'H160',
     StatementKind: {
       _enum: ['Regular', 'Saft']
     }
diff --git a/packages/types/src/interfaces/eth/definitions.ts b/packages/types/src/interfaces/eth/definitions.ts
index 4eeb3c8927..082a680fdd 100644
--- a/packages/types/src/interfaces/eth/definitions.ts
+++ b/packages/types/src/interfaces/eth/definitions.ts
@@ -89,6 +89,7 @@ const types: DefinitionsTypes = {
   ...V1,
   ...V2,
   EthereumAccountId: 'GenericEthereumAccountId',
+  EthereumAddress: 'GenericEthereumAccountId',
   EthereumLookupSource: 'GenericEthereumLookupSource',
   EthereumSignature: '[u8; 65]',
   EthAccessListItem: {