From adcd3c5a188d53db908eeea42f18561b65331a2b Mon Sep 17 00:00:00 2001 From: blockchainluffy Date: Tue, 24 Mar 2026 15:33:03 +0530 Subject: [PATCH 1/2] fix: add eon 13 as default --- internal/usecase/crypto.go | 94 +++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/internal/usecase/crypto.go b/internal/usecase/crypto.go index 12e7b4d..e2d8f47 100644 --- a/internal/usecase/crypto.go +++ b/internal/usecase/crypto.go @@ -30,7 +30,7 @@ import ( ) const IdentityPrefixByteLength = 32 - +const eon = uint64(13) //TODO: quick fix for shutter api to be on eon 13 type ShutterregistryInterface interface { Registrations(opts *bind.CallOpts, identity [32]byte) ( struct { @@ -297,29 +297,29 @@ func (uc *CryptoUsecase) GetDataForEncryption(ctx context.Context, address strin identityPrefix = block } - blockNumber, err := uc.ethClient.BlockNumber(ctx) - if err != nil { - log.Err(err).Msg("err encountered while querying for recent block") - metrics.TotalFailedRPCCalls.Inc() - err := httpError.NewHttpError( - "error encountered while querying for recent block", - "", - http.StatusInternalServerError, - ) - return nil, &err - } - - eon, err := uc.keyperSetManagerContract.GetKeyperSetIndexByBlock(nil, blockNumber) - if err != nil { - log.Err(err).Msg("err encountered while querying keyper set index") - metrics.TotalFailedRPCCalls.Inc() - err := httpError.NewHttpError( - "error encountered while querying for keyper set index", - "", - http.StatusInternalServerError, - ) - return nil, &err - } + // blockNumber, err := uc.ethClient.BlockNumber(ctx) + // if err != nil { + // log.Err(err).Msg("err encountered while querying for recent block") + // metrics.TotalFailedRPCCalls.Inc() + // err := httpError.NewHttpError( + // "error encountered while querying for recent block", + // "", + // http.StatusInternalServerError, + // ) + // return nil, &err + // } + + // eon, err := uc.keyperSetManagerContract.GetKeyperSetIndexByBlock(nil, blockNumber) + // if err != nil { + // log.Err(err).Msg("err encountered while querying keyper set index") + // metrics.TotalFailedRPCCalls.Inc() + // err := httpError.NewHttpError( + // "error encountered while querying for keyper set index", + // "", + // http.StatusInternalServerError, + // ) + // return nil, &err + // } eonKeyBytes, err := uc.keyBroadcastContract.GetEonKey(nil, eon) if err != nil { @@ -438,29 +438,29 @@ func (uc *CryptoUsecase) RegisterIdentity(ctx context.Context, decryptionTimesta identityPrefix = block } - blockNumber, err := uc.ethClient.BlockNumber(ctx) - if err != nil { - log.Err(err).Msg("err encountered while querying for recent block") - metrics.TotalFailedRPCCalls.Inc() - err := httpError.NewHttpError( - "error encountered while querying for recent block", - "", - http.StatusInternalServerError, - ) - return nil, &err - } - - eon, err := uc.keyperSetManagerContract.GetKeyperSetIndexByBlock(nil, blockNumber) - if err != nil { - log.Err(err).Msg("err encountered while querying keyper set index") - metrics.TotalFailedRPCCalls.Inc() - err := httpError.NewHttpError( - "error encountered while querying for keyper set index", - "", - http.StatusInternalServerError, - ) - return nil, &err - } + // blockNumber, err := uc.ethClient.BlockNumber(ctx) + // if err != nil { + // log.Err(err).Msg("err encountered while querying for recent block") + // metrics.TotalFailedRPCCalls.Inc() + // err := httpError.NewHttpError( + // "error encountered while querying for recent block", + // "", + // http.StatusInternalServerError, + // ) + // return nil, &err + // } + + // eon, err := uc.keyperSetManagerContract.GetKeyperSetIndexByBlock(nil, blockNumber) + // if err != nil { + // log.Err(err).Msg("err encountered while querying keyper set index") + // metrics.TotalFailedRPCCalls.Inc() + // err := httpError.NewHttpError( + // "error encountered while querying for keyper set index", + // "", + // http.StatusInternalServerError, + // ) + // return nil, &err + // } eonKeyBytes, err := uc.keyBroadcastContract.GetEonKey(nil, eon) if err != nil { From 0799426e9c71a672b6916c3e8ed2553358ede662 Mon Sep 17 00:00:00 2001 From: blockchainluffy Date: Wed, 1 Apr 2026 19:54:41 +0530 Subject: [PATCH 2/2] chore: event trigger eon default to 13 --- internal/usecase/eventtrigger.go | 48 ++++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/usecase/eventtrigger.go b/internal/usecase/eventtrigger.go index 4d29e7f..de0af86 100644 --- a/internal/usecase/eventtrigger.go +++ b/internal/usecase/eventtrigger.go @@ -285,29 +285,29 @@ func (uc *CryptoUsecase) RegisterEventIdentity(ctx context.Context, eventTrigger identityPrefix = block } - blockNumber, err := uc.ethClient.BlockNumber(ctx) - if err != nil { - log.Err(err).Msg("err encountered while querying for recent block") - metrics.TotalFailedRPCCalls.Inc() - err := httpError.NewHttpError( - "error encountered while querying for recent block", - "", - http.StatusInternalServerError, - ) - return nil, &err - } - - eon, err := uc.keyperSetManagerContract.GetKeyperSetIndexByBlock(nil, blockNumber) - if err != nil { - log.Err(err).Msg("err encountered while querying keyper set index") - metrics.TotalFailedRPCCalls.Inc() - err := httpError.NewHttpError( - "error encountered while querying for keyper set index", - "", - http.StatusInternalServerError, - ) - return nil, &err - } + // blockNumber, err := uc.ethClient.BlockNumber(ctx) + // if err != nil { + // log.Err(err).Msg("err encountered while querying for recent block") + // metrics.TotalFailedRPCCalls.Inc() + // err := httpError.NewHttpError( + // "error encountered while querying for recent block", + // "", + // http.StatusInternalServerError, + // ) + // return nil, &err + // } + + // eon, err := uc.keyperSetManagerContract.GetKeyperSetIndexByBlock(nil, blockNumber) + // if err != nil { + // log.Err(err).Msg("err encountered while querying keyper set index") + // metrics.TotalFailedRPCCalls.Inc() + // err := httpError.NewHttpError( + // "error encountered while querying for keyper set index", + // "", + // http.StatusInternalServerError, + // ) + // return nil, &err + // } eonKeyBytes, err := uc.keyBroadcastContract.GetEonKey(nil, eon) if err != nil { @@ -634,4 +634,4 @@ func (uc *CryptoUsecase) GetEventDecryptionKey(ctx context.Context, identity str Identity: identity, DecryptionTimestamp: 0, // FIXME: ensure, we can fill timestamp for event based keys }, nil -} +} \ No newline at end of file