Return Safe blockchain version if not found on database

Author: Uxio0

safe_transaction_service/history/services/safe_service.py

@@ -211,12 +211,16 @@ def get_safe_info_from_blockchain(self, safe_address: ChecksumAddress) -> SafeIn
             safe = Safe(safe_address, self.ethereum_client)
             safe_info = safe.retrieve_all_info()
             # Return same master copy information than the db method
-            return replace(
-                safe_info,
-                version=SafeMasterCopy.objects.get_version_for_address(
-                    safe_info.master_copy
-                ),
+            db_version = SafeMasterCopy.objects.get_version_for_address(
+                safe_info.master_copy
             )
+            if db_version:
+                return replace(
+                    safe_info,
+                    version=db_version,
+                )
+            else:
+                return safe_info
         except OSError as exc:
             raise NodeConnectionException from exc
         except CannotRetrieveSafeInfoException as exc:

safe_transaction_service/history/tests/test_safe_service.py

@@ -191,7 +191,12 @@ def test_get_safe_info_from_blockchain(self):
             self.compatibility_fallback_handler_V1_4_1.address,
         )
         self.assertEqual(safe_info.guard, NULL_ADDRESS)
-        self.assertEqual(safe_info.version, None)  # No SafeMasterCopy
+        self.assertEqual(
+            safe_info.version, "1.4.1"
+        )  # No SafeMasterCopy, so fallback to blockchain version
+        self.assertIsNone(
+            SafeMasterCopy.objects.get_version_for_address(safe_info.master_copy)
+        )
 
         version = "4.8.15162342"
         SafeMasterCopyFactory(address=safe_info.master_copy, version=version)