Merge pull request #5796 from onflow/bastian/handle-missing-staged-co…

…ntracts
onflow · Apr 29, 2024 · 74694ff · 74694ff
2 parents e5febd5 + e46d9a2
commit 74694ff
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/cmd/util/ledger/migrations/staged_contracts_migration.go b/cmd/util/ledger/migrations/staged_contracts_migration.go
@@ -239,7 +239,17 @@ func (m *StagedContractsMigration) collectAndRegisterStagedContractsFromPayloads
 	inter := mr.Interpreter
 	locationRange := interpreter.EmptyLocationRange
 
-	storageMap := mr.Storage.GetStorageMap(stagingAccountAddress, common.PathDomainStorage.Identifier(), false)
+	storageMap := mr.Storage.GetStorageMap(
+		stagingAccountAddress,
+		common.PathDomainStorage.Identifier(),
+		false,
+	)
+	if storageMap == nil {
+		m.log.Error().
+			Msgf("failed to get staged contracts from account %s", stagingAccount)
+		return nil
+	}
+
 	iterator := storageMap.Iterator(inter)
 
 	stagedContractCapsuleStaticType := interpreter.NewCompositeStaticTypeComputeTypeID(