Revert "Fix gosec"

This reverts commit 179ab16.

Author: Eric-Warehime

blockstm/scheduler.go

@@ -66,14 +66,14 @@ func (s *Scheduler) Done() bool {
 }
 
 func (s *Scheduler) DecreaseValidationIdx(target TxnIndex) {
-	StoreMin(&s.validation_idx, uint64(target)) //nolint:gosec // index conversion safe
+	StoreMin(&s.validation_idx, uint64(target))
 	s.decrease_cnt.Add(1)
 }
 
 func (s *Scheduler) CheckDone() {
 	observed_cnt := s.decrease_cnt.Load()
-	if s.execution_idx.Load() >= uint64(s.block_size) && //nolint:gosec // block size conversion safe
-		s.validation_idx.Load() >= uint64(s.block_size) && //nolint:gosec // block size conversion safe
+	if s.execution_idx.Load() >= uint64(s.block_size) &&
+		s.validation_idx.Load() >= uint64(s.block_size) &&
 		s.num_active_tasks.Load() == 0 {
 		if observed_cnt == s.decrease_cnt.Load() {
 			s.done_marker.Store(true)
@@ -102,7 +102,7 @@ func (s *Scheduler) TryIncarnate(idx TxnIndex) TxnVersion {
 //
 // Invariant `num_active_tasks`: increased if a valid task is returned.
 func (s *Scheduler) NextVersionToExecute() TxnVersion {
-	if s.execution_idx.Load() >= uint64(s.block_size) { //nolint:gosec // block size conversion safe
+	if s.execution_idx.Load() >= uint64(s.block_size) {
 		s.CheckDone()
 		return InvalidTxnVersion
 	}
@@ -116,15 +116,15 @@ func (s *Scheduler) NextVersionToExecute() TxnVersion {
 //
 // Invariant `num_active_tasks`: increased if a valid task is returned.
 func (s *Scheduler) NextVersionToValidate() TxnVersion {
-	if s.validation_idx.Load() >= uint64(s.block_size) { //nolint:gosec // block size conversion safe
+	if s.validation_idx.Load() >= uint64(s.block_size) {
 		s.CheckDone()
 		return InvalidTxnVersion
 	}
 	IncrAtomic(&s.num_active_tasks)
 	idx_to_validate := FetchIncr(&s.validation_idx)
-	if idx_to_validate < uint64(s.block_size) { //nolint:gosec // block size conversion safe
+	if idx_to_validate < uint64(s.block_size) {
 		if ok, incarnation := s.txn_status[idx_to_validate].IsExecuted(); ok {
-			return TxnVersion{TxnIndex(idx_to_validate), incarnation} //nolint:gosec // index conversion safe
+			return TxnVersion{TxnIndex(idx_to_validate), incarnation}
 		}
 	}
 
@@ -178,8 +178,7 @@ func (s *Scheduler) FinishExecution(version TxnVersion, wroteNewPath bool) (TxnV
 
 	deps := s.txn_dependency[version.Index].Swap(nil)
 	s.ResumeDependencies(deps)
-	// otherwise index already small enough
-	if s.validation_idx.Load() > uint64(version.Index) { //nolint:gosec // index conversion safe
+	if s.validation_idx.Load() > uint64(version.Index) { // otherwise index already small enough
 		if !wroteNewPath {
 			// schedule validation for current tx only, don't decrease num_active_tasks
 			return version, TaskKindValidation
@@ -201,7 +200,7 @@ func (s *Scheduler) FinishValidation(txn TxnIndex, aborted bool) (TxnVersion, Ta
 	if aborted {
 		s.txn_status[txn].SetReadyStatus()
 		s.DecreaseValidationIdx(txn + 1)
-		if s.execution_idx.Load() > uint64(txn) { //nolint:gosec // index conversion safe
+		if s.execution_idx.Load() > uint64(txn) {
 			return s.TryIncarnate(txn), TaskKindExecution
 		}
 	}

store/gaskv/store.go

@@ -70,7 +70,7 @@ func (gs *GStore[V]) Get(key []byte) (value V) {
 
 	// TODO overflow-safe math?
 	gs.gasMeter.ConsumeGas(gs.gasConfig.ReadCostPerByte*types.Gas(len(key)), types.GasReadPerByteDesc)
-	gs.gasMeter.ConsumeGas(gs.gasConfig.ReadCostPerByte*types.Gas(gs.valueLen(value)), types.GasReadPerByteDesc) //nolint:gosec // fix this with the above as well
+	gs.gasMeter.ConsumeGas(gs.gasConfig.ReadCostPerByte*types.Gas(gs.valueLen(value)), types.GasReadPerByteDesc)
 
 	return value
 }
@@ -82,7 +82,7 @@ func (gs *GStore[V]) Set(key []byte, value V) {
 	gs.gasMeter.ConsumeGas(gs.gasConfig.WriteCostFlat, types.GasWriteCostFlatDesc)
 	// TODO overflow-safe math?
 	gs.gasMeter.ConsumeGas(gs.gasConfig.WriteCostPerByte*types.Gas(len(key)), types.GasWritePerByteDesc)
-	gs.gasMeter.ConsumeGas(gs.gasConfig.WriteCostPerByte*types.Gas(gs.valueLen(value)), types.GasWritePerByteDesc) //nolint:gosec // fix this with the above as well
+	gs.gasMeter.ConsumeGas(gs.gasConfig.WriteCostPerByte*types.Gas(gs.valueLen(value)), types.GasWritePerByteDesc)
 	gs.parent.Set(key, value)
 }
 
@@ -203,7 +203,7 @@ func (gi *gasIterator[V]) consumeSeekGas() {
 		value := gi.Value()
 
 		gi.gasMeter.ConsumeGas(gi.gasConfig.ReadCostPerByte*types.Gas(len(key)), types.GasValuePerByteDesc)
-		gi.gasMeter.ConsumeGas(gi.gasConfig.ReadCostPerByte*types.Gas(gi.valueLen(value)), types.GasValuePerByteDesc) //nolint:gosec // fix this with the above as well
+		gi.gasMeter.ConsumeGas(gi.gasConfig.ReadCostPerByte*types.Gas(gi.valueLen(value)), types.GasValuePerByteDesc)
 	}
 	gi.gasMeter.ConsumeGas(gi.gasConfig.IterNextCostFlat, types.GasIterNextCostFlatDesc)
 }

x/bank/keeper/virtual.go

@@ -91,7 +91,7 @@ func (k BaseSendKeeper) addVirtualCoins(ctx context.Context, addr sdk.AccAddress
 	// bytes containing account address followed by the txn index
 	key := make([]byte, len(addr)+8)
 	copy(key, addr)
-	binary.BigEndian.PutUint64(key[len(addr):], uint64(sdkCtx.TxIndex())) // nolint:gosec // index conversion safe
+	binary.BigEndian.PutUint64(key[len(addr):], uint64(sdkCtx.TxIndex()))
 
 	var coins sdk.Coins
 	value := store.Get(key)
@@ -108,7 +108,7 @@ func (k BaseSendKeeper) subVirtualCoins(ctx context.Context, addr sdk.AccAddress
 
 	key := make([]byte, len(addr)+8)
 	copy(key, addr)
-	binary.BigEndian.PutUint64(key[len(addr):], uint64(sdkCtx.TxIndex())) // nolint:gosec // index conversion safe
+	binary.BigEndian.PutUint64(key[len(addr):], uint64(sdkCtx.TxIndex()))
 
 	value := store.Get(key)
 	if value == nil {