From 65843deebd5d6044d95f27ab92998be80e9161d8 Mon Sep 17 00:00:00 2001 From: Garand Tyson Date: Thu, 1 Feb 2024 09:58:42 -0800 Subject: [PATCH] Bump XDR (#342) --- src/curr/generated.rs | 14 ++++++++++---- src/next/generated.rs | 14 ++++++++++---- xdr/curr | 2 +- xdr/curr-version | 2 +- xdr/next | 2 +- xdr/next-version | 2 +- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/curr/generated.rs b/src/curr/generated.rs index efb4f860..8bde0fbc 100644 --- a/src/curr/generated.rs +++ b/src/curr/generated.rs @@ -22,7 +22,7 @@ pub const XDR_FILES_SHA256: [(&str, &str); 12] = [ ), ( "xdr/curr/Stellar-contract-config-setting.x", - "e466c4dfae1d5d181afbd990b91f26c5d8ed84a7fa987875f8d643cf97e34a77", + "fc42980e8710514679477f767ecad6f9348c38d24b1e4476fdd7e73e8e672ea8", ), ( "xdr/curr/Stellar-contract-env-meta.x", @@ -4238,8 +4238,11 @@ impl WriteXdr for ContractCostParamEntry { /// // Number of snapshots to use when calculating average BucketList size /// uint32 bucketListSizeWindowSampleSize; /// +/// // How often to sample the BucketList size for the average, in ledgers +/// uint32 bucketListWindowSamplePeriod; +/// /// // Maximum number of bytes that we scan for eviction per ledger -/// uint64 evictionScanSize; +/// uint32 evictionScanSize; /// /// // Lowest BucketList level to be scanned to evict entries /// uint32 startingEvictionScanLevel; @@ -4261,7 +4264,8 @@ pub struct StateArchivalSettings { pub temp_rent_rate_denominator: i64, pub max_entries_to_archive: u32, pub bucket_list_size_window_sample_size: u32, - pub eviction_scan_size: u64, + pub bucket_list_window_sample_period: u32, + pub eviction_scan_size: u32, pub starting_eviction_scan_level: u32, } @@ -4277,7 +4281,8 @@ impl ReadXdr for StateArchivalSettings { temp_rent_rate_denominator: i64::read_xdr(r)?, max_entries_to_archive: u32::read_xdr(r)?, bucket_list_size_window_sample_size: u32::read_xdr(r)?, - eviction_scan_size: u64::read_xdr(r)?, + bucket_list_window_sample_period: u32::read_xdr(r)?, + eviction_scan_size: u32::read_xdr(r)?, starting_eviction_scan_level: u32::read_xdr(r)?, }) }) @@ -4295,6 +4300,7 @@ impl WriteXdr for StateArchivalSettings { self.temp_rent_rate_denominator.write_xdr(w)?; self.max_entries_to_archive.write_xdr(w)?; self.bucket_list_size_window_sample_size.write_xdr(w)?; + self.bucket_list_window_sample_period.write_xdr(w)?; self.eviction_scan_size.write_xdr(w)?; self.starting_eviction_scan_level.write_xdr(w)?; Ok(()) diff --git a/src/next/generated.rs b/src/next/generated.rs index c80c8cdc..205a26e0 100644 --- a/src/next/generated.rs +++ b/src/next/generated.rs @@ -22,7 +22,7 @@ pub const XDR_FILES_SHA256: [(&str, &str); 12] = [ ), ( "xdr/next/Stellar-contract-config-setting.x", - "e466c4dfae1d5d181afbd990b91f26c5d8ed84a7fa987875f8d643cf97e34a77", + "fc42980e8710514679477f767ecad6f9348c38d24b1e4476fdd7e73e8e672ea8", ), ( "xdr/next/Stellar-contract-env-meta.x", @@ -4238,8 +4238,11 @@ impl WriteXdr for ContractCostParamEntry { /// // Number of snapshots to use when calculating average BucketList size /// uint32 bucketListSizeWindowSampleSize; /// +/// // How often to sample the BucketList size for the average, in ledgers +/// uint32 bucketListWindowSamplePeriod; +/// /// // Maximum number of bytes that we scan for eviction per ledger -/// uint64 evictionScanSize; +/// uint32 evictionScanSize; /// /// // Lowest BucketList level to be scanned to evict entries /// uint32 startingEvictionScanLevel; @@ -4261,7 +4264,8 @@ pub struct StateArchivalSettings { pub temp_rent_rate_denominator: i64, pub max_entries_to_archive: u32, pub bucket_list_size_window_sample_size: u32, - pub eviction_scan_size: u64, + pub bucket_list_window_sample_period: u32, + pub eviction_scan_size: u32, pub starting_eviction_scan_level: u32, } @@ -4277,7 +4281,8 @@ impl ReadXdr for StateArchivalSettings { temp_rent_rate_denominator: i64::read_xdr(r)?, max_entries_to_archive: u32::read_xdr(r)?, bucket_list_size_window_sample_size: u32::read_xdr(r)?, - eviction_scan_size: u64::read_xdr(r)?, + bucket_list_window_sample_period: u32::read_xdr(r)?, + eviction_scan_size: u32::read_xdr(r)?, starting_eviction_scan_level: u32::read_xdr(r)?, }) }) @@ -4295,6 +4300,7 @@ impl WriteXdr for StateArchivalSettings { self.temp_rent_rate_denominator.write_xdr(w)?; self.max_entries_to_archive.write_xdr(w)?; self.bucket_list_size_window_sample_size.write_xdr(w)?; + self.bucket_list_window_sample_period.write_xdr(w)?; self.eviction_scan_size.write_xdr(w)?; self.starting_eviction_scan_level.write_xdr(w)?; Ok(()) diff --git a/xdr/curr b/xdr/curr index bb54e505..b96148cd 160000 --- a/xdr/curr +++ b/xdr/curr @@ -1 +1 @@ -Subproject commit bb54e505f814386a3f45172e0b7e95b7badbe969 +Subproject commit b96148cd4acc372cc9af17b909ffe4b12c43ecb6 diff --git a/xdr/curr-version b/xdr/curr-version index 9746cc55..b7c39795 100644 --- a/xdr/curr-version +++ b/xdr/curr-version @@ -1 +1 @@ -bb54e505f814386a3f45172e0b7e95b7badbe969 \ No newline at end of file +b96148cd4acc372cc9af17b909ffe4b12c43ecb6 \ No newline at end of file diff --git a/xdr/next b/xdr/next index b3d9e9f4..6a71b137 160000 --- a/xdr/next +++ b/xdr/next @@ -1 +1 @@ -Subproject commit b3d9e9f43b9a3a4e89652e505ca275573cfab6a1 +Subproject commit 6a71b137bc49f901bed53c8c215c26213017026c diff --git a/xdr/next-version b/xdr/next-version index 1d5aa524..27b6fad0 100644 --- a/xdr/next-version +++ b/xdr/next-version @@ -1 +1 @@ -b3d9e9f43b9a3a4e89652e505ca275573cfab6a1 \ No newline at end of file +6a71b137bc49f901bed53c8c215c26213017026c \ No newline at end of file