Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 47 additions & 47 deletions internal/usecase/crypto.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
48 changes: 24 additions & 24 deletions internal/usecase/eventtrigger.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}
}