Add capability stored path info to the report

onflow · Aug 13, 2024 · 0544c67 · 0544c67
1 parent 7f0f77b
commit 0544c67
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 13 deletions.
diff --git a/migrations/capcons/capabilitymigration.go b/migrations/capcons/capabilitymigration.go
@@ -39,7 +39,8 @@ type CapabilityMigrationReporter interface {
 	)
 	MissingBorrowType(
 		accountAddress common.Address,
-		addressPath interpreter.AddressPath,
+		targetPath interpreter.AddressPath,
+		storedPath Path,
 	)
 }
 

diff --git a/migrations/capcons/migration_test.go b/migrations/capcons/migration_test.go
@@ -100,13 +100,15 @@ type testStorageCapConIssued struct {
 
 type testStorageCapConsMissingBorrowType struct {
 	accountAddress common.Address
-	addressPath    interpreter.AddressPath
+	targetPath     interpreter.AddressPath
+	storedPath     Path
 }
 
 type testStorageCapConsInferredBorrowType struct {
 	accountAddress common.Address
-	addressPath    interpreter.AddressPath
+	targetPath     interpreter.AddressPath
 	borrowType     *interpreter.ReferenceStaticType
+	storedPath     Path
 }
 
 type testMigration struct {
@@ -196,28 +198,32 @@ func (t *testMigrationReporter) MissingCapabilityID(
 
 func (t *testMigrationReporter) MissingBorrowType(
 	accountAddress common.Address,
-	addressPath interpreter.AddressPath,
+	targetPath interpreter.AddressPath,
+	storedPath Path,
 ) {
 	t.missingStorageCapConBorrowTypes = append(
 		t.missingStorageCapConBorrowTypes,
 		testStorageCapConsMissingBorrowType{
 			accountAddress: accountAddress,
-			addressPath:    addressPath,
+			targetPath:     targetPath,
+			storedPath:     storedPath,
 		},
 	)
 }
 
 func (t *testMigrationReporter) InferredMissingBorrowType(
 	accountAddress common.Address,
-	addressPath interpreter.AddressPath,
+	targetPath interpreter.AddressPath,
 	borrowType *interpreter.ReferenceStaticType,
+	storedPath Path,
 ) {
 	t.inferredStorageCapConBorrowTypes = append(
 		t.inferredStorageCapConBorrowTypes,
 		testStorageCapConsInferredBorrowType{
 			accountAddress: accountAddress,
-			addressPath:    addressPath,
+			targetPath:     targetPath,
 			borrowType:     borrowType,
+			storedPath:     storedPath,
 		},
 	)
 }
@@ -3414,12 +3420,16 @@ func TestUntypedStorageCapMigration(t *testing.T) {
 		[]testStorageCapConsInferredBorrowType{
 			{
 				accountAddress: testAddress,
-				addressPath:    testAddressPath,
+				targetPath:     testAddressPath,
 				borrowType: interpreter.NewReferenceStaticType(
 					nil,
 					inferredAuth,
 					interpreter.PrimitiveStaticTypeString,
 				),
+				storedPath: Path{
+					Domain: "storage",
+					Path:   "cap",
+				},
 			},
 		},
 		reporter.inferredStorageCapConBorrowTypes,
@@ -3633,10 +3643,14 @@ func TestUntypedStorageCapWithMissingTargetMigration(t *testing.T) {
 		[]testStorageCapConsMissingBorrowType{
 			{
 				accountAddress: addressA,
-				addressPath: interpreter.AddressPath{
+				targetPath: interpreter.AddressPath{
 					Address: addressA,
 					Path:    targetPath,
 				},
+				storedPath: Path{
+					Domain: "storage",
+					Path:   "cap",
+				},
 			},
 		},
 		reporter.missingStorageCapConBorrowTypes,

diff --git a/migrations/capcons/storagecapmigration.go b/migrations/capcons/storagecapmigration.go
@@ -29,7 +29,8 @@ import (
 type StorageCapabilityMigrationReporter interface {
 	MissingBorrowType(
 		accountAddress common.Address,
-		addressPath interpreter.AddressPath,
+		targetPath interpreter.AddressPath,
+		storedPath Path,
 	)
 	IssuedStorageCapabilityController(
 		accountAddress common.Address,
@@ -39,8 +40,9 @@ type StorageCapabilityMigrationReporter interface {
 	)
 	InferredMissingBorrowType(
 		accountAddress common.Address,
-		addressPath interpreter.AddressPath,
+		targetPath interpreter.AddressPath,
 		borrowType *interpreter.ReferenceStaticType,
+		storedPath Path,
 	)
 }
 
@@ -140,7 +142,7 @@ func IssueAccountCapabilities(
 			// However, if there is no value at the target,
 			//it is not possible to migrate this cap.
 			if value == nil {
-				reporter.MissingBorrowType(address, addressPath)
+				reporter.MissingBorrowType(address, addressPath, capability.StoredPath)
 				continue
 			}
 
@@ -152,7 +154,12 @@ func IssueAccountCapabilities(
 				valueType,
 			)
 
-			reporter.InferredMissingBorrowType(address, addressPath, borrowType)
+			reporter.InferredMissingBorrowType(
+				address,
+				addressPath,
+				borrowType,
+				capability.StoredPath,
+			)
 		}
 
 		capabilityID := stdlib.IssueStorageCapabilityController(