[TODO] chore: cleanup done TODOs

load-testing/tests/relays_stress_helpers_test.go

@@ -730,7 +730,6 @@ func (plan *actorLoadTestIncrementPlan) shouldIncrementActorCount(
  }
 
  initialSessionNumber := testsession.GetSessionNumberWithDefaultParams(startBlockHeight)
- // TODO_BLOCKER(@bryanchriswhite): replace with gov param query when available.
  actorSessionIncRate := plan.blocksPerIncrement / int64(sharedParams.GetNumBlocksPerSession())
  nextSessionNumber := sessionInfo.sessionNumber + 1 - initialSessionNumber
  isSessionStartHeight := sessionInfo.blockHeight == sessionInfo.sessionStartBlockHeight
@@ -757,7 +756,6 @@ func (plan *actorLoadTestIncrementPlan) shouldIncrementSupplierCount(
  }
 
  initialSessionNumber := testsession.GetSessionNumberWithDefaultParams(startBlockHeight)
- // TODO_BLOCKER(@bryanchriswhite): replace with gov param query when available.
  supplierSessionIncRate := plan.blocksPerIncrement / int64(sharedParams.GetNumBlocksPerSession())
  nextSessionNumber := sessionInfo.sessionNumber + 1 - initialSessionNumber
  isSessionEndHeight := sessionInfo.blockHeight == sessionInfo.sessionEndBlockHeight

pkg/relayer/session/session.go

