From 09f8a7f075bad0a30b037a6862dcfd95c807f7f2 Mon Sep 17 00:00:00 2001
From: Andriian Chestnykh <>
Date: Tue, 13 Aug 2024 09:49:51 +0100
Subject: [PATCH] Hotfix

---
 pkg/services/blockchain/eth/resolver.go | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkg/services/blockchain/eth/resolver.go b/pkg/services/blockchain/eth/resolver.go
index dd4ba24..72fa524 100644
--- a/pkg/services/blockchain/eth/resolver.go
+++ b/pkg/services/blockchain/eth/resolver.go
@@ -207,9 +207,22 @@ func (r *Resolver) Resolve(
 		default:
 			stateInfo, gistInfo, err = r.resolveLatest(ctx, userID)
 		}
-		if err != nil && err.Error() != "identity not found" {
+
+		if err != nil && err.Error() != "state not found" {
 			return services.IdentityState{}, err
 		}
+
+		if err != nil {
+			idGen, err := core.CheckGenesisStateID(userID.BigInt(), opts.State)
+			if err != nil {
+				return services.IdentityState{}, err
+			}
+			if !idGen {
+				return services.IdentityState{}, services.ErrNotFound
+			}
+			stateInfo = &contract.IStateStateInfo{}
+			stateInfo.State = opts.State
+		}
 	}
 
 	identityState := services.IdentityState{}