Merge pull request #6388 from onflow/bastian/recover-nft

[FVM] Recover NFT contract

cmd/util/ledger/migrations/account_storage_migration.go

@@ -52,25 +52,15 @@ func NewAccountStorageMigration(
 			log.Err(err).Msg("storage health check failed")
 		}
 
-		// Finalize the transaction
-		result, err := migrationRuntime.TransactionState.FinalizeMainTransaction()
-		if err != nil {
-			return fmt.Errorf("failed to finalize main transaction: %w", err)
-		}
+		// Commit/finalize the transaction
 
-		// Merge the changes into the registers
 		expectedAddresses := map[flow.Address]struct{}{
 			flow.Address(address): {},
 		}
 
-		err = registers.ApplyChanges(
-			registersByAccount,
-			result.WriteSet,
-			expectedAddresses,
-			log,
-		)
+		err = migrationRuntime.Commit(expectedAddresses, log)
 		if err != nil {
-			return fmt.Errorf("failed to apply register changes: %w", err)
+			return fmt.Errorf("failed to commit: %w", err)
 		}
 
 		return nil

cmd/util/ledger/migrations/cadence.go

@@ -392,25 +392,15 @@ func (m *IssueStorageCapConMigration) MigrateAccount(
 		return fmt.Errorf("failed to commit changes: %w", err)
 	}
 
-	// finalize the transaction
-	result, err := migrationRuntime.TransactionState.FinalizeMainTransaction()
-	if err != nil {
-		return fmt.Errorf("failed to finalize main transaction: %w", err)
-	}
+	// Commit/finalize the transaction
 
-	// Merge the changes into the registers
 	expectedAddresses := map[flow.Address]struct{}{
 		flow.Address(address): {},
 	}
 
-	err = registers.ApplyChanges(
-		accountRegisters,
-		result.WriteSet,
-		expectedAddresses,
-		m.log,
-	)
+	err = migrationRuntime.Commit(expectedAddresses, m.log)
 	if err != nil {
-		return fmt.Errorf("failed to apply changes: %w", err)
+		return fmt.Errorf("failed to commit: %w", err)
 	}
 
 	return nil

cmd/util/ledger/migrations/cadence_values_migration.go

@@ -180,25 +180,15 @@ func (m *CadenceBaseMigration) MigrateAccount(
 		}
 	}
 
-	// finalize the transaction
-	result, err := migrationRuntime.TransactionState.FinalizeMainTransaction()
-	if err != nil {
-		return fmt.Errorf("failed to finalize main transaction: %w", err)
-	}
+	// Commit/finalize the transaction
 
-	// Merge the changes into the registers
 	expectedAddresses := map[flow.Address]struct{}{
 		flow.Address(address): {},
 	}
 
-	err = registers.ApplyChanges(
-		accountRegisters,
-		result.WriteSet,
-		expectedAddresses,
-		m.log,
-	)
+	err = migrationRuntime.Commit(expectedAddresses, m.log)
 	if err != nil {
-		return fmt.Errorf("failed to apply changes: %w", err)
+		return fmt.Errorf("failed to commit: %w", err)
 	}
 
 	if m.diffReporter != nil {