nits

api/jsonrpc/server.go

@@ -307,8 +307,6 @@ func (j *JSONRPCServer) SimulateActions(
 
 	currentTime := time.Now().UnixMilli()
 	for _, action := range actions {
-		// This code block shouldn't use tstateview but rather, the simulated
-		// scope itself
 		actionOutput, err := action.Execute(ctx, j.vm.Rules(currentTime), tsv, currentTime, args.Actor, ids.Empty)
 
 		var actionResult SimulateActionResult

chain/builder.go

@@ -417,8 +417,7 @@ func (c *Builder) BuildBlock(ctx context.Context, parentView state.View, parent
 	for k := range changedKeys {
 		if changedKeys[k].HasValue() {
 			if err := tsv.Insert(ctx, []byte(k), binary.BigEndian.AppendUint64(changedKeys[k].Value(), height)); err != nil {
-				// TODO: improve error message
-				return nil, nil, nil, fmt.Errorf("%w: unable to append suffix", err)
+				return nil, nil, nil, fmt.Errorf("%w: unable to append value suffix", err)
 			}
 		}
 	}

state/tstate/tstate_view.go

@@ -41,7 +41,8 @@ type TStateView struct {
 	// operations allows for reverting state to a certain point-in-time.
 	ops []*op
 
-	// TODO: add documentation for this field
+	// scope contains the state keys this view has access too along with the
+	// storage of the parent view.
 	scope scope.Scope
 
 	// Store which keys are modified and how large their values were.

vm/resolutions.go

@@ -121,11 +121,15 @@ func (vm *VM) State() (merkledb.MerkleDB, error) {
 
 func (vm *VM) ImmutableState(ctx context.Context) (state.Immutable, error) {
 	ts := tstate.New(0)
-	state, err := vm.State()
+	st, err := vm.State()
 	if err != nil {
 		return nil, err
 	}
-	return ts.ExportMerkleDBView(ctx, vm.tracer, state)
+	view, err := ts.ExportMerkleDBView(ctx, vm.tracer, st)
+	if err != nil {
+		return nil, err
+	}
+	return state.NewTranslatedImmutable(view), nil
 }
 
 func (vm *VM) Mempool() chain.Mempool {

vm/vm.go

@@ -684,28 +684,7 @@ func (vm *VM) ReadState(ctx context.Context, keys [][]byte) ([][]byte, []error)
 	// Atomic read to ensure consistency
 	values, errs := vm.stateDB.GetValues(ctx, keys)
 
-	returnValues := make([][]byte, 0, len(values))
-	returnErrors := make([]error, 0, len(values))
-
-	// TODO: could we make this cleaner?
-	// Assuming that len(values) == len(errs)
-	for i, v := range values {
-		if errs[i] != nil {
-			returnErrors = append(returnErrors, errs[i])
-			returnValues = append(returnValues, nil)
-			continue
-		}
-		// Time to unsuffix
-		if len(v) < consts.Uint64Len {
-			returnErrors = append(returnErrors, ErrValueTooShortForPrefix)
-			returnValues = append(returnValues, nil)
-			continue
-		}
-		returnValues = append(returnValues, v[:len(v)-consts.Uint64Len])
-		returnErrors = append(returnErrors, nil)
-	}
-
-	return returnValues, returnErrors
+	return vm.removeSuffixes(values, errs)
 }
 
 func (vm *VM) SetState(ctx context.Context, state snow.State) error {
@@ -1233,6 +1212,30 @@ func (vm *VM) restoreAcceptedQueue(ctx context.Context) error {
 	return nil
 }
 
+func (*VM) removeSuffixes(values [][]byte, errors []error) ([][]byte, []error) {
+	returnValues := make([][]byte, 0, len(values))
+	returnErrors := make([]error, 0, len(values))
+
+	// Invariant: len(values) == len(errors)
+	for i, v := range values {
+		if errors[i] != nil {
+			returnErrors = append(returnErrors, errors[i])
+			returnValues = append(returnValues, nil)
+			continue
+		}
+		// Time to unsuffix
+		if len(v) < consts.Uint64Len {
+			returnErrors = append(returnErrors, ErrValueTooShortForPrefix)
+			returnValues = append(returnValues, nil)
+			continue
+		}
+		returnValues = append(returnValues, v[:len(v)-consts.Uint64Len])
+		returnErrors = append(returnErrors, nil)
+	}
+
+	return returnValues, returnErrors
+}
+
 // Fatal logs the provided message and then panics to force an exit.
 //
 // While we could attempt a graceful shutdown, it is not clear that