@@ -237,8 +237,6 @@ func (rs *relayerSessionsManager) forEachBlockClaimSessionsFn(
  // no longer eligible to be claimed, but that's not always the case.
  // Once claim window closing is implemented, they will be filtered out
  // downstream at the waitForEarliestCreateClaimsHeight step.
- // TODO_BLOCKER(@bryanchriswhite): Introduce governance claim and
- // proof window durations, implement off-chain window closing and on-chain window checks.
  if sessionGracePeriodEndHeight <= block.Height() {
  // Iterate over the sessionsTrees that have grace period ending at this
  // block height and add them to the list of sessionTrees to be published.

x/proof/keeper/msg_server_create_claim.go

@@ -15,9 +15,6 @@ func (k msgServer) CreateClaim(
  ctx context.Context,
  msg *types.MsgCreateClaim,
 ) (_ *types.MsgCreateClaimResponse, err error) {
- // TODO_BLOCKER(@bryanchriswhite): Prevent Claim upserts after the ClaimWindow is closed.
- // TODO_BLOCKER(@bryanchriswhite): Validate the signature on the Claim message corresponds to the supplier before Upserting.
-
  // Declare claim to reference in telemetry.
  var claim types.Claim
 

x/proof/keeper/msg_server_submit_proof.go

@@ -43,9 +43,6 @@ func init() {
 // A proof that's stored on-chain is what leads to rewards (i.e. inflation)
 // downstream, making the series of checks a critical part of the protocol.
 //
-// TODO_BLOCKER(@bryanchriswhite): Prevent proof upserts after the tokenomics
-// module has processed the respective session.
-//
 // Note: The entity sending the SubmitProof messages does not necessarily need
 // to correspond to the supplier signing the proof. For example, a single entity
 // could (theoretically) batch multiple proofs (signed by the corresponding supplier)

x/proof/keeper/query_claim_test.go

@@ -97,9 +97,8 @@ func TestClaimQuerySingle(t *testing.T) {
 
  expectedErr: status.Error(
  codes.InvalidArgument,
- types.ErrProofInvalidSessionId.Wrapf(
- "invalid session ID for claim being retrieved %s",
- "",
+ types.ErrProofInvalidSessionId.Wrap(
+ "invalid empty session ID for claim being retrieved",
  ).Error(),
  ),
  },

x/proof/keeper/query_proof_test.go

@@ -84,9 +84,8 @@ func TestProofQuerySingle(t *testing.T) {
  },
  expectedErr: status.Error(
  codes.InvalidArgument,
- types.ErrProofInvalidSessionId.Wrapf(
- "invalid session ID for proof being retrieved %s",
- "",
+ types.ErrProofInvalidSessionId.Wrap(
+ "invalid empty session ID for proof being retrieved",
  ).Error(),
  ),
  },

x/proof/types/query_validation.go

@@ -19,28 +19,25 @@ func (query *QueryGetClaimRequest) ValidateBasic() error {
  return ErrProofInvalidAddress.Wrapf("invalid supplier address for claim being retrieved %s; (%v)", query.SupplierAddress, err)
  }
 
- // TODO_BLOCKER(@bryanchriswhite): Validate the session ID once we have a deterministic way to generate it
  if query.SessionId == "" {
- return ErrProofInvalidSessionId.Wrapf("invalid session ID for claim being retrieved %s", query.SessionId)
+ return ErrProofInvalidSessionId.Wrap("invalid empty session ID for claim being retrieved")
  }
 
  return nil
 }
 
 // ValidateBasic performs basic (non-state-dependant) validation on a QueryAllClaimsRequest.
 func (query *QueryAllClaimsRequest) ValidateBasic() error {
- logger := polylog.Ctx(context.Background())
-
  switch filter := query.Filter.(type) {
  case *QueryAllClaimsRequest_SupplierAddress:
  if _, err := sdk.AccAddressFromBech32(filter.SupplierAddress); err != nil {
  return ErrProofInvalidAddress.Wrapf("invalid supplier address for claims being retrieved %s; (%v)", filter.SupplierAddress, err)
  }
 
  case *QueryAllClaimsRequest_SessionId:
- logger.Warn().
- Str("session_id", filter.SessionId).
-  Msg("TODO_BLOCKER(@bryanchriswhite): Validate the session ID once we have a deterministic way to generate it")
+ if filter.SessionId == "" {
+ return ErrProofInvalidSessionId.Wrap("invalid empty session ID for claims being retrieved")
+ }
 
  case *QueryAllClaimsRequest_SessionEndHeight:
  if filter.SessionEndHeight < 0 {
@@ -57,9 +54,8 @@ func (query *QueryGetProofRequest) ValidateBasic() error {
  return ErrProofInvalidAddress.Wrapf("invalid supplier address for proof being retrieved %s; (%v)", query.SupplierAddress, err)
  }
 
- // TODO_BLOCKER(@bryanchriswhite): Validate the session ID once we have a deterministic way to generate it
  if query.SessionId == "" {
- return ErrProofInvalidSessionId.Wrapf("invalid session ID for proof being retrieved %s", query.SessionId)
+ return ErrProofInvalidSessionId.Wrap("invalid empty session ID for proof being retrieved")
  }
 
  return nil
@@ -76,9 +72,9 @@ func (query *QueryAllProofsRequest) ValidateBasic() error {
  }
 
  case *QueryAllProofsRequest_SessionId:
- logger.Warn().
- Str("session_id", filter.SessionId).
-  Msg("TODO_BLOCKER(@bryanchriswhite): Validate the session ID once we have a deterministic way to generate it")
+ if filter.SessionId == "" {
+ return ErrProofInvalidSessionId.Wrap("invalid empty session ID for proofs being retrieved")
+ }
 
  case *QueryAllProofsRequest_SessionEndHeight:
  if filter.SessionEndHeight < 0 {

x/session/keeper/query_get_session_test.go

@@ -44,7 +44,7 @@ func TestSession_GetSession_Success(t *testing.T) {
  blockHeight: 1,
 
  // Intentionally only checking a subset of the session metadata returned
- expectedSessionId: "335ca69ea6365eed04d5be2f5553b239bd2e3226b08c394169059ae40dfa1599",
+ expectedSessionId: "afd00273055a4fddc0beb30074e14d474c07f9e895d2795db006a5139048d54b",
  expectedSessionNumber: 1,
  expectedNumSuppliers: 1,
  },

x/session/keeper/session_hydrator.go

@@ -1,6 +1,7 @@
 package keeper
 
 import (
+ "bytes"
  "context"
  "crypto"
  "encoding/binary"
@@ -254,12 +255,8 @@ func uniqueRandomIndices(seed, maxIndex, numIndices int64) map[int64]struct{} {
  return indicesMap
 }
 
-func concatWithDelimiter(delimiter string, bz ...[]byte) (result []byte) {
- for _, b := range bz {
- result = append(result, b...)
- result = append(result, []byte(delimiter)...)
- }
- return result
+func concatWithDelimiter(delimiter string, bz ...[]byte) []byte {
+ return bytes.Join(bz, []byte(delimiter))
 }
 
 func sha3Hash(bz []byte) []byte {
@@ -292,16 +289,16 @@ func GetSessionId(
  blockHashBz []byte,
  blockHeight int64,
 ) (sessionId string, sessionIdBz []byte) {
- appPubKeyBz := []byte(appAddr)
+ appAddrBz := []byte(appAddr)
  serviceIdBz := []byte(serviceId)
 
- blockHeightBz := getSessionStartBlockHeightBz(sharedParams, blockHeight)
+ sessionStartHeightBz := getSessionStartBlockHeightBz(sharedParams, blockHeight)
  sessionIdBz = concatWithDelimiter(
  SessionIDComponentDelimiter,
  blockHashBz,
  serviceIdBz,
- appPubKeyBz,
- blockHeightBz,
+ appAddrBz,
+ sessionStartHeightBz,
  )
  sessionId = hex.EncodeToString(sha3Hash(sessionIdBz))
 

x/session/keeper/session_hydrator_test.go

@@ -29,11 +29,11 @@ func TestSession_HydrateSession_Success_BaseCase(t *testing.T) {
  require.Equal(t, "", sessionHeader.Service.Name)
  require.Equal(t, int64(9), sessionHeader.SessionStartBlockHeight)
  require.Equal(t, int64(12), sessionHeader.SessionEndBlockHeight)
- require.Equal(t, "20650c94d0bcc4b855654b5533bf880345ae96933c5fa7424ce59c698d208e22", sessionHeader.SessionId)
+ require.Equal(t, "fea5d6f7544ff6d8af5c22529b2ccf01ed7930b3d454d42dda5ccc0b65b6ebfd", sessionHeader.SessionId)
 
  // Check the session
  require.Equal(t, int64(4), session.NumBlocksPerSession)
- require.Equal(t, "20650c94d0bcc4b855654b5533bf880345ae96933c5fa7424ce59c698d208e22", session.SessionId)
+ require.Equal(t, "fea5d6f7544ff6d8af5c22529b2ccf01ed7930b3d454d42dda5ccc0b65b6ebfd", session.SessionId)
  require.Equal(t, int64(3), session.SessionNumber)
 
  // Check the application
@@ -165,8 +165,8 @@ func TestSession_HydrateSession_SessionId(t *testing.T) {
  serviceId1: keepertest.TestServiceId1, // svc1
  serviceId2: keepertest.TestServiceId1, // svc1
 
- expectedSessionId1: "c8a3d0135e2d0ed3a2d579adcd3b91708e59adf558b7c8bd474473de669cb18a",
- expectedSessionId2: "20650c94d0bcc4b855654b5533bf880345ae96933c5fa7424ce59c698d208e22",
+ expectedSessionId1: "e161348f2153bb41092040c3c287596f8daf98e90986475be21412a1ded945ed",
+ expectedSessionId2: "fea5d6f7544ff6d8af5c22529b2ccf01ed7930b3d454d42dda5ccc0b65b6ebfd",
  },
  {
  desc: "app1: sessionId for svc1 != sessionId for svc12",
@@ -180,8 +180,8 @@ func TestSession_HydrateSession_SessionId(t *testing.T) {
  serviceId1: keepertest.TestServiceId1, // svc1
  serviceId2: keepertest.TestServiceId12, // svc12
 
- expectedSessionId1: "c8a3d0135e2d0ed3a2d579adcd3b91708e59adf558b7c8bd474473de669cb18a",
- expectedSessionId2: "bf37fcbc62fe728f356384e9a765584f1c9d761566b2d46c0f77297675d966c6",
+ expectedSessionId1: "e161348f2153bb41092040c3c287596f8daf98e90986475be21412a1ded945ed",
+ expectedSessionId2: "c01eb8924dbb9dae7cab8ed56016ce8fdd2d23542f9e0b7ca8d6972d3fb45ce5",
  },
  {
  desc: "svc12: sessionId for app1 != sessionId for app2",
@@ -195,8 +195,8 @@ func TestSession_HydrateSession_SessionId(t *testing.T) {
  serviceId1: keepertest.TestServiceId12, // svc12
  serviceId2: keepertest.TestServiceId12, // svc12
 
- expectedSessionId1: "bf37fcbc62fe728f356384e9a765584f1c9d761566b2d46c0f77297675d966c6",
- expectedSessionId2: "8806550a46a16fcb6bc0a4bd0803081a2478d25868057bcf86204c8aaefb28ac",
+ expectedSessionId1: "c01eb8924dbb9dae7cab8ed56016ce8fdd2d23542f9e0b7ca8d6972d3fb45ce5",
+ expectedSessionId2: "f6dbe4961afd8ff0e444a1159d02bc645f9ded3daaa605c187e6bd7ee2232a68",
  },
  }