From ee529924c43b156935495587916dd399bfac5faa Mon Sep 17 00:00:00 2001 From: Dmytro Kozhevin Date: Thu, 13 Feb 2025 15:41:10 -0500 Subject: [PATCH] Regenerate Rust XDR --- src/curr/generated.rs | 846 +------------------------------ src/next/generated.rs | 1121 ++++++++--------------------------------- xdr/curr | 2 +- xdr/curr-version | 2 +- xdr/next | 2 +- xdr/next-version | 2 +- 6 files changed, 234 insertions(+), 1741 deletions(-) diff --git a/src/curr/generated.rs b/src/curr/generated.rs index 175b2531..f2fa49b5 100644 --- a/src/curr/generated.rs +++ b/src/curr/generated.rs @@ -46,7 +46,7 @@ pub const XDR_FILES_SHA256: [(&str, &str); 12] = [ ), ( "xdr/curr/Stellar-ledger-entries.x", - "03e8be938bace784410b0e837ed6496ff66dc0d1e70fc6e4f0d006566a344879", + "008deaa72ebaae56ba02a740230e5abfe475c5fff52f68eb086deb1fb6f91d1e", ), ( "xdr/curr/Stellar-ledger.x", @@ -54,11 +54,11 @@ pub const XDR_FILES_SHA256: [(&str, &str); 12] = [ ), ( "xdr/curr/Stellar-overlay.x", - "8c73b7c3ad974e7fc4aa4fdf34f7ad50053406254efbd7406c96657cf41691d3", + "25d52fd28c91d2377796c6c1ee05b0731f47648751e2b5a33481d64ef4eb7322", ), ( "xdr/curr/Stellar-transaction.x", - "fdd854ea6ce450500c331a6613d714d9b2f00d2adc86210a8f709e8a9ef4c641", + "2f6b1dbab1cc0e01c5f1f7fca2e0a14e6d7ad56e6f04449a7123080ed40e3dbc", ), ( "xdr/curr/Stellar-types.x", @@ -17693,8 +17693,7 @@ impl WriteXdr for EnvelopeType { /// enum BucketListType /// { /// LIVE = 0, -/// HOT_ARCHIVE = 1, -/// COLD_ARCHIVE = 2 +/// HOT_ARCHIVE = 1 /// }; /// ``` /// @@ -17711,28 +17710,22 @@ impl WriteXdr for EnvelopeType { pub enum BucketListType { Live = 0, HotArchive = 1, - ColdArchive = 2, } impl BucketListType { - pub const VARIANTS: [BucketListType; 3] = [ - BucketListType::Live, - BucketListType::HotArchive, - BucketListType::ColdArchive, - ]; - pub const VARIANTS_STR: [&'static str; 3] = ["Live", "HotArchive", "ColdArchive"]; + pub const VARIANTS: [BucketListType; 2] = [BucketListType::Live, BucketListType::HotArchive]; + pub const VARIANTS_STR: [&'static str; 2] = ["Live", "HotArchive"]; #[must_use] pub const fn name(&self) -> &'static str { match self { Self::Live => "Live", Self::HotArchive => "HotArchive", - Self::ColdArchive => "ColdArchive", } } #[must_use] - pub const fn variants() -> [BucketListType; 3] { + pub const fn variants() -> [BucketListType; 2] { Self::VARIANTS } } @@ -17765,7 +17758,6 @@ impl TryFrom for BucketListType { let e = match i { 0 => BucketListType::Live, 1 => BucketListType::HotArchive, - 2 => BucketListType::ColdArchive, #[allow(unreachable_patterns)] _ => return Err(Error::Invalid), }; @@ -24268,8 +24260,8 @@ impl WriteXdr for PeerAddress { /// ERROR_MSG = 0, /// AUTH = 2, /// DONT_HAVE = 3, +/// // GET_PEERS (4) is deprecated /// -/// GET_PEERS = 4, // gets a list of peers this guy knows about /// PEERS = 5, /// /// GET_TX_SET = 6, // gets a particular txset by hash @@ -24317,7 +24309,6 @@ pub enum MessageType { ErrorMsg = 0, Auth = 2, DontHave = 3, - GetPeers = 4, Peers = 5, GetTxSet = 6, TxSet = 7, @@ -24341,11 +24332,10 @@ pub enum MessageType { } impl MessageType { - pub const VARIANTS: [MessageType; 24] = [ + pub const VARIANTS: [MessageType; 23] = [ MessageType::ErrorMsg, MessageType::Auth, MessageType::DontHave, - MessageType::GetPeers, MessageType::Peers, MessageType::GetTxSet, MessageType::TxSet, @@ -24367,11 +24357,10 @@ impl MessageType { MessageType::TimeSlicedSurveyStartCollecting, MessageType::TimeSlicedSurveyStopCollecting, ]; - pub const VARIANTS_STR: [&'static str; 24] = [ + pub const VARIANTS_STR: [&'static str; 23] = [ "ErrorMsg", "Auth", "DontHave", - "GetPeers", "Peers", "GetTxSet", "TxSet", @@ -24400,7 +24389,6 @@ impl MessageType { Self::ErrorMsg => "ErrorMsg", Self::Auth => "Auth", Self::DontHave => "DontHave", - Self::GetPeers => "GetPeers", Self::Peers => "Peers", Self::GetTxSet => "GetTxSet", Self::TxSet => "TxSet", @@ -24425,7 +24413,7 @@ impl MessageType { } #[must_use] - pub const fn variants() -> [MessageType; 24] { + pub const fn variants() -> [MessageType; 23] { Self::VARIANTS } } @@ -24459,7 +24447,6 @@ impl TryFrom for MessageType { 0 => MessageType::ErrorMsg, 2 => MessageType::Auth, 3 => MessageType::DontHave, - 4 => MessageType::GetPeers, 5 => MessageType::Peers, 6 => MessageType::GetTxSet, 7 => MessageType::TxSet, @@ -26538,8 +26525,6 @@ impl WriteXdr for FloodDemand { /// Auth auth; /// case DONT_HAVE: /// DontHave dontHave; -/// case GET_PEERS: -/// void; /// case PEERS: /// PeerAddress peers<100>; /// @@ -26609,7 +26594,6 @@ pub enum StellarMessage { Hello(Hello), Auth(Auth), DontHave(DontHave), - GetPeers, Peers(VecM), GetTxSet(Uint256), TxSet(TransactionSet), @@ -26632,12 +26616,11 @@ pub enum StellarMessage { } impl StellarMessage { - pub const VARIANTS: [MessageType; 24] = [ + pub const VARIANTS: [MessageType; 23] = [ MessageType::ErrorMsg, MessageType::Hello, MessageType::Auth, MessageType::DontHave, - MessageType::GetPeers, MessageType::Peers, MessageType::GetTxSet, MessageType::TxSet, @@ -26658,12 +26641,11 @@ impl StellarMessage { MessageType::FloodAdvert, MessageType::FloodDemand, ]; - pub const VARIANTS_STR: [&'static str; 24] = [ + pub const VARIANTS_STR: [&'static str; 23] = [ "ErrorMsg", "Hello", "Auth", "DontHave", - "GetPeers", "Peers", "GetTxSet", "TxSet", @@ -26692,7 +26674,6 @@ impl StellarMessage { Self::Hello(_) => "Hello", Self::Auth(_) => "Auth", Self::DontHave(_) => "DontHave", - Self::GetPeers => "GetPeers", Self::Peers(_) => "Peers", Self::GetTxSet(_) => "GetTxSet", Self::TxSet(_) => "TxSet", @@ -26723,7 +26704,6 @@ impl StellarMessage { Self::Hello(_) => MessageType::Hello, Self::Auth(_) => MessageType::Auth, Self::DontHave(_) => MessageType::DontHave, - Self::GetPeers => MessageType::GetPeers, Self::Peers(_) => MessageType::Peers, Self::GetTxSet(_) => MessageType::GetTxSet, Self::TxSet(_) => MessageType::TxSet, @@ -26749,7 +26729,7 @@ impl StellarMessage { } #[must_use] - pub const fn variants() -> [MessageType; 24] { + pub const fn variants() -> [MessageType; 23] { Self::VARIANTS } } @@ -26787,7 +26767,6 @@ impl ReadXdr for StellarMessage { MessageType::Hello => Self::Hello(Hello::read_xdr(r)?), MessageType::Auth => Self::Auth(Auth::read_xdr(r)?), MessageType::DontHave => Self::DontHave(DontHave::read_xdr(r)?), - MessageType::GetPeers => Self::GetPeers, MessageType::Peers => Self::Peers(VecM::::read_xdr(r)?), MessageType::GetTxSet => Self::GetTxSet(Uint256::read_xdr(r)?), MessageType::TxSet => Self::TxSet(TransactionSet::read_xdr(r)?), @@ -26846,7 +26825,6 @@ impl WriteXdr for StellarMessage { Self::Hello(v) => v.write_xdr(w)?, Self::Auth(v) => v.write_xdr(w)?, Self::DontHave(v) => v.write_xdr(w)?, - Self::GetPeers => ().write_xdr(w)?, Self::Peers(v) => v.write_xdr(w)?, Self::GetTxSet(v) => v.write_xdr(w)?, Self::TxSet(v) => v.write_xdr(w)?, @@ -32092,544 +32070,6 @@ impl WriteXdr for LedgerFootprint { } } -/// ArchivalProofType is an XDR Enum defines as: -/// -/// ```text -/// enum ArchivalProofType -/// { -/// EXISTENCE = 0, -/// NONEXISTENCE = 1 -/// }; -/// ``` -/// -// enum -#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -#[repr(i32)] -pub enum ArchivalProofType { - Existence = 0, - Nonexistence = 1, -} - -impl ArchivalProofType { - pub const VARIANTS: [ArchivalProofType; 2] = [ - ArchivalProofType::Existence, - ArchivalProofType::Nonexistence, - ]; - pub const VARIANTS_STR: [&'static str; 2] = ["Existence", "Nonexistence"]; - - #[must_use] - pub const fn name(&self) -> &'static str { - match self { - Self::Existence => "Existence", - Self::Nonexistence => "Nonexistence", - } - } - - #[must_use] - pub const fn variants() -> [ArchivalProofType; 2] { - Self::VARIANTS - } -} - -impl Name for ArchivalProofType { - #[must_use] - fn name(&self) -> &'static str { - Self::name(self) - } -} - -impl Variants for ArchivalProofType { - fn variants() -> slice::Iter<'static, ArchivalProofType> { - Self::VARIANTS.iter() - } -} - -impl Enum for ArchivalProofType {} - -impl fmt::Display for ArchivalProofType { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - f.write_str(self.name()) - } -} - -impl TryFrom for ArchivalProofType { - type Error = Error; - - fn try_from(i: i32) -> Result { - let e = match i { - 0 => ArchivalProofType::Existence, - 1 => ArchivalProofType::Nonexistence, - #[allow(unreachable_patterns)] - _ => return Err(Error::Invalid), - }; - Ok(e) - } -} - -impl From for i32 { - #[must_use] - fn from(e: ArchivalProofType) -> Self { - e as Self - } -} - -impl ReadXdr for ArchivalProofType { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - let e = i32::read_xdr(r)?; - let v: Self = e.try_into()?; - Ok(v) - }) - } -} - -impl WriteXdr for ArchivalProofType { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - let i: i32 = (*self).into(); - i.write_xdr(w) - }) - } -} - -/// ArchivalProofNode is an XDR Struct defines as: -/// -/// ```text -/// struct ArchivalProofNode -/// { -/// uint32 index; -/// Hash hash; -/// }; -/// ``` -/// -#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -pub struct ArchivalProofNode { - pub index: u32, - pub hash: Hash, -} - -impl ReadXdr for ArchivalProofNode { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - Ok(Self { - index: u32::read_xdr(r)?, - hash: Hash::read_xdr(r)?, - }) - }) - } -} - -impl WriteXdr for ArchivalProofNode { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - self.index.write_xdr(w)?; - self.hash.write_xdr(w)?; - Ok(()) - }) - } -} - -/// ProofLevel is an XDR Typedef defines as: -/// -/// ```text -/// typedef ArchivalProofNode ProofLevel<>; -/// ``` -/// -#[derive(Clone, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[derive(Default)] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -#[derive(Debug)] -pub struct ProofLevel(pub VecM); - -impl From for VecM { - #[must_use] - fn from(x: ProofLevel) -> Self { - x.0 - } -} - -impl From> for ProofLevel { - #[must_use] - fn from(x: VecM) -> Self { - ProofLevel(x) - } -} - -impl AsRef> for ProofLevel { - #[must_use] - fn as_ref(&self) -> &VecM { - &self.0 - } -} - -impl ReadXdr for ProofLevel { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - let i = VecM::::read_xdr(r)?; - let v = ProofLevel(i); - Ok(v) - }) - } -} - -impl WriteXdr for ProofLevel { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| self.0.write_xdr(w)) - } -} - -impl Deref for ProofLevel { - type Target = VecM; - fn deref(&self) -> &Self::Target { - &self.0 - } -} - -impl From for Vec { - #[must_use] - fn from(x: ProofLevel) -> Self { - x.0 .0 - } -} - -impl TryFrom> for ProofLevel { - type Error = Error; - fn try_from(x: Vec) -> Result { - Ok(ProofLevel(x.try_into()?)) - } -} - -#[cfg(feature = "alloc")] -impl TryFrom<&Vec> for ProofLevel { - type Error = Error; - fn try_from(x: &Vec) -> Result { - Ok(ProofLevel(x.try_into()?)) - } -} - -impl AsRef> for ProofLevel { - #[must_use] - fn as_ref(&self) -> &Vec { - &self.0 .0 - } -} - -impl AsRef<[ArchivalProofNode]> for ProofLevel { - #[cfg(feature = "alloc")] - #[must_use] - fn as_ref(&self) -> &[ArchivalProofNode] { - &self.0 .0 - } - #[cfg(not(feature = "alloc"))] - #[must_use] - fn as_ref(&self) -> &[ArchivalProofNode] { - self.0 .0 - } -} - -/// NonexistenceProofBody is an XDR Struct defines as: -/// -/// ```text -/// struct NonexistenceProofBody -/// { -/// ColdArchiveBucketEntry entriesToProve<>; -/// -/// // Vector of vectors, where proofLevels[level] -/// // contains all HashNodes that correspond with that level -/// ProofLevel proofLevels<>; -/// }; -/// ``` -/// -#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -pub struct NonexistenceProofBody { - pub entries_to_prove: VecM, - pub proof_levels: VecM, -} - -impl ReadXdr for NonexistenceProofBody { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - Ok(Self { - entries_to_prove: VecM::::read_xdr(r)?, - proof_levels: VecM::::read_xdr(r)?, - }) - }) - } -} - -impl WriteXdr for NonexistenceProofBody { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - self.entries_to_prove.write_xdr(w)?; - self.proof_levels.write_xdr(w)?; - Ok(()) - }) - } -} - -/// ExistenceProofBody is an XDR Struct defines as: -/// -/// ```text -/// struct ExistenceProofBody -/// { -/// LedgerKey keysToProve<>; -/// -/// // Bounds for each key being proved, where bound[n] -/// // corresponds to keysToProve[n] -/// ColdArchiveBucketEntry lowBoundEntries<>; -/// ColdArchiveBucketEntry highBoundEntries<>; -/// -/// // Vector of vectors, where proofLevels[level] -/// // contains all HashNodes that correspond with that level -/// ProofLevel proofLevels<>; -/// }; -/// ``` -/// -#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -pub struct ExistenceProofBody { - pub keys_to_prove: VecM, - pub low_bound_entries: VecM, - pub high_bound_entries: VecM, - pub proof_levels: VecM, -} - -impl ReadXdr for ExistenceProofBody { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - Ok(Self { - keys_to_prove: VecM::::read_xdr(r)?, - low_bound_entries: VecM::::read_xdr(r)?, - high_bound_entries: VecM::::read_xdr(r)?, - proof_levels: VecM::::read_xdr(r)?, - }) - }) - } -} - -impl WriteXdr for ExistenceProofBody { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - self.keys_to_prove.write_xdr(w)?; - self.low_bound_entries.write_xdr(w)?; - self.high_bound_entries.write_xdr(w)?; - self.proof_levels.write_xdr(w)?; - Ok(()) - }) - } -} - -/// ArchivalProofBody is an XDR NestedUnion defines as: -/// -/// ```text -/// union switch (ArchivalProofType t) -/// { -/// case EXISTENCE: -/// NonexistenceProofBody nonexistenceProof; -/// case NONEXISTENCE: -/// ExistenceProofBody existenceProof; -/// } -/// ``` -/// -// union with discriminant ArchivalProofType -#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -#[allow(clippy::large_enum_variant)] -pub enum ArchivalProofBody { - Existence(NonexistenceProofBody), - Nonexistence(ExistenceProofBody), -} - -impl ArchivalProofBody { - pub const VARIANTS: [ArchivalProofType; 2] = [ - ArchivalProofType::Existence, - ArchivalProofType::Nonexistence, - ]; - pub const VARIANTS_STR: [&'static str; 2] = ["Existence", "Nonexistence"]; - - #[must_use] - pub const fn name(&self) -> &'static str { - match self { - Self::Existence(_) => "Existence", - Self::Nonexistence(_) => "Nonexistence", - } - } - - #[must_use] - pub const fn discriminant(&self) -> ArchivalProofType { - #[allow(clippy::match_same_arms)] - match self { - Self::Existence(_) => ArchivalProofType::Existence, - Self::Nonexistence(_) => ArchivalProofType::Nonexistence, - } - } - - #[must_use] - pub const fn variants() -> [ArchivalProofType; 2] { - Self::VARIANTS - } -} - -impl Name for ArchivalProofBody { - #[must_use] - fn name(&self) -> &'static str { - Self::name(self) - } -} - -impl Discriminant for ArchivalProofBody { - #[must_use] - fn discriminant(&self) -> ArchivalProofType { - Self::discriminant(self) - } -} - -impl Variants for ArchivalProofBody { - fn variants() -> slice::Iter<'static, ArchivalProofType> { - Self::VARIANTS.iter() - } -} - -impl Union for ArchivalProofBody {} - -impl ReadXdr for ArchivalProofBody { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - let dv: ArchivalProofType = ::read_xdr(r)?; - #[allow(clippy::match_same_arms, clippy::match_wildcard_for_single_variants)] - let v = match dv { - ArchivalProofType::Existence => { - Self::Existence(NonexistenceProofBody::read_xdr(r)?) - } - ArchivalProofType::Nonexistence => { - Self::Nonexistence(ExistenceProofBody::read_xdr(r)?) - } - #[allow(unreachable_patterns)] - _ => return Err(Error::Invalid), - }; - Ok(v) - }) - } -} - -impl WriteXdr for ArchivalProofBody { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - self.discriminant().write_xdr(w)?; - #[allow(clippy::match_same_arms)] - match self { - Self::Existence(v) => v.write_xdr(w)?, - Self::Nonexistence(v) => v.write_xdr(w)?, - }; - Ok(()) - }) - } -} - -/// ArchivalProof is an XDR Struct defines as: -/// -/// ```text -/// struct ArchivalProof -/// { -/// uint32 epoch; // AST Subtree for this proof -/// -/// union switch (ArchivalProofType t) -/// { -/// case EXISTENCE: -/// NonexistenceProofBody nonexistenceProof; -/// case NONEXISTENCE: -/// ExistenceProofBody existenceProof; -/// } body; -/// }; -/// ``` -/// -#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -pub struct ArchivalProof { - pub epoch: u32, - pub body: ArchivalProofBody, -} - -impl ReadXdr for ArchivalProof { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - Ok(Self { - epoch: u32::read_xdr(r)?, - body: ArchivalProofBody::read_xdr(r)?, - }) - }) - } -} - -impl WriteXdr for ArchivalProof { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - self.epoch.write_xdr(w)?; - self.body.write_xdr(w)?; - Ok(()) - }) - } -} - /// SorobanResources is an XDR Struct defines as: /// /// ```text @@ -46646,13 +46086,6 @@ pub enum TypeVariant { PreconditionType, Preconditions, LedgerFootprint, - ArchivalProofType, - ArchivalProofNode, - ProofLevel, - NonexistenceProofBody, - ExistenceProofBody, - ArchivalProof, - ArchivalProofBody, SorobanResources, SorobanTransactionData, TransactionV0, @@ -46772,7 +46205,7 @@ pub enum TypeVariant { } impl TypeVariant { - pub const VARIANTS: [TypeVariant; 459] = [ + pub const VARIANTS: [TypeVariant; 452] = [ TypeVariant::Value, TypeVariant::ScpBallot, TypeVariant::ScpStatementType, @@ -47109,13 +46542,6 @@ impl TypeVariant { TypeVariant::PreconditionType, TypeVariant::Preconditions, TypeVariant::LedgerFootprint, - TypeVariant::ArchivalProofType, - TypeVariant::ArchivalProofNode, - TypeVariant::ProofLevel, - TypeVariant::NonexistenceProofBody, - TypeVariant::ExistenceProofBody, - TypeVariant::ArchivalProof, - TypeVariant::ArchivalProofBody, TypeVariant::SorobanResources, TypeVariant::SorobanTransactionData, TypeVariant::TransactionV0, @@ -47233,7 +46659,7 @@ impl TypeVariant { TypeVariant::BinaryFuseFilterType, TypeVariant::SerializedBinaryFuseFilter, ]; - pub const VARIANTS_STR: [&'static str; 459] = [ + pub const VARIANTS_STR: [&'static str; 452] = [ "Value", "ScpBallot", "ScpStatementType", @@ -47570,13 +46996,6 @@ impl TypeVariant { "PreconditionType", "Preconditions", "LedgerFootprint", - "ArchivalProofType", - "ArchivalProofNode", - "ProofLevel", - "NonexistenceProofBody", - "ExistenceProofBody", - "ArchivalProof", - "ArchivalProofBody", "SorobanResources", "SorobanTransactionData", "TransactionV0", @@ -48043,13 +47462,6 @@ impl TypeVariant { Self::PreconditionType => "PreconditionType", Self::Preconditions => "Preconditions", Self::LedgerFootprint => "LedgerFootprint", - Self::ArchivalProofType => "ArchivalProofType", - Self::ArchivalProofNode => "ArchivalProofNode", - Self::ProofLevel => "ProofLevel", - Self::NonexistenceProofBody => "NonexistenceProofBody", - Self::ExistenceProofBody => "ExistenceProofBody", - Self::ArchivalProof => "ArchivalProof", - Self::ArchivalProofBody => "ArchivalProofBody", Self::SorobanResources => "SorobanResources", Self::SorobanTransactionData => "SorobanTransactionData", Self::TransactionV0 => "TransactionV0", @@ -48175,7 +47587,7 @@ impl TypeVariant { #[must_use] #[allow(clippy::too_many_lines)] - pub const fn variants() -> [TypeVariant; 459] { + pub const fn variants() -> [TypeVariant; 452] { Self::VARIANTS } @@ -48648,13 +48060,6 @@ impl TypeVariant { Self::PreconditionType => gen.into_root_schema_for::(), Self::Preconditions => gen.into_root_schema_for::(), Self::LedgerFootprint => gen.into_root_schema_for::(), - Self::ArchivalProofType => gen.into_root_schema_for::(), - Self::ArchivalProofNode => gen.into_root_schema_for::(), - Self::ProofLevel => gen.into_root_schema_for::(), - Self::NonexistenceProofBody => gen.into_root_schema_for::(), - Self::ExistenceProofBody => gen.into_root_schema_for::(), - Self::ArchivalProof => gen.into_root_schema_for::(), - Self::ArchivalProofBody => gen.into_root_schema_for::(), Self::SorobanResources => gen.into_root_schema_for::(), Self::SorobanTransactionData => gen.into_root_schema_for::(), Self::TransactionV0 => gen.into_root_schema_for::(), @@ -49227,13 +48632,6 @@ impl core::str::FromStr for TypeVariant { "PreconditionType" => Ok(Self::PreconditionType), "Preconditions" => Ok(Self::Preconditions), "LedgerFootprint" => Ok(Self::LedgerFootprint), - "ArchivalProofType" => Ok(Self::ArchivalProofType), - "ArchivalProofNode" => Ok(Self::ArchivalProofNode), - "ProofLevel" => Ok(Self::ProofLevel), - "NonexistenceProofBody" => Ok(Self::NonexistenceProofBody), - "ExistenceProofBody" => Ok(Self::ExistenceProofBody), - "ArchivalProof" => Ok(Self::ArchivalProof), - "ArchivalProofBody" => Ok(Self::ArchivalProofBody), "SorobanResources" => Ok(Self::SorobanResources), "SorobanTransactionData" => Ok(Self::SorobanTransactionData), "TransactionV0" => Ok(Self::TransactionV0), @@ -49708,13 +49106,6 @@ pub enum Type { PreconditionType(Box), Preconditions(Box), LedgerFootprint(Box), - ArchivalProofType(Box), - ArchivalProofNode(Box), - ProofLevel(Box), - NonexistenceProofBody(Box), - ExistenceProofBody(Box), - ArchivalProof(Box), - ArchivalProofBody(Box), SorobanResources(Box), SorobanTransactionData(Box), TransactionV0(Box), @@ -49834,7 +49225,7 @@ pub enum Type { } impl Type { - pub const VARIANTS: [TypeVariant; 459] = [ + pub const VARIANTS: [TypeVariant; 452] = [ TypeVariant::Value, TypeVariant::ScpBallot, TypeVariant::ScpStatementType, @@ -50171,13 +49562,6 @@ impl Type { TypeVariant::PreconditionType, TypeVariant::Preconditions, TypeVariant::LedgerFootprint, - TypeVariant::ArchivalProofType, - TypeVariant::ArchivalProofNode, - TypeVariant::ProofLevel, - TypeVariant::NonexistenceProofBody, - TypeVariant::ExistenceProofBody, - TypeVariant::ArchivalProof, - TypeVariant::ArchivalProofBody, TypeVariant::SorobanResources, TypeVariant::SorobanTransactionData, TypeVariant::TransactionV0, @@ -50295,7 +49679,7 @@ impl Type { TypeVariant::BinaryFuseFilterType, TypeVariant::SerializedBinaryFuseFilter, ]; - pub const VARIANTS_STR: [&'static str; 459] = [ + pub const VARIANTS_STR: [&'static str; 452] = [ "Value", "ScpBallot", "ScpStatementType", @@ -50632,13 +50016,6 @@ impl Type { "PreconditionType", "Preconditions", "LedgerFootprint", - "ArchivalProofType", - "ArchivalProofNode", - "ProofLevel", - "NonexistenceProofBody", - "ExistenceProofBody", - "ArchivalProof", - "ArchivalProofBody", "SorobanResources", "SorobanTransactionData", "TransactionV0", @@ -52203,37 +51580,6 @@ impl Type { r, )?))) }), - TypeVariant::ArchivalProofType => r.with_limited_depth(|r| { - Ok(Self::ArchivalProofType(Box::new( - ArchivalProofType::read_xdr(r)?, - ))) - }), - TypeVariant::ArchivalProofNode => r.with_limited_depth(|r| { - Ok(Self::ArchivalProofNode(Box::new( - ArchivalProofNode::read_xdr(r)?, - ))) - }), - TypeVariant::ProofLevel => { - r.with_limited_depth(|r| Ok(Self::ProofLevel(Box::new(ProofLevel::read_xdr(r)?)))) - } - TypeVariant::NonexistenceProofBody => r.with_limited_depth(|r| { - Ok(Self::NonexistenceProofBody(Box::new( - NonexistenceProofBody::read_xdr(r)?, - ))) - }), - TypeVariant::ExistenceProofBody => r.with_limited_depth(|r| { - Ok(Self::ExistenceProofBody(Box::new( - ExistenceProofBody::read_xdr(r)?, - ))) - }), - TypeVariant::ArchivalProof => r.with_limited_depth(|r| { - Ok(Self::ArchivalProof(Box::new(ArchivalProof::read_xdr(r)?))) - }), - TypeVariant::ArchivalProofBody => r.with_limited_depth(|r| { - Ok(Self::ArchivalProofBody(Box::new( - ArchivalProofBody::read_xdr(r)?, - ))) - }), TypeVariant::SorobanResources => r.with_limited_depth(|r| { Ok(Self::SorobanResources(Box::new( SorobanResources::read_xdr(r)?, @@ -54227,34 +53573,6 @@ impl Type { ReadXdrIter::<_, LedgerFootprint>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerFootprint(Box::new(t)))), ), - TypeVariant::ArchivalProofType => Box::new( - ReadXdrIter::<_, ArchivalProofType>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofType(Box::new(t)))), - ), - TypeVariant::ArchivalProofNode => Box::new( - ReadXdrIter::<_, ArchivalProofNode>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofNode(Box::new(t)))), - ), - TypeVariant::ProofLevel => Box::new( - ReadXdrIter::<_, ProofLevel>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ProofLevel(Box::new(t)))), - ), - TypeVariant::NonexistenceProofBody => Box::new( - ReadXdrIter::<_, NonexistenceProofBody>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::NonexistenceProofBody(Box::new(t)))), - ), - TypeVariant::ExistenceProofBody => Box::new( - ReadXdrIter::<_, ExistenceProofBody>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ExistenceProofBody(Box::new(t)))), - ), - TypeVariant::ArchivalProof => Box::new( - ReadXdrIter::<_, ArchivalProof>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProof(Box::new(t)))), - ), - TypeVariant::ArchivalProofBody => Box::new( - ReadXdrIter::<_, ArchivalProofBody>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofBody(Box::new(t)))), - ), TypeVariant::SorobanResources => Box::new( ReadXdrIter::<_, SorobanResources>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::SorobanResources(Box::new(t)))), @@ -56427,34 +55745,6 @@ impl Type { ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerFootprint(Box::new(t.0)))), ), - TypeVariant::ArchivalProofType => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofType(Box::new(t.0)))), - ), - TypeVariant::ArchivalProofNode => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofNode(Box::new(t.0)))), - ), - TypeVariant::ProofLevel => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ProofLevel(Box::new(t.0)))), - ), - TypeVariant::NonexistenceProofBody => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::NonexistenceProofBody(Box::new(t.0)))), - ), - TypeVariant::ExistenceProofBody => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ExistenceProofBody(Box::new(t.0)))), - ), - TypeVariant::ArchivalProof => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProof(Box::new(t.0)))), - ), - TypeVariant::ArchivalProofBody => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofBody(Box::new(t.0)))), - ), TypeVariant::SorobanResources => Box::new( ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::SorobanResources(Box::new(t.0)))), @@ -58437,34 +57727,6 @@ impl Type { ReadXdrIter::<_, LedgerFootprint>::new(dec, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerFootprint(Box::new(t)))), ), - TypeVariant::ArchivalProofType => Box::new( - ReadXdrIter::<_, ArchivalProofType>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofType(Box::new(t)))), - ), - TypeVariant::ArchivalProofNode => Box::new( - ReadXdrIter::<_, ArchivalProofNode>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofNode(Box::new(t)))), - ), - TypeVariant::ProofLevel => Box::new( - ReadXdrIter::<_, ProofLevel>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ProofLevel(Box::new(t)))), - ), - TypeVariant::NonexistenceProofBody => Box::new( - ReadXdrIter::<_, NonexistenceProofBody>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::NonexistenceProofBody(Box::new(t)))), - ), - TypeVariant::ExistenceProofBody => Box::new( - ReadXdrIter::<_, ExistenceProofBody>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ExistenceProofBody(Box::new(t)))), - ), - TypeVariant::ArchivalProof => Box::new( - ReadXdrIter::<_, ArchivalProof>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProof(Box::new(t)))), - ), - TypeVariant::ArchivalProofBody => Box::new( - ReadXdrIter::<_, ArchivalProofBody>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofBody(Box::new(t)))), - ), TypeVariant::SorobanResources => Box::new( ReadXdrIter::<_, SorobanResources>::new(dec, r.limits.clone()) .map(|r| r.map(|t| Self::SorobanResources(Box::new(t)))), @@ -59880,25 +59142,6 @@ impl Type { TypeVariant::LedgerFootprint => { Ok(Self::LedgerFootprint(Box::new(serde_json::from_reader(r)?))) } - TypeVariant::ArchivalProofType => Ok(Self::ArchivalProofType(Box::new( - serde_json::from_reader(r)?, - ))), - TypeVariant::ArchivalProofNode => Ok(Self::ArchivalProofNode(Box::new( - serde_json::from_reader(r)?, - ))), - TypeVariant::ProofLevel => Ok(Self::ProofLevel(Box::new(serde_json::from_reader(r)?))), - TypeVariant::NonexistenceProofBody => Ok(Self::NonexistenceProofBody(Box::new( - serde_json::from_reader(r)?, - ))), - TypeVariant::ExistenceProofBody => Ok(Self::ExistenceProofBody(Box::new( - serde_json::from_reader(r)?, - ))), - TypeVariant::ArchivalProof => { - Ok(Self::ArchivalProof(Box::new(serde_json::from_reader(r)?))) - } - TypeVariant::ArchivalProofBody => Ok(Self::ArchivalProofBody(Box::new( - serde_json::from_reader(r)?, - ))), TypeVariant::SorobanResources => Ok(Self::SorobanResources(Box::new( serde_json::from_reader(r)?, ))), @@ -61287,27 +60530,6 @@ impl Type { TypeVariant::LedgerFootprint => Ok(Self::LedgerFootprint(Box::new( serde::de::Deserialize::deserialize(r)?, ))), - TypeVariant::ArchivalProofType => Ok(Self::ArchivalProofType(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::ArchivalProofNode => Ok(Self::ArchivalProofNode(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::ProofLevel => Ok(Self::ProofLevel(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::NonexistenceProofBody => Ok(Self::NonexistenceProofBody(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::ExistenceProofBody => Ok(Self::ExistenceProofBody(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::ArchivalProof => Ok(Self::ArchivalProof(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::ArchivalProofBody => Ok(Self::ArchivalProofBody(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), TypeVariant::SorobanResources => Ok(Self::SorobanResources(Box::new( serde::de::Deserialize::deserialize(r)?, ))), @@ -62033,13 +61255,6 @@ impl Type { Self::PreconditionType(ref v) => v.as_ref(), Self::Preconditions(ref v) => v.as_ref(), Self::LedgerFootprint(ref v) => v.as_ref(), - Self::ArchivalProofType(ref v) => v.as_ref(), - Self::ArchivalProofNode(ref v) => v.as_ref(), - Self::ProofLevel(ref v) => v.as_ref(), - Self::NonexistenceProofBody(ref v) => v.as_ref(), - Self::ExistenceProofBody(ref v) => v.as_ref(), - Self::ArchivalProof(ref v) => v.as_ref(), - Self::ArchivalProofBody(ref v) => v.as_ref(), Self::SorobanResources(ref v) => v.as_ref(), Self::SorobanTransactionData(ref v) => v.as_ref(), Self::TransactionV0(ref v) => v.as_ref(), @@ -62515,13 +61730,6 @@ impl Type { Self::PreconditionType(_) => "PreconditionType", Self::Preconditions(_) => "Preconditions", Self::LedgerFootprint(_) => "LedgerFootprint", - Self::ArchivalProofType(_) => "ArchivalProofType", - Self::ArchivalProofNode(_) => "ArchivalProofNode", - Self::ProofLevel(_) => "ProofLevel", - Self::NonexistenceProofBody(_) => "NonexistenceProofBody", - Self::ExistenceProofBody(_) => "ExistenceProofBody", - Self::ArchivalProof(_) => "ArchivalProof", - Self::ArchivalProofBody(_) => "ArchivalProofBody", Self::SorobanResources(_) => "SorobanResources", Self::SorobanTransactionData(_) => "SorobanTransactionData", Self::TransactionV0(_) => "TransactionV0", @@ -62651,7 +61859,7 @@ impl Type { #[must_use] #[allow(clippy::too_many_lines)] - pub const fn variants() -> [TypeVariant; 459] { + pub const fn variants() -> [TypeVariant; 452] { Self::VARIANTS } @@ -63035,13 +62243,6 @@ impl Type { Self::PreconditionType(_) => TypeVariant::PreconditionType, Self::Preconditions(_) => TypeVariant::Preconditions, Self::LedgerFootprint(_) => TypeVariant::LedgerFootprint, - Self::ArchivalProofType(_) => TypeVariant::ArchivalProofType, - Self::ArchivalProofNode(_) => TypeVariant::ArchivalProofNode, - Self::ProofLevel(_) => TypeVariant::ProofLevel, - Self::NonexistenceProofBody(_) => TypeVariant::NonexistenceProofBody, - Self::ExistenceProofBody(_) => TypeVariant::ExistenceProofBody, - Self::ArchivalProof(_) => TypeVariant::ArchivalProof, - Self::ArchivalProofBody(_) => TypeVariant::ArchivalProofBody, Self::SorobanResources(_) => TypeVariant::SorobanResources, Self::SorobanTransactionData(_) => TypeVariant::SorobanTransactionData, Self::TransactionV0(_) => TypeVariant::TransactionV0, @@ -63542,13 +62743,6 @@ impl WriteXdr for Type { Self::PreconditionType(v) => v.write_xdr(w), Self::Preconditions(v) => v.write_xdr(w), Self::LedgerFootprint(v) => v.write_xdr(w), - Self::ArchivalProofType(v) => v.write_xdr(w), - Self::ArchivalProofNode(v) => v.write_xdr(w), - Self::ProofLevel(v) => v.write_xdr(w), - Self::NonexistenceProofBody(v) => v.write_xdr(w), - Self::ExistenceProofBody(v) => v.write_xdr(w), - Self::ArchivalProof(v) => v.write_xdr(w), - Self::ArchivalProofBody(v) => v.write_xdr(w), Self::SorobanResources(v) => v.write_xdr(w), Self::SorobanTransactionData(v) => v.write_xdr(w), Self::TransactionV0(v) => v.write_xdr(w), diff --git a/src/next/generated.rs b/src/next/generated.rs index e2bd2678..d042a627 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", - "907745b98a8c9d78bf409bb30641ad4f73d32be28da4719fcf6a5fe676ca33ef", + "e6230c4a3ed5ca778b559397fa9e612a66ebd3d31e71bd85347eae9ab5e38780", ), ( "xdr/next/Stellar-contract-env-meta.x", @@ -46,11 +46,11 @@ pub const XDR_FILES_SHA256: [(&str, &str); 12] = [ ), ( "xdr/next/Stellar-ledger-entries.x", - "714ae0167b11855405c999957a715a5fbcc64f6317dee4eaa0f0a363d62df351", + "5de9a795f120556ee5a418f7550a31b391ccf4c91dd6debde45cf3547b0d7d43", ), ( "xdr/next/Stellar-ledger.x", - "020bd2606a355880a1a53480df906a6a93d37d34bef30168aba5f04880b269d5", + "e7d06f732f440f07b92ad7f730e4a7a5ea1f8a5a3ee9d8ba437573d3d5351b08", ), ( "xdr/next/Stellar-overlay.x", @@ -58,7 +58,7 @@ pub const XDR_FILES_SHA256: [(&str, &str); 12] = [ ), ( "xdr/next/Stellar-transaction.x", - "3f2843afa96c2d10f70ac90865e04d50bb47616707305c5d8d479dce9b264bc9", + "138f798965bbade5cbbd5b2e1164d997cf0aad5abbc964d194dfb77cdac26850", ), ( "xdr/next/Stellar-types.x", @@ -3918,6 +3918,49 @@ impl WriteXdr for ConfigSettingContractLedgerCostV0 { } } +/// ConfigSettingContractLedgerCostExtV0 is an XDR Struct defines as: +/// +/// ```text +/// struct ConfigSettingContractLedgerCostExtV0 +/// { +/// // Maximum number of in-memory ledger entry read operations per transaction +/// uint32 txMaxInMemoryReadEntries; +/// }; +/// ``` +/// +#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] +#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] +#[cfg_attr( + all(feature = "serde", feature = "alloc"), + derive(serde::Serialize, serde::Deserialize), + serde(rename_all = "snake_case") +)] +#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] +pub struct ConfigSettingContractLedgerCostExtV0 { + pub tx_max_in_memory_read_entries: u32, +} + +impl ReadXdr for ConfigSettingContractLedgerCostExtV0 { + #[cfg(feature = "std")] + fn read_xdr(r: &mut Limited) -> Result { + r.with_limited_depth(|r| { + Ok(Self { + tx_max_in_memory_read_entries: u32::read_xdr(r)?, + }) + }) + } +} + +impl WriteXdr for ConfigSettingContractLedgerCostExtV0 { + #[cfg(feature = "std")] + fn write_xdr(&self, w: &mut Limited) -> Result<()> { + w.with_limited_depth(|w| { + self.tx_max_in_memory_read_entries.write_xdr(w)?; + Ok(()) + }) + } +} + /// ConfigSettingContractHistoricalDataV0 is an XDR Struct defines as: /// /// ```text @@ -4983,7 +5026,8 @@ impl AsRef<[ContractCostParamEntry]> for ContractCostParams { /// CONFIG_SETTING_CONTRACT_EXECUTION_LANES = 11, /// CONFIG_SETTING_BUCKETLIST_SIZE_WINDOW = 12, /// CONFIG_SETTING_EVICTION_ITERATOR = 13, -/// CONFIG_SETTING_CONTRACT_PARALLEL_COMPUTE_V0 = 14 +/// CONFIG_SETTING_CONTRACT_PARALLEL_COMPUTE_V0 = 14, +/// CONFIG_SETTING_CONTRACT_LEDGER_COST_EXT_V0 = 15 /// }; /// ``` /// @@ -5013,10 +5057,11 @@ pub enum ConfigSettingId { BucketlistSizeWindow = 12, EvictionIterator = 13, ContractParallelComputeV0 = 14, + ContractLedgerCostExtV0 = 15, } impl ConfigSettingId { - pub const VARIANTS: [ConfigSettingId; 15] = [ + pub const VARIANTS: [ConfigSettingId; 16] = [ ConfigSettingId::ContractMaxSizeBytes, ConfigSettingId::ContractComputeV0, ConfigSettingId::ContractLedgerCostV0, @@ -5032,8 +5077,9 @@ impl ConfigSettingId { ConfigSettingId::BucketlistSizeWindow, ConfigSettingId::EvictionIterator, ConfigSettingId::ContractParallelComputeV0, + ConfigSettingId::ContractLedgerCostExtV0, ]; - pub const VARIANTS_STR: [&'static str; 15] = [ + pub const VARIANTS_STR: [&'static str; 16] = [ "ContractMaxSizeBytes", "ContractComputeV0", "ContractLedgerCostV0", @@ -5049,6 +5095,7 @@ impl ConfigSettingId { "BucketlistSizeWindow", "EvictionIterator", "ContractParallelComputeV0", + "ContractLedgerCostExtV0", ]; #[must_use] @@ -5069,11 +5116,12 @@ impl ConfigSettingId { Self::BucketlistSizeWindow => "BucketlistSizeWindow", Self::EvictionIterator => "EvictionIterator", Self::ContractParallelComputeV0 => "ContractParallelComputeV0", + Self::ContractLedgerCostExtV0 => "ContractLedgerCostExtV0", } } #[must_use] - pub const fn variants() -> [ConfigSettingId; 15] { + pub const fn variants() -> [ConfigSettingId; 16] { Self::VARIANTS } } @@ -5119,6 +5167,7 @@ impl TryFrom for ConfigSettingId { 12 => ConfigSettingId::BucketlistSizeWindow, 13 => ConfigSettingId::EvictionIterator, 14 => ConfigSettingId::ContractParallelComputeV0, + 15 => ConfigSettingId::ContractLedgerCostExtV0, #[allow(unreachable_patterns)] _ => return Err(Error::Invalid), }; @@ -5189,6 +5238,8 @@ impl WriteXdr for ConfigSettingId { /// EvictionIterator evictionIterator; /// case CONFIG_SETTING_CONTRACT_PARALLEL_COMPUTE_V0: /// ConfigSettingContractParallelComputeV0 contractParallelCompute; +/// case CONFIG_SETTING_CONTRACT_LEDGER_COST_EXT_V0: +/// ConfigSettingContractLedgerCostExtV0 contractLedgerCostExt; /// }; /// ``` /// @@ -5218,10 +5269,11 @@ pub enum ConfigSettingEntry { BucketlistSizeWindow(VecM), EvictionIterator(EvictionIterator), ContractParallelComputeV0(ConfigSettingContractParallelComputeV0), + ContractLedgerCostExtV0(ConfigSettingContractLedgerCostExtV0), } impl ConfigSettingEntry { - pub const VARIANTS: [ConfigSettingId; 15] = [ + pub const VARIANTS: [ConfigSettingId; 16] = [ ConfigSettingId::ContractMaxSizeBytes, ConfigSettingId::ContractComputeV0, ConfigSettingId::ContractLedgerCostV0, @@ -5237,8 +5289,9 @@ impl ConfigSettingEntry { ConfigSettingId::BucketlistSizeWindow, ConfigSettingId::EvictionIterator, ConfigSettingId::ContractParallelComputeV0, + ConfigSettingId::ContractLedgerCostExtV0, ]; - pub const VARIANTS_STR: [&'static str; 15] = [ + pub const VARIANTS_STR: [&'static str; 16] = [ "ContractMaxSizeBytes", "ContractComputeV0", "ContractLedgerCostV0", @@ -5254,6 +5307,7 @@ impl ConfigSettingEntry { "BucketlistSizeWindow", "EvictionIterator", "ContractParallelComputeV0", + "ContractLedgerCostExtV0", ]; #[must_use] @@ -5274,6 +5328,7 @@ impl ConfigSettingEntry { Self::BucketlistSizeWindow(_) => "BucketlistSizeWindow", Self::EvictionIterator(_) => "EvictionIterator", Self::ContractParallelComputeV0(_) => "ContractParallelComputeV0", + Self::ContractLedgerCostExtV0(_) => "ContractLedgerCostExtV0", } } @@ -5300,11 +5355,12 @@ impl ConfigSettingEntry { Self::BucketlistSizeWindow(_) => ConfigSettingId::BucketlistSizeWindow, Self::EvictionIterator(_) => ConfigSettingId::EvictionIterator, Self::ContractParallelComputeV0(_) => ConfigSettingId::ContractParallelComputeV0, + Self::ContractLedgerCostExtV0(_) => ConfigSettingId::ContractLedgerCostExtV0, } } #[must_use] - pub const fn variants() -> [ConfigSettingId; 15] { + pub const fn variants() -> [ConfigSettingId; 16] { Self::VARIANTS } } @@ -5383,6 +5439,9 @@ impl ReadXdr for ConfigSettingEntry { ConfigSettingId::ContractParallelComputeV0 => Self::ContractParallelComputeV0( ConfigSettingContractParallelComputeV0::read_xdr(r)?, ), + ConfigSettingId::ContractLedgerCostExtV0 => Self::ContractLedgerCostExtV0( + ConfigSettingContractLedgerCostExtV0::read_xdr(r)?, + ), #[allow(unreachable_patterns)] _ => return Err(Error::Invalid), }; @@ -5413,6 +5472,7 @@ impl WriteXdr for ConfigSettingEntry { Self::BucketlistSizeWindow(v) => v.write_xdr(w)?, Self::EvictionIterator(v) => v.write_xdr(w)?, Self::ContractParallelComputeV0(v) => v.write_xdr(w)?, + Self::ContractLedgerCostExtV0(v) => v.write_xdr(w)?, }; Ok(()) }) @@ -17762,8 +17822,7 @@ impl WriteXdr for EnvelopeType { /// enum BucketListType /// { /// LIVE = 0, -/// HOT_ARCHIVE = 1, -/// COLD_ARCHIVE = 2 +/// HOT_ARCHIVE = 1 /// }; /// ``` /// @@ -17780,28 +17839,22 @@ impl WriteXdr for EnvelopeType { pub enum BucketListType { Live = 0, HotArchive = 1, - ColdArchive = 2, } impl BucketListType { - pub const VARIANTS: [BucketListType; 3] = [ - BucketListType::Live, - BucketListType::HotArchive, - BucketListType::ColdArchive, - ]; - pub const VARIANTS_STR: [&'static str; 3] = ["Live", "HotArchive", "ColdArchive"]; + pub const VARIANTS: [BucketListType; 2] = [BucketListType::Live, BucketListType::HotArchive]; + pub const VARIANTS_STR: [&'static str; 2] = ["Live", "HotArchive"]; #[must_use] pub const fn name(&self) -> &'static str { match self { Self::Live => "Live", Self::HotArchive => "HotArchive", - Self::ColdArchive => "ColdArchive", } } #[must_use] - pub const fn variants() -> [BucketListType; 3] { + pub const fn variants() -> [BucketListType; 2] { Self::VARIANTS } } @@ -17834,7 +17887,6 @@ impl TryFrom for BucketListType { let e = match i { 0 => BucketListType::Live, 1 => BucketListType::HotArchive, - 2 => BucketListType::ColdArchive, #[allow(unreachable_patterns)] _ => return Err(Error::Invalid), }; @@ -23495,65 +23547,6 @@ impl WriteXdr for LedgerCloseMetaExtV1 { } } -/// LedgerCloseMetaExtV2 is an XDR Struct defines as: -/// -/// ```text -/// struct LedgerCloseMetaExtV2 -/// { -/// ExtensionPoint ext; -/// int64 sorobanFeeWrite1KB; -/// -/// uint32 currentArchivalEpoch; -/// -/// // The last epoch currently stored by validators -/// // Any entry restored from an epoch older than this will -/// // require a proof. -/// uint32 lastArchivalEpochPersisted; -/// }; -/// ``` -/// -#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -pub struct LedgerCloseMetaExtV2 { - pub ext: ExtensionPoint, - pub soroban_fee_write1_kb: i64, - pub current_archival_epoch: u32, - pub last_archival_epoch_persisted: u32, -} - -impl ReadXdr for LedgerCloseMetaExtV2 { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - Ok(Self { - ext: ExtensionPoint::read_xdr(r)?, - soroban_fee_write1_kb: i64::read_xdr(r)?, - current_archival_epoch: u32::read_xdr(r)?, - last_archival_epoch_persisted: u32::read_xdr(r)?, - }) - }) - } -} - -impl WriteXdr for LedgerCloseMetaExtV2 { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - self.ext.write_xdr(w)?; - self.soroban_fee_write1_kb.write_xdr(w)?; - self.current_archival_epoch.write_xdr(w)?; - self.last_archival_epoch_persisted.write_xdr(w)?; - Ok(()) - }) - } -} - /// LedgerCloseMetaExt is an XDR Union defines as: /// /// ```text @@ -23563,8 +23556,6 @@ impl WriteXdr for LedgerCloseMetaExtV2 { /// void; /// case 1: /// LedgerCloseMetaExtV1 v1; -/// case 2: -/// LedgerCloseMetaExtV2 v2; /// }; /// ``` /// @@ -23581,19 +23572,17 @@ impl WriteXdr for LedgerCloseMetaExtV2 { pub enum LedgerCloseMetaExt { V0, V1(LedgerCloseMetaExtV1), - V2(LedgerCloseMetaExtV2), } impl LedgerCloseMetaExt { - pub const VARIANTS: [i32; 3] = [0, 1, 2]; - pub const VARIANTS_STR: [&'static str; 3] = ["V0", "V1", "V2"]; + pub const VARIANTS: [i32; 2] = [0, 1]; + pub const VARIANTS_STR: [&'static str; 2] = ["V0", "V1"]; #[must_use] pub const fn name(&self) -> &'static str { match self { Self::V0 => "V0", Self::V1(_) => "V1", - Self::V2(_) => "V2", } } @@ -23603,12 +23592,11 @@ impl LedgerCloseMetaExt { match self { Self::V0 => 0, Self::V1(_) => 1, - Self::V2(_) => 2, } } #[must_use] - pub const fn variants() -> [i32; 3] { + pub const fn variants() -> [i32; 2] { Self::VARIANTS } } @@ -23644,7 +23632,6 @@ impl ReadXdr for LedgerCloseMetaExt { let v = match dv { 0 => Self::V0, 1 => Self::V1(LedgerCloseMetaExtV1::read_xdr(r)?), - 2 => Self::V2(LedgerCloseMetaExtV2::read_xdr(r)?), #[allow(unreachable_patterns)] _ => return Err(Error::Invalid), }; @@ -23662,7 +23649,6 @@ impl WriteXdr for LedgerCloseMetaExt { match self { Self::V0 => ().write_xdr(w)?, Self::V1(v) => v.write_xdr(w)?, - Self::V2(v) => v.write_xdr(w)?, }; Ok(()) }) @@ -32553,122 +32539,20 @@ impl WriteXdr for LedgerFootprint { } } -/// ArchivalProofType is an XDR Enum defines as: +/// SorobanResources is an XDR Struct defines as: /// /// ```text -/// enum ArchivalProofType -/// { -/// EXISTENCE = 0, -/// NONEXISTENCE = 1 -/// }; -/// ``` -/// -// enum -#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -#[repr(i32)] -pub enum ArchivalProofType { - Existence = 0, - Nonexistence = 1, -} - -impl ArchivalProofType { - pub const VARIANTS: [ArchivalProofType; 2] = [ - ArchivalProofType::Existence, - ArchivalProofType::Nonexistence, - ]; - pub const VARIANTS_STR: [&'static str; 2] = ["Existence", "Nonexistence"]; - - #[must_use] - pub const fn name(&self) -> &'static str { - match self { - Self::Existence => "Existence", - Self::Nonexistence => "Nonexistence", - } - } - - #[must_use] - pub const fn variants() -> [ArchivalProofType; 2] { - Self::VARIANTS - } -} - -impl Name for ArchivalProofType { - #[must_use] - fn name(&self) -> &'static str { - Self::name(self) - } -} - -impl Variants for ArchivalProofType { - fn variants() -> slice::Iter<'static, ArchivalProofType> { - Self::VARIANTS.iter() - } -} - -impl Enum for ArchivalProofType {} - -impl fmt::Display for ArchivalProofType { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - f.write_str(self.name()) - } -} - -impl TryFrom for ArchivalProofType { - type Error = Error; - - fn try_from(i: i32) -> Result { - let e = match i { - 0 => ArchivalProofType::Existence, - 1 => ArchivalProofType::Nonexistence, - #[allow(unreachable_patterns)] - _ => return Err(Error::Invalid), - }; - Ok(e) - } -} - -impl From for i32 { - #[must_use] - fn from(e: ArchivalProofType) -> Self { - e as Self - } -} - -impl ReadXdr for ArchivalProofType { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - let e = i32::read_xdr(r)?; - let v: Self = e.try_into()?; - Ok(v) - }) - } -} - -impl WriteXdr for ArchivalProofType { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - let i: i32 = (*self).into(); - i.write_xdr(w) - }) - } -} - -/// ArchivalProofNode is an XDR Struct defines as: +/// struct SorobanResources +/// { +/// // The ledger footprint of the transaction. +/// LedgerFootprint footprint; +/// // The maximum number of instructions this transaction can use +/// uint32 instructions; /// -/// ```text -/// struct ArchivalProofNode -/// { -/// uint32 index; -/// Hash hash; +/// // The maximum number of bytes this transaction can read from ledger +/// uint32 readBytes; +/// // The maximum number of bytes this transaction can write to ledger +/// uint32 writeBytes; /// }; /// ``` /// @@ -32680,150 +32564,49 @@ impl WriteXdr for ArchivalProofType { serde(rename_all = "snake_case") )] #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -pub struct ArchivalProofNode { - pub index: u32, - pub hash: Hash, +pub struct SorobanResources { + pub footprint: LedgerFootprint, + pub instructions: u32, + pub read_bytes: u32, + pub write_bytes: u32, } -impl ReadXdr for ArchivalProofNode { +impl ReadXdr for SorobanResources { #[cfg(feature = "std")] fn read_xdr(r: &mut Limited) -> Result { r.with_limited_depth(|r| { Ok(Self { - index: u32::read_xdr(r)?, - hash: Hash::read_xdr(r)?, + footprint: LedgerFootprint::read_xdr(r)?, + instructions: u32::read_xdr(r)?, + read_bytes: u32::read_xdr(r)?, + write_bytes: u32::read_xdr(r)?, }) }) } } -impl WriteXdr for ArchivalProofNode { +impl WriteXdr for SorobanResources { #[cfg(feature = "std")] fn write_xdr(&self, w: &mut Limited) -> Result<()> { w.with_limited_depth(|w| { - self.index.write_xdr(w)?; - self.hash.write_xdr(w)?; + self.footprint.write_xdr(w)?; + self.instructions.write_xdr(w)?; + self.read_bytes.write_xdr(w)?; + self.write_bytes.write_xdr(w)?; Ok(()) }) } } -/// ProofLevel is an XDR Typedef defines as: -/// -/// ```text -/// typedef ArchivalProofNode ProofLevel<>; -/// ``` -/// -#[derive(Clone, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[derive(Default)] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -#[derive(Debug)] -pub struct ProofLevel(pub VecM); - -impl From for VecM { - #[must_use] - fn from(x: ProofLevel) -> Self { - x.0 - } -} - -impl From> for ProofLevel { - #[must_use] - fn from(x: VecM) -> Self { - ProofLevel(x) - } -} - -impl AsRef> for ProofLevel { - #[must_use] - fn as_ref(&self) -> &VecM { - &self.0 - } -} - -impl ReadXdr for ProofLevel { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - let i = VecM::::read_xdr(r)?; - let v = ProofLevel(i); - Ok(v) - }) - } -} - -impl WriteXdr for ProofLevel { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| self.0.write_xdr(w)) - } -} - -impl Deref for ProofLevel { - type Target = VecM; - fn deref(&self) -> &Self::Target { - &self.0 - } -} - -impl From for Vec { - #[must_use] - fn from(x: ProofLevel) -> Self { - x.0 .0 - } -} - -impl TryFrom> for ProofLevel { - type Error = Error; - fn try_from(x: Vec) -> Result { - Ok(ProofLevel(x.try_into()?)) - } -} - -#[cfg(feature = "alloc")] -impl TryFrom<&Vec> for ProofLevel { - type Error = Error; - fn try_from(x: &Vec) -> Result { - Ok(ProofLevel(x.try_into()?)) - } -} - -impl AsRef> for ProofLevel { - #[must_use] - fn as_ref(&self) -> &Vec { - &self.0 .0 - } -} - -impl AsRef<[ArchivalProofNode]> for ProofLevel { - #[cfg(feature = "alloc")] - #[must_use] - fn as_ref(&self) -> &[ArchivalProofNode] { - &self.0 .0 - } - #[cfg(not(feature = "alloc"))] - #[must_use] - fn as_ref(&self) -> &[ArchivalProofNode] { - self.0 .0 - } -} - -/// ExistenceProofBody is an XDR Struct defines as: +/// SorobanResourcesExtV0 is an XDR Struct defines as: /// /// ```text -/// struct ExistenceProofBody +/// struct SorobanResourcesExtV0 /// { -/// ColdArchiveBucketEntry entriesToProve<>; -/// -/// // Vector of vectors, where proofLevels[level] -/// // contains all HashNodes that correspond with that level -/// ProofLevel proofLevels<>; +/// // Vector of indices representing what Soroban +/// // entries in the footprint are archived, based on the +/// // order of keys provided in the readWrite footprint. +/// uint32 archivedSorobanEntries<>; /// }; /// ``` /// @@ -32835,314 +32618,26 @@ impl AsRef<[ArchivalProofNode]> for ProofLevel { serde(rename_all = "snake_case") )] #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -pub struct ExistenceProofBody { - pub entries_to_prove: VecM, - pub proof_levels: VecM, +pub struct SorobanResourcesExtV0 { + pub archived_soroban_entries: VecM, } -impl ReadXdr for ExistenceProofBody { +impl ReadXdr for SorobanResourcesExtV0 { #[cfg(feature = "std")] fn read_xdr(r: &mut Limited) -> Result { r.with_limited_depth(|r| { Ok(Self { - entries_to_prove: VecM::::read_xdr(r)?, - proof_levels: VecM::::read_xdr(r)?, + archived_soroban_entries: VecM::::read_xdr(r)?, }) }) } } -impl WriteXdr for ExistenceProofBody { +impl WriteXdr for SorobanResourcesExtV0 { #[cfg(feature = "std")] fn write_xdr(&self, w: &mut Limited) -> Result<()> { w.with_limited_depth(|w| { - self.entries_to_prove.write_xdr(w)?; - self.proof_levels.write_xdr(w)?; - Ok(()) - }) - } -} - -/// NonexistenceProofBody is an XDR Struct defines as: -/// -/// ```text -/// struct NonexistenceProofBody -/// { -/// LedgerKey keysToProve<>; -/// -/// // Bounds for each key being proved, where bound[n] -/// // corresponds to keysToProve[n] -/// ColdArchiveBucketEntry lowBoundEntries<>; -/// ColdArchiveBucketEntry highBoundEntries<>; -/// -/// // Vector of vectors, where proofLevels[level] -/// // contains all HashNodes that correspond with that level -/// ProofLevel proofLevels<>; -/// }; -/// ``` -/// -#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -pub struct NonexistenceProofBody { - pub keys_to_prove: VecM, - pub low_bound_entries: VecM, - pub high_bound_entries: VecM, - pub proof_levels: VecM, -} - -impl ReadXdr for NonexistenceProofBody { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - Ok(Self { - keys_to_prove: VecM::::read_xdr(r)?, - low_bound_entries: VecM::::read_xdr(r)?, - high_bound_entries: VecM::::read_xdr(r)?, - proof_levels: VecM::::read_xdr(r)?, - }) - }) - } -} - -impl WriteXdr for NonexistenceProofBody { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - self.keys_to_prove.write_xdr(w)?; - self.low_bound_entries.write_xdr(w)?; - self.high_bound_entries.write_xdr(w)?; - self.proof_levels.write_xdr(w)?; - Ok(()) - }) - } -} - -/// ArchivalProofBody is an XDR NestedUnion defines as: -/// -/// ```text -/// union switch (ArchivalProofType t) -/// { -/// case NONEXISTENCE: -/// NonexistenceProofBody nonexistenceProof; -/// case EXISTENCE: -/// ExistenceProofBody existenceProof; -/// } -/// ``` -/// -// union with discriminant ArchivalProofType -#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -#[allow(clippy::large_enum_variant)] -pub enum ArchivalProofBody { - Nonexistence(NonexistenceProofBody), - Existence(ExistenceProofBody), -} - -impl ArchivalProofBody { - pub const VARIANTS: [ArchivalProofType; 2] = [ - ArchivalProofType::Nonexistence, - ArchivalProofType::Existence, - ]; - pub const VARIANTS_STR: [&'static str; 2] = ["Nonexistence", "Existence"]; - - #[must_use] - pub const fn name(&self) -> &'static str { - match self { - Self::Nonexistence(_) => "Nonexistence", - Self::Existence(_) => "Existence", - } - } - - #[must_use] - pub const fn discriminant(&self) -> ArchivalProofType { - #[allow(clippy::match_same_arms)] - match self { - Self::Nonexistence(_) => ArchivalProofType::Nonexistence, - Self::Existence(_) => ArchivalProofType::Existence, - } - } - - #[must_use] - pub const fn variants() -> [ArchivalProofType; 2] { - Self::VARIANTS - } -} - -impl Name for ArchivalProofBody { - #[must_use] - fn name(&self) -> &'static str { - Self::name(self) - } -} - -impl Discriminant for ArchivalProofBody { - #[must_use] - fn discriminant(&self) -> ArchivalProofType { - Self::discriminant(self) - } -} - -impl Variants for ArchivalProofBody { - fn variants() -> slice::Iter<'static, ArchivalProofType> { - Self::VARIANTS.iter() - } -} - -impl Union for ArchivalProofBody {} - -impl ReadXdr for ArchivalProofBody { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - let dv: ArchivalProofType = ::read_xdr(r)?; - #[allow(clippy::match_same_arms, clippy::match_wildcard_for_single_variants)] - let v = match dv { - ArchivalProofType::Nonexistence => { - Self::Nonexistence(NonexistenceProofBody::read_xdr(r)?) - } - ArchivalProofType::Existence => Self::Existence(ExistenceProofBody::read_xdr(r)?), - #[allow(unreachable_patterns)] - _ => return Err(Error::Invalid), - }; - Ok(v) - }) - } -} - -impl WriteXdr for ArchivalProofBody { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - self.discriminant().write_xdr(w)?; - #[allow(clippy::match_same_arms)] - match self { - Self::Nonexistence(v) => v.write_xdr(w)?, - Self::Existence(v) => v.write_xdr(w)?, - }; - Ok(()) - }) - } -} - -/// ArchivalProof is an XDR Struct defines as: -/// -/// ```text -/// struct ArchivalProof -/// { -/// uint32 epoch; // AST Subtree for this proof -/// -/// union switch (ArchivalProofType t) -/// { -/// case NONEXISTENCE: -/// NonexistenceProofBody nonexistenceProof; -/// case EXISTENCE: -/// ExistenceProofBody existenceProof; -/// } body; -/// }; -/// ``` -/// -#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -pub struct ArchivalProof { - pub epoch: u32, - pub body: ArchivalProofBody, -} - -impl ReadXdr for ArchivalProof { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - Ok(Self { - epoch: u32::read_xdr(r)?, - body: ArchivalProofBody::read_xdr(r)?, - }) - }) - } -} - -impl WriteXdr for ArchivalProof { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - self.epoch.write_xdr(w)?; - self.body.write_xdr(w)?; - Ok(()) - }) - } -} - -/// SorobanResources is an XDR Struct defines as: -/// -/// ```text -/// struct SorobanResources -/// { -/// // The ledger footprint of the transaction. -/// LedgerFootprint footprint; -/// // The maximum number of instructions this transaction can use -/// uint32 instructions; -/// -/// // The maximum number of bytes this transaction can read from ledger -/// uint32 readBytes; -/// // The maximum number of bytes this transaction can write to ledger -/// uint32 writeBytes; -/// }; -/// ``` -/// -#[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] -#[cfg_attr(feature = "arbitrary", derive(Arbitrary))] -#[cfg_attr( - all(feature = "serde", feature = "alloc"), - derive(serde::Serialize, serde::Deserialize), - serde(rename_all = "snake_case") -)] -#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] -pub struct SorobanResources { - pub footprint: LedgerFootprint, - pub instructions: u32, - pub read_bytes: u32, - pub write_bytes: u32, -} - -impl ReadXdr for SorobanResources { - #[cfg(feature = "std")] - fn read_xdr(r: &mut Limited) -> Result { - r.with_limited_depth(|r| { - Ok(Self { - footprint: LedgerFootprint::read_xdr(r)?, - instructions: u32::read_xdr(r)?, - read_bytes: u32::read_xdr(r)?, - write_bytes: u32::read_xdr(r)?, - }) - }) - } -} - -impl WriteXdr for SorobanResources { - #[cfg(feature = "std")] - fn write_xdr(&self, w: &mut Limited) -> Result<()> { - w.with_limited_depth(|w| { - self.footprint.write_xdr(w)?; - self.instructions.write_xdr(w)?; - self.read_bytes.write_xdr(w)?; - self.write_bytes.write_xdr(w)?; + self.archived_soroban_entries.write_xdr(w)?; Ok(()) }) } @@ -33156,7 +32651,7 @@ impl WriteXdr for SorobanResources { /// case 0: /// void; /// case 1: -/// ArchivalProof proofs<>; +/// SorobanResourcesExtV0 resourceExt; /// } /// ``` /// @@ -33172,7 +32667,7 @@ impl WriteXdr for SorobanResources { #[allow(clippy::large_enum_variant)] pub enum SorobanTransactionDataExt { V0, - V1(VecM), + V1(SorobanResourcesExtV0), } impl SorobanTransactionDataExt { @@ -33232,7 +32727,7 @@ impl ReadXdr for SorobanTransactionDataExt { #[allow(clippy::match_same_arms, clippy::match_wildcard_for_single_variants)] let v = match dv { 0 => Self::V0, - 1 => Self::V1(VecM::::read_xdr(r)?), + 1 => Self::V1(SorobanResourcesExtV0::read_xdr(r)?), #[allow(unreachable_patterns)] _ => return Err(Error::Invalid), }; @@ -33266,7 +32761,7 @@ impl WriteXdr for SorobanTransactionDataExt { /// case 0: /// void; /// case 1: -/// ArchivalProof proofs<>; +/// SorobanResourcesExtV0 resourceExt; /// } ext; /// SorobanResources resources; /// // Amount of the transaction `fee` allocated to the Soroban resource fees. @@ -46910,6 +46405,7 @@ pub enum TypeVariant { ConfigSettingContractComputeV0, ConfigSettingContractParallelComputeV0, ConfigSettingContractLedgerCostV0, + ConfigSettingContractLedgerCostExtV0, ConfigSettingContractHistoricalDataV0, ConfigSettingContractEventsV0, ConfigSettingContractBandwidthV0, @@ -47126,7 +46622,6 @@ pub enum TypeVariant { UpgradeEntryMeta, LedgerCloseMetaV0, LedgerCloseMetaExtV1, - LedgerCloseMetaExtV2, LedgerCloseMetaExt, LedgerCloseMetaV1, LedgerCloseMeta, @@ -47237,14 +46732,8 @@ pub enum TypeVariant { PreconditionType, Preconditions, LedgerFootprint, - ArchivalProofType, - ArchivalProofNode, - ProofLevel, - ExistenceProofBody, - NonexistenceProofBody, - ArchivalProof, - ArchivalProofBody, SorobanResources, + SorobanResourcesExtV0, SorobanTransactionData, SorobanTransactionDataExt, TransactionV0, @@ -47364,7 +46853,7 @@ pub enum TypeVariant { } impl TypeVariant { - pub const VARIANTS: [TypeVariant; 466] = [ + pub const VARIANTS: [TypeVariant; 460] = [ TypeVariant::Value, TypeVariant::ScpBallot, TypeVariant::ScpStatementType, @@ -47380,6 +46869,7 @@ impl TypeVariant { TypeVariant::ConfigSettingContractComputeV0, TypeVariant::ConfigSettingContractParallelComputeV0, TypeVariant::ConfigSettingContractLedgerCostV0, + TypeVariant::ConfigSettingContractLedgerCostExtV0, TypeVariant::ConfigSettingContractHistoricalDataV0, TypeVariant::ConfigSettingContractEventsV0, TypeVariant::ConfigSettingContractBandwidthV0, @@ -47596,7 +47086,6 @@ impl TypeVariant { TypeVariant::UpgradeEntryMeta, TypeVariant::LedgerCloseMetaV0, TypeVariant::LedgerCloseMetaExtV1, - TypeVariant::LedgerCloseMetaExtV2, TypeVariant::LedgerCloseMetaExt, TypeVariant::LedgerCloseMetaV1, TypeVariant::LedgerCloseMeta, @@ -47707,14 +47196,8 @@ impl TypeVariant { TypeVariant::PreconditionType, TypeVariant::Preconditions, TypeVariant::LedgerFootprint, - TypeVariant::ArchivalProofType, - TypeVariant::ArchivalProofNode, - TypeVariant::ProofLevel, - TypeVariant::ExistenceProofBody, - TypeVariant::NonexistenceProofBody, - TypeVariant::ArchivalProof, - TypeVariant::ArchivalProofBody, TypeVariant::SorobanResources, + TypeVariant::SorobanResourcesExtV0, TypeVariant::SorobanTransactionData, TypeVariant::SorobanTransactionDataExt, TypeVariant::TransactionV0, @@ -47832,7 +47315,7 @@ impl TypeVariant { TypeVariant::BinaryFuseFilterType, TypeVariant::SerializedBinaryFuseFilter, ]; - pub const VARIANTS_STR: [&'static str; 466] = [ + pub const VARIANTS_STR: [&'static str; 460] = [ "Value", "ScpBallot", "ScpStatementType", @@ -47848,6 +47331,7 @@ impl TypeVariant { "ConfigSettingContractComputeV0", "ConfigSettingContractParallelComputeV0", "ConfigSettingContractLedgerCostV0", + "ConfigSettingContractLedgerCostExtV0", "ConfigSettingContractHistoricalDataV0", "ConfigSettingContractEventsV0", "ConfigSettingContractBandwidthV0", @@ -48064,7 +47548,6 @@ impl TypeVariant { "UpgradeEntryMeta", "LedgerCloseMetaV0", "LedgerCloseMetaExtV1", - "LedgerCloseMetaExtV2", "LedgerCloseMetaExt", "LedgerCloseMetaV1", "LedgerCloseMeta", @@ -48175,14 +47658,8 @@ impl TypeVariant { "PreconditionType", "Preconditions", "LedgerFootprint", - "ArchivalProofType", - "ArchivalProofNode", - "ProofLevel", - "ExistenceProofBody", - "NonexistenceProofBody", - "ArchivalProof", - "ArchivalProofBody", "SorobanResources", + "SorobanResourcesExtV0", "SorobanTransactionData", "SorobanTransactionDataExt", "TransactionV0", @@ -48322,6 +47799,7 @@ impl TypeVariant { "ConfigSettingContractParallelComputeV0" } Self::ConfigSettingContractLedgerCostV0 => "ConfigSettingContractLedgerCostV0", + Self::ConfigSettingContractLedgerCostExtV0 => "ConfigSettingContractLedgerCostExtV0", Self::ConfigSettingContractHistoricalDataV0 => "ConfigSettingContractHistoricalDataV0", Self::ConfigSettingContractEventsV0 => "ConfigSettingContractEventsV0", Self::ConfigSettingContractBandwidthV0 => "ConfigSettingContractBandwidthV0", @@ -48540,7 +48018,6 @@ impl TypeVariant { Self::UpgradeEntryMeta => "UpgradeEntryMeta", Self::LedgerCloseMetaV0 => "LedgerCloseMetaV0", Self::LedgerCloseMetaExtV1 => "LedgerCloseMetaExtV1", - Self::LedgerCloseMetaExtV2 => "LedgerCloseMetaExtV2", Self::LedgerCloseMetaExt => "LedgerCloseMetaExt", Self::LedgerCloseMetaV1 => "LedgerCloseMetaV1", Self::LedgerCloseMeta => "LedgerCloseMeta", @@ -48657,14 +48134,8 @@ impl TypeVariant { Self::PreconditionType => "PreconditionType", Self::Preconditions => "Preconditions", Self::LedgerFootprint => "LedgerFootprint", - Self::ArchivalProofType => "ArchivalProofType", - Self::ArchivalProofNode => "ArchivalProofNode", - Self::ProofLevel => "ProofLevel", - Self::ExistenceProofBody => "ExistenceProofBody", - Self::NonexistenceProofBody => "NonexistenceProofBody", - Self::ArchivalProof => "ArchivalProof", - Self::ArchivalProofBody => "ArchivalProofBody", Self::SorobanResources => "SorobanResources", + Self::SorobanResourcesExtV0 => "SorobanResourcesExtV0", Self::SorobanTransactionData => "SorobanTransactionData", Self::SorobanTransactionDataExt => "SorobanTransactionDataExt", Self::TransactionV0 => "TransactionV0", @@ -48790,7 +48261,7 @@ impl TypeVariant { #[must_use] #[allow(clippy::too_many_lines)] - pub const fn variants() -> [TypeVariant; 466] { + pub const fn variants() -> [TypeVariant; 460] { Self::VARIANTS } @@ -48822,6 +48293,9 @@ impl TypeVariant { Self::ConfigSettingContractLedgerCostV0 => { gen.into_root_schema_for::() } + Self::ConfigSettingContractLedgerCostExtV0 => { + gen.into_root_schema_for::() + } Self::ConfigSettingContractHistoricalDataV0 => { gen.into_root_schema_for::() } @@ -49108,7 +48582,6 @@ impl TypeVariant { Self::UpgradeEntryMeta => gen.into_root_schema_for::(), Self::LedgerCloseMetaV0 => gen.into_root_schema_for::(), Self::LedgerCloseMetaExtV1 => gen.into_root_schema_for::(), - Self::LedgerCloseMetaExtV2 => gen.into_root_schema_for::(), Self::LedgerCloseMetaExt => gen.into_root_schema_for::(), Self::LedgerCloseMetaV1 => gen.into_root_schema_for::(), Self::LedgerCloseMeta => gen.into_root_schema_for::(), @@ -49277,14 +48750,8 @@ impl TypeVariant { Self::PreconditionType => gen.into_root_schema_for::(), Self::Preconditions => gen.into_root_schema_for::(), Self::LedgerFootprint => gen.into_root_schema_for::(), - Self::ArchivalProofType => gen.into_root_schema_for::(), - Self::ArchivalProofNode => gen.into_root_schema_for::(), - Self::ProofLevel => gen.into_root_schema_for::(), - Self::ExistenceProofBody => gen.into_root_schema_for::(), - Self::NonexistenceProofBody => gen.into_root_schema_for::(), - Self::ArchivalProof => gen.into_root_schema_for::(), - Self::ArchivalProofBody => gen.into_root_schema_for::(), Self::SorobanResources => gen.into_root_schema_for::(), + Self::SorobanResourcesExtV0 => gen.into_root_schema_for::(), Self::SorobanTransactionData => gen.into_root_schema_for::(), Self::SorobanTransactionDataExt => { gen.into_root_schema_for::() @@ -49524,6 +48991,9 @@ impl core::str::FromStr for TypeVariant { Ok(Self::ConfigSettingContractParallelComputeV0) } "ConfigSettingContractLedgerCostV0" => Ok(Self::ConfigSettingContractLedgerCostV0), + "ConfigSettingContractLedgerCostExtV0" => { + Ok(Self::ConfigSettingContractLedgerCostExtV0) + } "ConfigSettingContractHistoricalDataV0" => { Ok(Self::ConfigSettingContractHistoricalDataV0) } @@ -49744,7 +49214,6 @@ impl core::str::FromStr for TypeVariant { "UpgradeEntryMeta" => Ok(Self::UpgradeEntryMeta), "LedgerCloseMetaV0" => Ok(Self::LedgerCloseMetaV0), "LedgerCloseMetaExtV1" => Ok(Self::LedgerCloseMetaExtV1), - "LedgerCloseMetaExtV2" => Ok(Self::LedgerCloseMetaExtV2), "LedgerCloseMetaExt" => Ok(Self::LedgerCloseMetaExt), "LedgerCloseMetaV1" => Ok(Self::LedgerCloseMetaV1), "LedgerCloseMeta" => Ok(Self::LedgerCloseMeta), @@ -49869,14 +49338,8 @@ impl core::str::FromStr for TypeVariant { "PreconditionType" => Ok(Self::PreconditionType), "Preconditions" => Ok(Self::Preconditions), "LedgerFootprint" => Ok(Self::LedgerFootprint), - "ArchivalProofType" => Ok(Self::ArchivalProofType), - "ArchivalProofNode" => Ok(Self::ArchivalProofNode), - "ProofLevel" => Ok(Self::ProofLevel), - "ExistenceProofBody" => Ok(Self::ExistenceProofBody), - "NonexistenceProofBody" => Ok(Self::NonexistenceProofBody), - "ArchivalProof" => Ok(Self::ArchivalProof), - "ArchivalProofBody" => Ok(Self::ArchivalProofBody), "SorobanResources" => Ok(Self::SorobanResources), + "SorobanResourcesExtV0" => Ok(Self::SorobanResourcesExtV0), "SorobanTransactionData" => Ok(Self::SorobanTransactionData), "SorobanTransactionDataExt" => Ok(Self::SorobanTransactionDataExt), "TransactionV0" => Ok(Self::TransactionV0), @@ -50030,6 +49493,7 @@ pub enum Type { ConfigSettingContractComputeV0(Box), ConfigSettingContractParallelComputeV0(Box), ConfigSettingContractLedgerCostV0(Box), + ConfigSettingContractLedgerCostExtV0(Box), ConfigSettingContractHistoricalDataV0(Box), ConfigSettingContractEventsV0(Box), ConfigSettingContractBandwidthV0(Box), @@ -50246,7 +49710,6 @@ pub enum Type { UpgradeEntryMeta(Box), LedgerCloseMetaV0(Box), LedgerCloseMetaExtV1(Box), - LedgerCloseMetaExtV2(Box), LedgerCloseMetaExt(Box), LedgerCloseMetaV1(Box), LedgerCloseMeta(Box), @@ -50357,14 +49820,8 @@ pub enum Type { PreconditionType(Box), Preconditions(Box), LedgerFootprint(Box), - ArchivalProofType(Box), - ArchivalProofNode(Box), - ProofLevel(Box), - ExistenceProofBody(Box), - NonexistenceProofBody(Box), - ArchivalProof(Box), - ArchivalProofBody(Box), SorobanResources(Box), + SorobanResourcesExtV0(Box), SorobanTransactionData(Box), SorobanTransactionDataExt(Box), TransactionV0(Box), @@ -50484,7 +49941,7 @@ pub enum Type { } impl Type { - pub const VARIANTS: [TypeVariant; 466] = [ + pub const VARIANTS: [TypeVariant; 460] = [ TypeVariant::Value, TypeVariant::ScpBallot, TypeVariant::ScpStatementType, @@ -50500,6 +49957,7 @@ impl Type { TypeVariant::ConfigSettingContractComputeV0, TypeVariant::ConfigSettingContractParallelComputeV0, TypeVariant::ConfigSettingContractLedgerCostV0, + TypeVariant::ConfigSettingContractLedgerCostExtV0, TypeVariant::ConfigSettingContractHistoricalDataV0, TypeVariant::ConfigSettingContractEventsV0, TypeVariant::ConfigSettingContractBandwidthV0, @@ -50716,7 +50174,6 @@ impl Type { TypeVariant::UpgradeEntryMeta, TypeVariant::LedgerCloseMetaV0, TypeVariant::LedgerCloseMetaExtV1, - TypeVariant::LedgerCloseMetaExtV2, TypeVariant::LedgerCloseMetaExt, TypeVariant::LedgerCloseMetaV1, TypeVariant::LedgerCloseMeta, @@ -50827,14 +50284,8 @@ impl Type { TypeVariant::PreconditionType, TypeVariant::Preconditions, TypeVariant::LedgerFootprint, - TypeVariant::ArchivalProofType, - TypeVariant::ArchivalProofNode, - TypeVariant::ProofLevel, - TypeVariant::ExistenceProofBody, - TypeVariant::NonexistenceProofBody, - TypeVariant::ArchivalProof, - TypeVariant::ArchivalProofBody, TypeVariant::SorobanResources, + TypeVariant::SorobanResourcesExtV0, TypeVariant::SorobanTransactionData, TypeVariant::SorobanTransactionDataExt, TypeVariant::TransactionV0, @@ -50952,7 +50403,7 @@ impl Type { TypeVariant::BinaryFuseFilterType, TypeVariant::SerializedBinaryFuseFilter, ]; - pub const VARIANTS_STR: [&'static str; 466] = [ + pub const VARIANTS_STR: [&'static str; 460] = [ "Value", "ScpBallot", "ScpStatementType", @@ -50968,6 +50419,7 @@ impl Type { "ConfigSettingContractComputeV0", "ConfigSettingContractParallelComputeV0", "ConfigSettingContractLedgerCostV0", + "ConfigSettingContractLedgerCostExtV0", "ConfigSettingContractHistoricalDataV0", "ConfigSettingContractEventsV0", "ConfigSettingContractBandwidthV0", @@ -51184,7 +50636,6 @@ impl Type { "UpgradeEntryMeta", "LedgerCloseMetaV0", "LedgerCloseMetaExtV1", - "LedgerCloseMetaExtV2", "LedgerCloseMetaExt", "LedgerCloseMetaV1", "LedgerCloseMeta", @@ -51295,14 +50746,8 @@ impl Type { "PreconditionType", "Preconditions", "LedgerFootprint", - "ArchivalProofType", - "ArchivalProofNode", - "ProofLevel", - "ExistenceProofBody", - "NonexistenceProofBody", - "ArchivalProof", - "ArchivalProofBody", "SorobanResources", + "SorobanResourcesExtV0", "SorobanTransactionData", "SorobanTransactionDataExt", "TransactionV0", @@ -51488,6 +50933,11 @@ impl Type { ConfigSettingContractLedgerCostV0::read_xdr(r)?, ))) }), + TypeVariant::ConfigSettingContractLedgerCostExtV0 => r.with_limited_depth(|r| { + Ok(Self::ConfigSettingContractLedgerCostExtV0(Box::new( + ConfigSettingContractLedgerCostExtV0::read_xdr(r)?, + ))) + }), TypeVariant::ConfigSettingContractHistoricalDataV0 => r.with_limited_depth(|r| { Ok(Self::ConfigSettingContractHistoricalDataV0(Box::new( ConfigSettingContractHistoricalDataV0::read_xdr(r)?, @@ -52414,11 +51864,6 @@ impl Type { LedgerCloseMetaExtV1::read_xdr(r)?, ))) }), - TypeVariant::LedgerCloseMetaExtV2 => r.with_limited_depth(|r| { - Ok(Self::LedgerCloseMetaExtV2(Box::new( - LedgerCloseMetaExtV2::read_xdr(r)?, - ))) - }), TypeVariant::LedgerCloseMetaExt => r.with_limited_depth(|r| { Ok(Self::LedgerCloseMetaExt(Box::new( LedgerCloseMetaExt::read_xdr(r)?, @@ -52897,42 +52342,16 @@ impl Type { r, )?))) }), - TypeVariant::ArchivalProofType => r.with_limited_depth(|r| { - Ok(Self::ArchivalProofType(Box::new( - ArchivalProofType::read_xdr(r)?, - ))) - }), - TypeVariant::ArchivalProofNode => r.with_limited_depth(|r| { - Ok(Self::ArchivalProofNode(Box::new( - ArchivalProofNode::read_xdr(r)?, - ))) - }), - TypeVariant::ProofLevel => { - r.with_limited_depth(|r| Ok(Self::ProofLevel(Box::new(ProofLevel::read_xdr(r)?)))) - } - TypeVariant::ExistenceProofBody => r.with_limited_depth(|r| { - Ok(Self::ExistenceProofBody(Box::new( - ExistenceProofBody::read_xdr(r)?, - ))) - }), - TypeVariant::NonexistenceProofBody => r.with_limited_depth(|r| { - Ok(Self::NonexistenceProofBody(Box::new( - NonexistenceProofBody::read_xdr(r)?, - ))) - }), - TypeVariant::ArchivalProof => r.with_limited_depth(|r| { - Ok(Self::ArchivalProof(Box::new(ArchivalProof::read_xdr(r)?))) - }), - TypeVariant::ArchivalProofBody => r.with_limited_depth(|r| { - Ok(Self::ArchivalProofBody(Box::new( - ArchivalProofBody::read_xdr(r)?, - ))) - }), TypeVariant::SorobanResources => r.with_limited_depth(|r| { Ok(Self::SorobanResources(Box::new( SorobanResources::read_xdr(r)?, ))) }), + TypeVariant::SorobanResourcesExtV0 => r.with_limited_depth(|r| { + Ok(Self::SorobanResourcesExtV0(Box::new( + SorobanResourcesExtV0::read_xdr(r)?, + ))) + }), TypeVariant::SorobanTransactionData => r.with_limited_depth(|r| { Ok(Self::SorobanTransactionData(Box::new( SorobanTransactionData::read_xdr(r)?, @@ -53571,6 +52990,13 @@ impl Type { ) .map(|r| r.map(|t| Self::ConfigSettingContractLedgerCostV0(Box::new(t)))), ), + TypeVariant::ConfigSettingContractLedgerCostExtV0 => Box::new( + ReadXdrIter::<_, ConfigSettingContractLedgerCostExtV0>::new( + &mut r.inner, + r.limits.clone(), + ) + .map(|r| r.map(|t| Self::ConfigSettingContractLedgerCostExtV0(Box::new(t)))), + ), TypeVariant::ConfigSettingContractHistoricalDataV0 => Box::new( ReadXdrIter::<_, ConfigSettingContractHistoricalDataV0>::new( &mut r.inner, @@ -54471,10 +53897,6 @@ impl Type { ReadXdrIter::<_, LedgerCloseMetaExtV1>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerCloseMetaExtV1(Box::new(t)))), ), - TypeVariant::LedgerCloseMetaExtV2 => Box::new( - ReadXdrIter::<_, LedgerCloseMetaExtV2>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::LedgerCloseMetaExtV2(Box::new(t)))), - ), TypeVariant::LedgerCloseMetaExt => Box::new( ReadXdrIter::<_, LedgerCloseMetaExt>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerCloseMetaExt(Box::new(t)))), @@ -54956,38 +54378,14 @@ impl Type { ReadXdrIter::<_, LedgerFootprint>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerFootprint(Box::new(t)))), ), - TypeVariant::ArchivalProofType => Box::new( - ReadXdrIter::<_, ArchivalProofType>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofType(Box::new(t)))), - ), - TypeVariant::ArchivalProofNode => Box::new( - ReadXdrIter::<_, ArchivalProofNode>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofNode(Box::new(t)))), - ), - TypeVariant::ProofLevel => Box::new( - ReadXdrIter::<_, ProofLevel>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ProofLevel(Box::new(t)))), - ), - TypeVariant::ExistenceProofBody => Box::new( - ReadXdrIter::<_, ExistenceProofBody>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ExistenceProofBody(Box::new(t)))), - ), - TypeVariant::NonexistenceProofBody => Box::new( - ReadXdrIter::<_, NonexistenceProofBody>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::NonexistenceProofBody(Box::new(t)))), - ), - TypeVariant::ArchivalProof => Box::new( - ReadXdrIter::<_, ArchivalProof>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProof(Box::new(t)))), - ), - TypeVariant::ArchivalProofBody => Box::new( - ReadXdrIter::<_, ArchivalProofBody>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofBody(Box::new(t)))), - ), TypeVariant::SorobanResources => Box::new( ReadXdrIter::<_, SorobanResources>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::SorobanResources(Box::new(t)))), ), + TypeVariant::SorobanResourcesExtV0 => Box::new( + ReadXdrIter::<_, SorobanResourcesExtV0>::new(&mut r.inner, r.limits.clone()) + .map(|r| r.map(|t| Self::SorobanResourcesExtV0(Box::new(t)))), + ), TypeVariant::SorobanTransactionData => Box::new( ReadXdrIter::<_, SorobanTransactionData>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::SorobanTransactionData(Box::new(t)))), @@ -55593,6 +54991,13 @@ impl Type { ) .map(|r| r.map(|t| Self::ConfigSettingContractLedgerCostV0(Box::new(t.0)))), ), + TypeVariant::ConfigSettingContractLedgerCostExtV0 => Box::new( + ReadXdrIter::<_, Frame>::new( + &mut r.inner, + r.limits.clone(), + ) + .map(|r| r.map(|t| Self::ConfigSettingContractLedgerCostExtV0(Box::new(t.0)))), + ), TypeVariant::ConfigSettingContractHistoricalDataV0 => Box::new( ReadXdrIter::<_, Frame>::new( &mut r.inner, @@ -56622,10 +56027,6 @@ impl Type { ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerCloseMetaExtV1(Box::new(t.0)))), ), - TypeVariant::LedgerCloseMetaExtV2 => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::LedgerCloseMetaExtV2(Box::new(t.0)))), - ), TypeVariant::LedgerCloseMetaExt => Box::new( ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerCloseMetaExt(Box::new(t.0)))), @@ -57196,38 +56597,14 @@ impl Type { ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerFootprint(Box::new(t.0)))), ), - TypeVariant::ArchivalProofType => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofType(Box::new(t.0)))), - ), - TypeVariant::ArchivalProofNode => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofNode(Box::new(t.0)))), - ), - TypeVariant::ProofLevel => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ProofLevel(Box::new(t.0)))), - ), - TypeVariant::ExistenceProofBody => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ExistenceProofBody(Box::new(t.0)))), - ), - TypeVariant::NonexistenceProofBody => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::NonexistenceProofBody(Box::new(t.0)))), - ), - TypeVariant::ArchivalProof => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProof(Box::new(t.0)))), - ), - TypeVariant::ArchivalProofBody => Box::new( - ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofBody(Box::new(t.0)))), - ), TypeVariant::SorobanResources => Box::new( ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) .map(|r| r.map(|t| Self::SorobanResources(Box::new(t.0)))), ), + TypeVariant::SorobanResourcesExtV0 => Box::new( + ReadXdrIter::<_, Frame>::new(&mut r.inner, r.limits.clone()) + .map(|r| r.map(|t| Self::SorobanResourcesExtV0(Box::new(t.0)))), + ), TypeVariant::SorobanTransactionData => Box::new( ReadXdrIter::<_, Frame>::new( &mut r.inner, @@ -57918,6 +57295,10 @@ impl Type { ReadXdrIter::<_, ConfigSettingContractLedgerCostV0>::new(dec, r.limits.clone()) .map(|r| r.map(|t| Self::ConfigSettingContractLedgerCostV0(Box::new(t)))), ), + TypeVariant::ConfigSettingContractLedgerCostExtV0 => Box::new( + ReadXdrIter::<_, ConfigSettingContractLedgerCostExtV0>::new(dec, r.limits.clone()) + .map(|r| r.map(|t| Self::ConfigSettingContractLedgerCostExtV0(Box::new(t)))), + ), TypeVariant::ConfigSettingContractHistoricalDataV0 => Box::new( ReadXdrIter::<_, ConfigSettingContractHistoricalDataV0>::new(dec, r.limits.clone()) .map(|r| r.map(|t| Self::ConfigSettingContractHistoricalDataV0(Box::new(t)))), @@ -58785,10 +58166,6 @@ impl Type { ReadXdrIter::<_, LedgerCloseMetaExtV1>::new(dec, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerCloseMetaExtV1(Box::new(t)))), ), - TypeVariant::LedgerCloseMetaExtV2 => Box::new( - ReadXdrIter::<_, LedgerCloseMetaExtV2>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::LedgerCloseMetaExtV2(Box::new(t)))), - ), TypeVariant::LedgerCloseMetaExt => Box::new( ReadXdrIter::<_, LedgerCloseMetaExt>::new(dec, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerCloseMetaExt(Box::new(t)))), @@ -59240,38 +58617,14 @@ impl Type { ReadXdrIter::<_, LedgerFootprint>::new(dec, r.limits.clone()) .map(|r| r.map(|t| Self::LedgerFootprint(Box::new(t)))), ), - TypeVariant::ArchivalProofType => Box::new( - ReadXdrIter::<_, ArchivalProofType>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofType(Box::new(t)))), - ), - TypeVariant::ArchivalProofNode => Box::new( - ReadXdrIter::<_, ArchivalProofNode>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofNode(Box::new(t)))), - ), - TypeVariant::ProofLevel => Box::new( - ReadXdrIter::<_, ProofLevel>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ProofLevel(Box::new(t)))), - ), - TypeVariant::ExistenceProofBody => Box::new( - ReadXdrIter::<_, ExistenceProofBody>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ExistenceProofBody(Box::new(t)))), - ), - TypeVariant::NonexistenceProofBody => Box::new( - ReadXdrIter::<_, NonexistenceProofBody>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::NonexistenceProofBody(Box::new(t)))), - ), - TypeVariant::ArchivalProof => Box::new( - ReadXdrIter::<_, ArchivalProof>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProof(Box::new(t)))), - ), - TypeVariant::ArchivalProofBody => Box::new( - ReadXdrIter::<_, ArchivalProofBody>::new(dec, r.limits.clone()) - .map(|r| r.map(|t| Self::ArchivalProofBody(Box::new(t)))), - ), TypeVariant::SorobanResources => Box::new( ReadXdrIter::<_, SorobanResources>::new(dec, r.limits.clone()) .map(|r| r.map(|t| Self::SorobanResources(Box::new(t)))), ), + TypeVariant::SorobanResourcesExtV0 => Box::new( + ReadXdrIter::<_, SorobanResourcesExtV0>::new(dec, r.limits.clone()) + .map(|r| r.map(|t| Self::SorobanResourcesExtV0(Box::new(t)))), + ), TypeVariant::SorobanTransactionData => Box::new( ReadXdrIter::<_, SorobanTransactionData>::new(dec, r.limits.clone()) .map(|r| r.map(|t| Self::SorobanTransactionData(Box::new(t)))), @@ -59816,6 +59169,9 @@ impl Type { TypeVariant::ConfigSettingContractLedgerCostV0 => Ok( Self::ConfigSettingContractLedgerCostV0(Box::new(serde_json::from_reader(r)?)), ), + TypeVariant::ConfigSettingContractLedgerCostExtV0 => Ok( + Self::ConfigSettingContractLedgerCostExtV0(Box::new(serde_json::from_reader(r)?)), + ), TypeVariant::ConfigSettingContractHistoricalDataV0 => Ok( Self::ConfigSettingContractHistoricalDataV0(Box::new(serde_json::from_reader(r)?)), ), @@ -60398,9 +59754,6 @@ impl Type { TypeVariant::LedgerCloseMetaExtV1 => Ok(Self::LedgerCloseMetaExtV1(Box::new( serde_json::from_reader(r)?, ))), - TypeVariant::LedgerCloseMetaExtV2 => Ok(Self::LedgerCloseMetaExtV2(Box::new( - serde_json::from_reader(r)?, - ))), TypeVariant::LedgerCloseMetaExt => Ok(Self::LedgerCloseMetaExt(Box::new( serde_json::from_reader(r)?, ))), @@ -60705,26 +60058,10 @@ impl Type { TypeVariant::LedgerFootprint => { Ok(Self::LedgerFootprint(Box::new(serde_json::from_reader(r)?))) } - TypeVariant::ArchivalProofType => Ok(Self::ArchivalProofType(Box::new( - serde_json::from_reader(r)?, - ))), - TypeVariant::ArchivalProofNode => Ok(Self::ArchivalProofNode(Box::new( - serde_json::from_reader(r)?, - ))), - TypeVariant::ProofLevel => Ok(Self::ProofLevel(Box::new(serde_json::from_reader(r)?))), - TypeVariant::ExistenceProofBody => Ok(Self::ExistenceProofBody(Box::new( - serde_json::from_reader(r)?, - ))), - TypeVariant::NonexistenceProofBody => Ok(Self::NonexistenceProofBody(Box::new( - serde_json::from_reader(r)?, - ))), - TypeVariant::ArchivalProof => { - Ok(Self::ArchivalProof(Box::new(serde_json::from_reader(r)?))) - } - TypeVariant::ArchivalProofBody => Ok(Self::ArchivalProofBody(Box::new( + TypeVariant::SorobanResources => Ok(Self::SorobanResources(Box::new( serde_json::from_reader(r)?, ))), - TypeVariant::SorobanResources => Ok(Self::SorobanResources(Box::new( + TypeVariant::SorobanResourcesExtV0 => Ok(Self::SorobanResourcesExtV0(Box::new( serde_json::from_reader(r)?, ))), TypeVariant::SorobanTransactionData => Ok(Self::SorobanTransactionData(Box::new( @@ -61114,6 +60451,11 @@ impl Type { serde::de::Deserialize::deserialize(r)?, ))) } + TypeVariant::ConfigSettingContractLedgerCostExtV0 => { + Ok(Self::ConfigSettingContractLedgerCostExtV0(Box::new( + serde::de::Deserialize::deserialize(r)?, + ))) + } TypeVariant::ConfigSettingContractHistoricalDataV0 => { Ok(Self::ConfigSettingContractHistoricalDataV0(Box::new( serde::de::Deserialize::deserialize(r)?, @@ -61782,9 +61124,6 @@ impl Type { TypeVariant::LedgerCloseMetaExtV1 => Ok(Self::LedgerCloseMetaExtV1(Box::new( serde::de::Deserialize::deserialize(r)?, ))), - TypeVariant::LedgerCloseMetaExtV2 => Ok(Self::LedgerCloseMetaExtV2(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), TypeVariant::LedgerCloseMetaExt => Ok(Self::LedgerCloseMetaExt(Box::new( serde::de::Deserialize::deserialize(r)?, ))), @@ -62137,28 +61476,10 @@ impl Type { TypeVariant::LedgerFootprint => Ok(Self::LedgerFootprint(Box::new( serde::de::Deserialize::deserialize(r)?, ))), - TypeVariant::ArchivalProofType => Ok(Self::ArchivalProofType(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::ArchivalProofNode => Ok(Self::ArchivalProofNode(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::ProofLevel => Ok(Self::ProofLevel(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::ExistenceProofBody => Ok(Self::ExistenceProofBody(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::NonexistenceProofBody => Ok(Self::NonexistenceProofBody(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::ArchivalProof => Ok(Self::ArchivalProof(Box::new( - serde::de::Deserialize::deserialize(r)?, - ))), - TypeVariant::ArchivalProofBody => Ok(Self::ArchivalProofBody(Box::new( + TypeVariant::SorobanResources => Ok(Self::SorobanResources(Box::new( serde::de::Deserialize::deserialize(r)?, ))), - TypeVariant::SorobanResources => Ok(Self::SorobanResources(Box::new( + TypeVariant::SorobanResourcesExtV0 => Ok(Self::SorobanResourcesExtV0(Box::new( serde::de::Deserialize::deserialize(r)?, ))), TypeVariant::SorobanTransactionData => Ok(Self::SorobanTransactionData(Box::new( @@ -62565,6 +61886,7 @@ impl Type { Self::ConfigSettingContractComputeV0(ref v) => v.as_ref(), Self::ConfigSettingContractParallelComputeV0(ref v) => v.as_ref(), Self::ConfigSettingContractLedgerCostV0(ref v) => v.as_ref(), + Self::ConfigSettingContractLedgerCostExtV0(ref v) => v.as_ref(), Self::ConfigSettingContractHistoricalDataV0(ref v) => v.as_ref(), Self::ConfigSettingContractEventsV0(ref v) => v.as_ref(), Self::ConfigSettingContractBandwidthV0(ref v) => v.as_ref(), @@ -62781,7 +62103,6 @@ impl Type { Self::UpgradeEntryMeta(ref v) => v.as_ref(), Self::LedgerCloseMetaV0(ref v) => v.as_ref(), Self::LedgerCloseMetaExtV1(ref v) => v.as_ref(), - Self::LedgerCloseMetaExtV2(ref v) => v.as_ref(), Self::LedgerCloseMetaExt(ref v) => v.as_ref(), Self::LedgerCloseMetaV1(ref v) => v.as_ref(), Self::LedgerCloseMeta(ref v) => v.as_ref(), @@ -62892,14 +62213,8 @@ impl Type { Self::PreconditionType(ref v) => v.as_ref(), Self::Preconditions(ref v) => v.as_ref(), Self::LedgerFootprint(ref v) => v.as_ref(), - Self::ArchivalProofType(ref v) => v.as_ref(), - Self::ArchivalProofNode(ref v) => v.as_ref(), - Self::ProofLevel(ref v) => v.as_ref(), - Self::ExistenceProofBody(ref v) => v.as_ref(), - Self::NonexistenceProofBody(ref v) => v.as_ref(), - Self::ArchivalProof(ref v) => v.as_ref(), - Self::ArchivalProofBody(ref v) => v.as_ref(), Self::SorobanResources(ref v) => v.as_ref(), + Self::SorobanResourcesExtV0(ref v) => v.as_ref(), Self::SorobanTransactionData(ref v) => v.as_ref(), Self::SorobanTransactionDataExt(ref v) => v.as_ref(), Self::TransactionV0(ref v) => v.as_ref(), @@ -63042,6 +62357,7 @@ impl Type { "ConfigSettingContractParallelComputeV0" } Self::ConfigSettingContractLedgerCostV0(_) => "ConfigSettingContractLedgerCostV0", + Self::ConfigSettingContractLedgerCostExtV0(_) => "ConfigSettingContractLedgerCostExtV0", Self::ConfigSettingContractHistoricalDataV0(_) => { "ConfigSettingContractHistoricalDataV0" } @@ -63262,7 +62578,6 @@ impl Type { Self::UpgradeEntryMeta(_) => "UpgradeEntryMeta", Self::LedgerCloseMetaV0(_) => "LedgerCloseMetaV0", Self::LedgerCloseMetaExtV1(_) => "LedgerCloseMetaExtV1", - Self::LedgerCloseMetaExtV2(_) => "LedgerCloseMetaExtV2", Self::LedgerCloseMetaExt(_) => "LedgerCloseMetaExt", Self::LedgerCloseMetaV1(_) => "LedgerCloseMetaV1", Self::LedgerCloseMeta(_) => "LedgerCloseMeta", @@ -63383,14 +62698,8 @@ impl Type { Self::PreconditionType(_) => "PreconditionType", Self::Preconditions(_) => "Preconditions", Self::LedgerFootprint(_) => "LedgerFootprint", - Self::ArchivalProofType(_) => "ArchivalProofType", - Self::ArchivalProofNode(_) => "ArchivalProofNode", - Self::ProofLevel(_) => "ProofLevel", - Self::ExistenceProofBody(_) => "ExistenceProofBody", - Self::NonexistenceProofBody(_) => "NonexistenceProofBody", - Self::ArchivalProof(_) => "ArchivalProof", - Self::ArchivalProofBody(_) => "ArchivalProofBody", Self::SorobanResources(_) => "SorobanResources", + Self::SorobanResourcesExtV0(_) => "SorobanResourcesExtV0", Self::SorobanTransactionData(_) => "SorobanTransactionData", Self::SorobanTransactionDataExt(_) => "SorobanTransactionDataExt", Self::TransactionV0(_) => "TransactionV0", @@ -63520,7 +62829,7 @@ impl Type { #[must_use] #[allow(clippy::too_many_lines)] - pub const fn variants() -> [TypeVariant; 466] { + pub const fn variants() -> [TypeVariant; 460] { Self::VARIANTS } @@ -63549,6 +62858,9 @@ impl Type { Self::ConfigSettingContractLedgerCostV0(_) => { TypeVariant::ConfigSettingContractLedgerCostV0 } + Self::ConfigSettingContractLedgerCostExtV0(_) => { + TypeVariant::ConfigSettingContractLedgerCostExtV0 + } Self::ConfigSettingContractHistoricalDataV0(_) => { TypeVariant::ConfigSettingContractHistoricalDataV0 } @@ -63783,7 +63095,6 @@ impl Type { Self::UpgradeEntryMeta(_) => TypeVariant::UpgradeEntryMeta, Self::LedgerCloseMetaV0(_) => TypeVariant::LedgerCloseMetaV0, Self::LedgerCloseMetaExtV1(_) => TypeVariant::LedgerCloseMetaExtV1, - Self::LedgerCloseMetaExtV2(_) => TypeVariant::LedgerCloseMetaExtV2, Self::LedgerCloseMetaExt(_) => TypeVariant::LedgerCloseMetaExt, Self::LedgerCloseMetaV1(_) => TypeVariant::LedgerCloseMetaV1, Self::LedgerCloseMeta(_) => TypeVariant::LedgerCloseMeta, @@ -63914,14 +63225,8 @@ impl Type { Self::PreconditionType(_) => TypeVariant::PreconditionType, Self::Preconditions(_) => TypeVariant::Preconditions, Self::LedgerFootprint(_) => TypeVariant::LedgerFootprint, - Self::ArchivalProofType(_) => TypeVariant::ArchivalProofType, - Self::ArchivalProofNode(_) => TypeVariant::ArchivalProofNode, - Self::ProofLevel(_) => TypeVariant::ProofLevel, - Self::ExistenceProofBody(_) => TypeVariant::ExistenceProofBody, - Self::NonexistenceProofBody(_) => TypeVariant::NonexistenceProofBody, - Self::ArchivalProof(_) => TypeVariant::ArchivalProof, - Self::ArchivalProofBody(_) => TypeVariant::ArchivalProofBody, Self::SorobanResources(_) => TypeVariant::SorobanResources, + Self::SorobanResourcesExtV0(_) => TypeVariant::SorobanResourcesExtV0, Self::SorobanTransactionData(_) => TypeVariant::SorobanTransactionData, Self::SorobanTransactionDataExt(_) => TypeVariant::SorobanTransactionDataExt, Self::TransactionV0(_) => TypeVariant::TransactionV0, @@ -64101,6 +63406,7 @@ impl WriteXdr for Type { Self::ConfigSettingContractComputeV0(v) => v.write_xdr(w), Self::ConfigSettingContractParallelComputeV0(v) => v.write_xdr(w), Self::ConfigSettingContractLedgerCostV0(v) => v.write_xdr(w), + Self::ConfigSettingContractLedgerCostExtV0(v) => v.write_xdr(w), Self::ConfigSettingContractHistoricalDataV0(v) => v.write_xdr(w), Self::ConfigSettingContractEventsV0(v) => v.write_xdr(w), Self::ConfigSettingContractBandwidthV0(v) => v.write_xdr(w), @@ -64317,7 +63623,6 @@ impl WriteXdr for Type { Self::UpgradeEntryMeta(v) => v.write_xdr(w), Self::LedgerCloseMetaV0(v) => v.write_xdr(w), Self::LedgerCloseMetaExtV1(v) => v.write_xdr(w), - Self::LedgerCloseMetaExtV2(v) => v.write_xdr(w), Self::LedgerCloseMetaExt(v) => v.write_xdr(w), Self::LedgerCloseMetaV1(v) => v.write_xdr(w), Self::LedgerCloseMeta(v) => v.write_xdr(w), @@ -64428,14 +63733,8 @@ impl WriteXdr for Type { Self::PreconditionType(v) => v.write_xdr(w), Self::Preconditions(v) => v.write_xdr(w), Self::LedgerFootprint(v) => v.write_xdr(w), - Self::ArchivalProofType(v) => v.write_xdr(w), - Self::ArchivalProofNode(v) => v.write_xdr(w), - Self::ProofLevel(v) => v.write_xdr(w), - Self::ExistenceProofBody(v) => v.write_xdr(w), - Self::NonexistenceProofBody(v) => v.write_xdr(w), - Self::ArchivalProof(v) => v.write_xdr(w), - Self::ArchivalProofBody(v) => v.write_xdr(w), Self::SorobanResources(v) => v.write_xdr(w), + Self::SorobanResourcesExtV0(v) => v.write_xdr(w), Self::SorobanTransactionData(v) => v.write_xdr(w), Self::SorobanTransactionDataExt(v) => v.write_xdr(w), Self::TransactionV0(v) => v.write_xdr(w), diff --git a/xdr/curr b/xdr/curr index 529d5176..63d87bbb 160000 --- a/xdr/curr +++ b/xdr/curr @@ -1 +1 @@ -Subproject commit 529d5176f24c73eeccfa5eba481d4e89c19b1181 +Subproject commit 63d87bbb388c964a9cc758397677ac2d6951c342 diff --git a/xdr/curr-version b/xdr/curr-version index 20a2fce7..d146757c 100644 --- a/xdr/curr-version +++ b/xdr/curr-version @@ -1 +1 @@ -529d5176f24c73eeccfa5eba481d4e89c19b1181 \ No newline at end of file +63d87bbb388c964a9cc758397677ac2d6951c342 \ No newline at end of file diff --git a/xdr/next b/xdr/next index 57df7942..d22aae26 160000 --- a/xdr/next +++ b/xdr/next @@ -1 +1 @@ -Subproject commit 57df794263bd73e12beb119be6382281ac2015c3 +Subproject commit d22aae26b36bdb76d5e1dc0b0031a4c861850843 diff --git a/xdr/next-version b/xdr/next-version index 2c5956eb..3e2429cc 100644 --- a/xdr/next-version +++ b/xdr/next-version @@ -1 +1 @@ -57df794263bd73e12beb119be6382281ac2015c3 \ No newline at end of file +d22aae26b36bdb76d5e1dc0b0031a4c861850843 \ No newline at end of file