Merge pull request #2761 from onflow/sainati/account-mapping-include

update account type mappings to include identity
onflow · Sep 1, 2023 · 4b32c22 · 4b32c22
2 parents 5442fb5 + cdd1075
commit 4b32c22
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 164 deletions.
diff --git a/runtime/sema/account.cdc b/runtime/sema/account.cdc
@@ -445,38 +445,7 @@ entitlement IssueAccountCapabilityController
 /* Entitlement mappings */
 
 entitlement mapping AccountMapping {
-    // TODO: include Identity
-
-    Storage -> Storage
-    Contracts -> Contracts
-    Keys -> Keys
-    Inbox -> Inbox
-    Capabilities -> Capabilities
-
-    SaveValue -> SaveValue
-    LoadValue -> LoadValue
-    BorrowValue -> BorrowValue
-
-    AddContract -> AddContract
-    UpdateContract -> UpdateContract
-    RemoveContract -> RemoveContract
-
-    AddKey -> AddKey
-    RevokeKey -> RevokeKey
-
-    PublishInboxCapability -> PublishInboxCapability
-    UnpublishInboxCapability -> UnpublishInboxCapability
-
-    StorageCapabilities -> StorageCapabilities
-    AccountCapabilities -> AccountCapabilities
-
-    GetStorageCapabilityController -> GetStorageCapabilityController
-    IssueStorageCapabilityController -> IssueStorageCapabilityController
-
-    GetAccountCapabilityController -> GetAccountCapabilityController
-    IssueAccountCapabilityController -> IssueAccountCapabilityController
-
-    // ---
+    include Identity
 
     Storage -> SaveValue
     Storage -> LoadValue
@@ -498,20 +467,7 @@ entitlement mapping AccountMapping {
 }
 
 entitlement mapping CapabilitiesMapping {
-    // TODO: include Identity
-
-    Capabilities -> Capabilities
-
-    StorageCapabilities -> StorageCapabilities
-    AccountCapabilities -> AccountCapabilities
-
-    GetStorageCapabilityController -> GetStorageCapabilityController
-    IssueStorageCapabilityController -> IssueStorageCapabilityController
-
-    GetAccountCapabilityController -> GetAccountCapabilityController
-    IssueAccountCapabilityController -> IssueAccountCapabilityController
-
-    // ---
+    include Identity
 
     StorageCapabilities -> GetStorageCapabilityController
     StorageCapabilities -> IssueStorageCapabilityController

diff --git a/runtime/sema/account.gen.go b/runtime/sema/account.gen.go
diff --git a/runtime/sema/gen/main.go b/runtime/sema/gen/main.go
@@ -1732,13 +1732,21 @@ func entitlementMapTypeLiteral(name string, elements []ast.EntitlementMapElement
 	//	}
 	// }
 
+	includesIdentity := false
 	relationExprs := make([]dst.Expr, 0, len(elements))
 
 	for _, element := range elements {
 
-		relation, ok := element.(*ast.EntitlementMapRelation)
-		if !ok {
-			panic(fmt.Errorf("non-relation map element is not supported: %s", element))
+		relation, isRelation := element.(*ast.EntitlementMapRelation)
+		include, isInclude := element.(*ast.NominalType)
+		if !isRelation && !isInclude {
+			panic(fmt.Errorf("invalid map element: expected relations or include, got '%s'", element))
+		}
+		if isInclude && include.Identifier.Identifier == "Identity" {
+			includesIdentity = true
+			continue
+		} else if isInclude {
+			panic(fmt.Errorf("non-Identity map include is not supported: %s", element))
 		}
 
 		relationExpr := &dst.CompositeLit{
@@ -1768,6 +1776,7 @@ func entitlementMapTypeLiteral(name string, elements []ast.EntitlementMapElement
 			Type: dst.NewIdent("EntitlementMapType"),
 			Elts: []dst.Expr{
 				goKeyValue("Identifier", goStringLit(name)),
+				goKeyValue("IncludesIdentity", goBoolLit(includesIdentity)),
 				goKeyValue("Relations", relationsExpr),
 			},
 		},

diff --git a/runtime/sema/gen/testdata/entitlement.cdc b/runtime/sema/gen/testdata/entitlement.cdc
@@ -5,3 +5,8 @@ entitlement Bar
 entitlement mapping Baz {
     Foo -> Bar
 }
+
+entitlement mapping Qux {
+    include Identity
+    Foo -> Bar
+}
diff --git a/runtime/sema/gen/testdata/entitlement.golden.go b/runtime/sema/gen/testdata/entitlement.golden.go