Track resources with atree.ValueID instead of SlabID

Currently, Array.SlabID() and OrderedMap.SlabID() are used as
identifier to track resources, etc because slab IDs are guaranteed
to unique. However, atree slab ID should be only used to retrieve
slabs (registers) from storage.

Also, when Atree register inlining is implemented in the future, some
resources may not be stored in separate slabs, so they will not have
slab IDs anymore.

This commit uses Array.ValueID() and OrderedMap.ValueID() to uniquely
identify resources.

runtime/interpreter/interpreter.go

@@ -239,7 +239,7 @@ type Storage interface {
 	CheckHealth() error
 }
 
-type ReferencedResourceKindedValues map[atree.SlabID]map[ReferenceTrackedResourceKindedValue]struct{}
+type ReferencedResourceKindedValues map[atree.ValueID]map[ReferenceTrackedResourceKindedValue]struct{}
 
 type Interpreter struct {
 	Location     common.Location
@@ -5100,12 +5100,12 @@ func (interpreter *Interpreter) ValidateAtreeValue(value atree.Value) {
 
 func (interpreter *Interpreter) maybeTrackReferencedResourceKindedValue(value Value) {
 	if value, ok := value.(ReferenceTrackedResourceKindedValue); ok {
-		interpreter.trackReferencedResourceKindedValue(value.SlabID(), value)
+		interpreter.trackReferencedResourceKindedValue(value.ValueID(), value)
 	}
 }
 
 func (interpreter *Interpreter) trackReferencedResourceKindedValue(
-	id atree.SlabID,
+	id atree.ValueID,
 	value ReferenceTrackedResourceKindedValue,
 ) {
 	values := interpreter.SharedState.referencedResourceKindedValues[id]
@@ -5117,8 +5117,8 @@ func (interpreter *Interpreter) trackReferencedResourceKindedValue(
 }
 
 func (interpreter *Interpreter) updateReferencedResource(
-	currentID atree.SlabID,
-	newID atree.SlabID,
+	currentID atree.ValueID,
+	newID atree.ValueID,
 	updateFunc func(value ReferenceTrackedResourceKindedValue),
 ) {
 	values := interpreter.SharedState.referencedResourceKindedValues[currentID]
@@ -5377,8 +5377,8 @@ func (interpreter *Interpreter) idCapabilityCheckFunction(
 	)
 }
 
-func (interpreter *Interpreter) validateMutation(slabID atree.SlabID, locationRange LocationRange) {
-	_, present := interpreter.SharedState.containerValueIteration[slabID]
+func (interpreter *Interpreter) validateMutation(valueID atree.ValueID, locationRange LocationRange) {
+	_, present := interpreter.SharedState.containerValueIteration[valueID]
 	if !present {
 		return
 	}
@@ -5387,32 +5387,32 @@ func (interpreter *Interpreter) validateMutation(slabID atree.SlabID, locationRa
 	})
 }
 
-func (interpreter *Interpreter) withMutationPrevention(slabID atree.SlabID, f func()) {
-	oldIteration, present := interpreter.SharedState.containerValueIteration[slabID]
-	interpreter.SharedState.containerValueIteration[slabID] = struct{}{}
+func (interpreter *Interpreter) withMutationPrevention(valueID atree.ValueID, f func()) {
+	oldIteration, present := interpreter.SharedState.containerValueIteration[valueID]
+	interpreter.SharedState.containerValueIteration[valueID] = struct{}{}
 
 	f()
 
 	if !present {
-		delete(interpreter.SharedState.containerValueIteration, slabID)
+		delete(interpreter.SharedState.containerValueIteration, valueID)
 	} else {
-		interpreter.SharedState.containerValueIteration[slabID] = oldIteration
+		interpreter.SharedState.containerValueIteration[valueID] = oldIteration
 	}
 }
 
 func (interpreter *Interpreter) withResourceDestruction(
-	slabID atree.SlabID,
+	valueID atree.ValueID,
 	locationRange LocationRange,
 	f func(),
 ) {
-	_, exists := interpreter.SharedState.destroyedResources[slabID]
+	_, exists := interpreter.SharedState.destroyedResources[valueID]
 	if exists {
 		panic(DestroyedResourceError{
 			LocationRange: locationRange,
 		})
 	}
 
-	interpreter.SharedState.destroyedResources[slabID] = struct{}{}
+	interpreter.SharedState.destroyedResources[valueID] = struct{}{}
 
 	f()
 }

runtime/interpreter/interpreter_expression.go

@@ -937,8 +937,8 @@ func (interpreter *Interpreter) visitInvocationExpressionWithImplicitArgument(in
 	if boundFunction, ok := function.(BoundFunctionValue); ok && boundFunction.Self != nil {
 		self := *boundFunction.Self
 		if resource, ok := self.(ReferenceTrackedResourceKindedValue); ok {
-			slabID := resource.SlabID()
-			interpreter.trackReferencedResourceKindedValue(slabID, resource)
+			valueID := resource.ValueID()
+			interpreter.trackReferencedResourceKindedValue(valueID, resource)
 		}
 	}
 
@@ -1290,7 +1290,7 @@ func (interpreter *Interpreter) VisitAttachExpression(attachExpression *ast.Atta
 		base,
 		interpreter.MustSemaTypeOfValue(base).(*sema.CompositeType),
 	)
-	interpreter.trackReferencedResourceKindedValue(base.SlabID(), base)
+	interpreter.trackReferencedResourceKindedValue(base.ValueID(), base)
 
 	attachment, ok := interpreter.visitInvocationExpressionWithImplicitArgument(
 		attachExpression.Attachment,
@@ -1302,7 +1302,7 @@ func (interpreter *Interpreter) VisitAttachExpression(attachExpression *ast.Atta
 	}
 
 	// Because `self` in attachments is a reference, we need to track the attachment if it's a resource
-	interpreter.trackReferencedResourceKindedValue(attachment.SlabID(), attachment)
+	interpreter.trackReferencedResourceKindedValue(attachment.ValueID(), attachment)
 
 	base = base.Transfer(
 		interpreter,

runtime/interpreter/sharedstate.go

@@ -43,8 +43,8 @@ type SharedState struct {
 	storageMutatedDuringIteration               bool
 	CapabilityControllerIterations              map[AddressPath]int
 	MutationDuringCapabilityControllerIteration bool
-	containerValueIteration                     map[atree.SlabID]struct{}
-	destroyedResources                          map[atree.SlabID]struct{}
+	containerValueIteration                     map[atree.ValueID]struct{}
+	destroyedResources                          map[atree.ValueID]struct{}
 }
 
 func NewSharedState(config *Config) *SharedState {
@@ -59,11 +59,11 @@ func NewSharedState(config *Config) *SharedState {
 		},
 		inStorageIteration:             false,
 		storageMutatedDuringIteration:  false,
-		referencedResourceKindedValues: map[atree.SlabID]map[ReferenceTrackedResourceKindedValue]struct{}{},
+		referencedResourceKindedValues: map[atree.ValueID]map[ReferenceTrackedResourceKindedValue]struct{}{},
 		resourceVariables:              map[ResourceKindedValue]*Variable{},
 		CapabilityControllerIterations: map[AddressPath]int{},
-		containerValueIteration:        map[atree.SlabID]struct{}{},
-		destroyedResources:             map[atree.SlabID]struct{}{},
+		containerValueIteration:        map[atree.ValueID]struct{}{},
+		destroyedResources:             map[atree.ValueID]struct{}{},
 	}
 }