add config setting for host logic version (stellar#80)

SirTyson · Apr 24, 2023 · 0226743 · 0226743
1 parent c9c50a4
commit 0226743
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/Stellar-ledger-entries.x b/Stellar-ledger-entries.x
@@ -492,17 +492,29 @@ struct LiquidityPoolEntry
     body;
 };
 
+enum ContractDataType
+{
+    RECOVERABLE = 0
+};
+
 struct ContractDataEntry {
     Hash contractID;
     SCVal key;
     SCVal val;
+    union switch (ContractDataType t)
+    {
+    case RECOVERABLE:
+        int64 rentBalance;
+    }
+    meta;
 };
 
 struct ContractCodeEntry {
     ExtensionPoint ext;
 
     Hash hash;
     opaque code<SCVAL_LIMIT>;
+    int64 rentBalance;
 };
 
 // Identifiers of all the network settings.
@@ -513,7 +525,8 @@ enum ConfigSettingID
     CONFIG_SETTING_CONTRACT_LEDGER_COST_V0 = 2,
     CONFIG_SETTING_CONTRACT_HISTORICAL_DATA_V0 = 3,
     CONFIG_SETTING_CONTRACT_META_DATA_V0 = 4,
-    CONFIG_SETTING_CONTRACT_BANDWIDTH_V0 = 5
+    CONFIG_SETTING_CONTRACT_BANDWIDTH_V0 = 5,
+    CONFIG_SETTING_CONTRACT_HOST_LOGIC_VERSION = 6
 };
 
 // "Compute" settings for contracts (instructions and memory).
@@ -611,6 +624,8 @@ case CONFIG_SETTING_CONTRACT_META_DATA_V0:
     ConfigSettingContractMetaDataV0 contractMetaData;
 case CONFIG_SETTING_CONTRACT_BANDWIDTH_V0:
     ConfigSettingContractBandwidthV0 contractBandwidth;
+case CONFIG_SETTING_CONTRACT_HOST_LOGIC_VERSION:
+    uint32 contractHostLogicVersion;
 };
 
 struct LedgerEntryExtensionV1

diff --git a/Stellar-ledger.x b/Stellar-ledger.x
@@ -68,6 +68,9 @@ struct LedgerHeaderExtensionV1
     {
     case 0:
         void;
+    case 1:
+        int64 outstandingRentForCurr<>; // Sum of outstanding rent charges for curr Bucket
+        int64 outstandingRentForCurr<>; // Sum of outstanding rent charges for snap Bucket
     }
     ext;
 };
@@ -163,13 +166,20 @@ enum BucketEntryType
     LIVEENTRY = 0, // Before protocol 11: created-or-updated;
                    // At-and-after protocol 11: only updated.
     DEADENTRY = 1,
-    INITENTRY = 2 // At-and-after protocol 11: only created.
+    INITENTRY = 2, // At-and-after protocol 11: only created.
+    RENTENTRY = 3
 };
 
 struct BucketMetadata
 {
     // Indicates the protocol version used to create / merge this bucket.
     uint32 ledgerVersion;
+};
+
+struct RentEntry
+{
+    LedgerKey key;
+    int64 rentBump;
 
     // reserved for future use
     union switch (int v)
@@ -190,6 +200,8 @@ case DEADENTRY:
     LedgerKey deadEntry;
 case METAENTRY:
     BucketMetadata metaEntry;
+case RENTENTRY:
+    RentEntry rentEntry;
 };
 
 enum TxSetComponentType