Merge pull request #3141 from onflow/supun/fix-static-type-migration

Migrate static types of arrays and dictionaries
onflow · Feb 28, 2024 · 08a4868 · 08a4868
2 parents 2dd12d3 + 621b611
commit 08a4868
Show file tree

Hide file tree

Showing 2 changed files with 126 additions and 1 deletion.
diff --git a/migrations/statictypes/account_type_migration_test.go b/migrations/statictypes/account_type_migration_test.go
@@ -880,6 +880,46 @@ func TestMigratingValuesWithAccountStaticType(t *testing.T) {
 	require.NoError(t, err)
 
 	testCases := map[string]testCase{
+		"dictionary_value": {
+			storedValue: interpreter.NewDictionaryValue(
+				inter,
+				locationRange,
+				interpreter.NewDictionaryStaticType(
+					nil,
+					interpreter.PrimitiveStaticTypeString,
+					interpreter.PrimitiveStaticTypePublicAccount, //nolint:staticcheck
+				),
+			),
+			expectedValue: interpreter.NewDictionaryValue(
+				inter,
+				locationRange,
+				interpreter.NewDictionaryStaticType(
+					nil,
+					interpreter.PrimitiveStaticTypeString,
+					unauthorizedAccountReferenceType,
+				),
+			),
+		},
+		"array_value": {
+			storedValue: interpreter.NewArrayValue(
+				inter,
+				locationRange,
+				interpreter.NewVariableSizedStaticType(
+					nil,
+					interpreter.PrimitiveStaticTypePublicAccount, //nolint:staticcheck
+				),
+				common.Address{},
+			),
+			expectedValue: interpreter.NewArrayValue(
+				inter,
+				locationRange,
+				interpreter.NewVariableSizedStaticType(
+					nil,
+					unauthorizedAccountReferenceType,
+				),
+				common.Address{},
+			),
+		},
 		"account_capability_value": {
 			storedValue: interpreter.NewUnmeteredCapabilityValue(
 				123,
@@ -955,6 +995,46 @@ func TestMigratingValuesWithAccountStaticType(t *testing.T) {
 				BorrowType: unauthorizedAccountReferenceType,
 			},
 		},
+		"capability_dictionary": {
+			storedValue: interpreter.NewDictionaryValue(
+				inter,
+				locationRange,
+				interpreter.NewDictionaryStaticType(
+					nil,
+					interpreter.PrimitiveStaticTypeString,
+					interpreter.NewCapabilityStaticType(
+						nil,
+						interpreter.PrimitiveStaticTypePublicAccount, //nolint:staticcheck
+					),
+				),
+				interpreter.NewUnmeteredStringValue("key"),
+				interpreter.NewCapabilityValue(
+					nil,
+					interpreter.NewUnmeteredUInt64Value(1234),
+					interpreter.NewAddressValue(nil, common.Address{}),
+					interpreter.PrimitiveStaticTypePublicAccount, //nolint:staticcheck
+				),
+			),
+			expectedValue: interpreter.NewDictionaryValue(
+				inter,
+				locationRange,
+				interpreter.NewDictionaryStaticType(
+					nil,
+					interpreter.PrimitiveStaticTypeString,
+					interpreter.NewCapabilityStaticType(
+						nil,
+						unauthorizedAccountReferenceType,
+					),
+				),
+				interpreter.NewUnmeteredStringValue("key"),
+				interpreter.NewCapabilityValue(
+					nil,
+					interpreter.NewUnmeteredUInt64Value(1234),
+					interpreter.NewAddressValue(nil, common.Address{}),
+					unauthorizedAccountReferenceType,
+				),
+			),
+		},
 	}
 
 	// Store values

diff --git a/migrations/statictypes/statictype_migration.go b/migrations/statictypes/statictype_migration.go
@@ -62,7 +62,7 @@ func (m *StaticTypeMigration) Migrate(
 	_ interpreter.StorageKey,
 	_ interpreter.StorageMapKey,
 	value interpreter.Value,
-	_ *interpreter.Interpreter,
+	inter *interpreter.Interpreter,
 ) (newValue interpreter.Value, err error) {
 	switch value := value.(type) {
 	case interpreter.TypeValue:
@@ -129,6 +129,51 @@ func (m *StaticTypeMigration) Migrate(
 			value.CapabilityID,
 			value.TargetPath,
 		), nil
+
+	case *interpreter.ArrayValue:
+		convertedElementType := m.maybeConvertStaticType(value.Type, nil)
+		if convertedElementType == nil {
+			return
+		}
+
+		iterator := value.Iterator(inter, interpreter.EmptyLocationRange)
+
+		return interpreter.NewArrayValueWithIterator(
+			inter,
+			convertedElementType.(interpreter.ArrayStaticType),
+			value.GetOwner(),
+			uint64(value.Count()),
+			func() interpreter.Value {
+				return iterator.Next(inter, interpreter.EmptyLocationRange)
+			},
+		), nil
+
+	case *interpreter.DictionaryValue:
+		convertedElementType := m.maybeConvertStaticType(value.Type, nil)
+		if convertedElementType == nil {
+			return
+		}
+
+		var keysAndValues []interpreter.Value
+
+		iterator := value.Iterator()
+		for {
+			keyValue, value := iterator.Next(inter)
+			if keyValue == nil {
+				break
+			}
+
+			keysAndValues = append(keysAndValues, keyValue)
+			keysAndValues = append(keysAndValues, value)
+		}
+
+		return interpreter.NewDictionaryValueWithAddress(
+			inter,
+			interpreter.EmptyLocationRange,
+			convertedElementType.(*interpreter.DictionaryStaticType),
+			value.GetOwner(),
+			keysAndValues...,
+		), nil
 	}
 
 	return