From 0ad2053d5f0d5c7e6db05470b328987f23adeecc Mon Sep 17 00:00:00 2001
From: Garand Tyson <garand@stellar.org>
Date: Fri, 28 Jul 2023 15:47:30 -0700
Subject: [PATCH] Updated expiration settings for ConfigUpgrades

---
 src/herder/Upgrades.cpp | 6 +++---
 src/test/TxTests.cpp    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/herder/Upgrades.cpp b/src/herder/Upgrades.cpp
index 59fecdea9d..4c575f7ffa 100644
--- a/src/herder/Upgrades.cpp
+++ b/src/herder/Upgrades.cpp
@@ -1301,14 +1301,14 @@ ConfigUpgradeSetFrame::makeFromKey(AbstractLedgerTxn& ltx,
                                    ConfigUpgradeSetKey const& key)
 {
     auto ltxe = ltx.loadWithoutRecord(ConfigUpgradeSetFrame::getLedgerKey(key));
-    if (!ltxe)
+    if (!ltxe || !isLive(ltxe.current(), ltx.getHeader().ledgerSeq))
     {
         return nullptr;
     }
     auto const& contractData = ltxe.current().data.contractData();
     if (contractData.body.bodyType() != DATA_ENTRY ||
         contractData.body.data().val.type() != SCV_BYTES ||
-        contractData.durability != PERSISTENT)
+        contractData.durability != TEMPORARY)
     {
         return nullptr;
     }
@@ -1406,7 +1406,7 @@ ConfigUpgradeSetFrame::getLedgerKey(ConfigUpgradeSetKey const& upgradeKey)
     lk.contractData().contract.type(SC_ADDRESS_TYPE_CONTRACT);
     lk.contractData().contract.contractId() = upgradeKey.contractID;
     lk.contractData().key = v;
-    lk.contractData().durability = PERSISTENT;
+    lk.contractData().durability = TEMPORARY;
     return lk;
 }
 
diff --git a/src/test/TxTests.cpp b/src/test/TxTests.cpp
index 1397523299..cc5da84b1f 100644
--- a/src/test/TxTests.cpp
+++ b/src/test/TxTests.cpp
@@ -1726,7 +1726,7 @@ makeConfigUpgradeSet(AbstractLedgerTxn& ltx, ConfigUpgradeSet configUpgradeSet)
     le.data.contractData().body.bodyType(DATA_ENTRY);
     le.data.contractData().contract.type(SC_ADDRESS_TYPE_CONTRACT);
     le.data.contractData().contract.contractId() = contractID;
-    le.data.contractData().durability = PERSISTENT;
+    le.data.contractData().durability = TEMPORARY;
     le.data.contractData().expirationLedgerSeq = UINT32_MAX;
     le.data.contractData().key = key;
     le.data.contractData().body.data().val = val;