Merge remote-tracking branch 'upstream/main' into p28-cap-0084

# Conflicts:
#	Cargo.lock
#	Cargo.toml

Author: sisuresh

Cargo.lock

@@ -21,15 +21,15 @@ exclude = ["soroban-test-wasms/wasm-workspace"]
 # NB: When bumping the major version make sure to clean up the
 # code guarded by `unstable-*` features to make it enabled
 # unconditionally.
-version = "27.0.0"
+version = "28.0.0"
 rust-version = "1.84.0"
 
 [workspace.dependencies]
-soroban-env-common = { version = "=27.0.0", path = "soroban-env-common", default-features = false }
-soroban-env-guest = { version = "=27.0.0", path = "soroban-env-guest" }
-soroban-env-host = { version = "=27.0.0", path = "soroban-env-host" }
-soroban-env-macros = { version = "=27.0.0", path = "soroban-env-macros" }
-soroban-builtin-sdk-macros = { version = "=27.0.0", path = "soroban-builtin-sdk-macros" }
+soroban-env-common = { version = "=28.0.0", path = "soroban-env-common", default-features = false }
+soroban-env-guest = { version = "=28.0.0", path = "soroban-env-guest" }
+soroban-env-host = { version = "=28.0.0", path = "soroban-env-host" }
+soroban-env-macros = { version = "=28.0.0", path = "soroban-env-macros" }
+soroban-builtin-sdk-macros = { version = "=28.0.0", path = "soroban-builtin-sdk-macros" }
 # NB: this must match the wasmparser version wasmi is using
 wasmparser = "=0.116.1"
 
@@ -38,9 +38,11 @@ wasmparser = "=0.116.1"
 version = "=28.0.0"
 # SPIKE: rs-stellar-xdr#552 (CAP-0084). Fork-hosted branch p28-cap-0084.
 # Productionize -> stellar/rs-stellar-xdr merged SHA (or crates.io 28.0.0) once #552 lands.
+# Refreshed head carries both CAP-0084 and CAP-0085 (base merged CAP-85 after this PR opened).
 git = "https://github.com/sisuresh/rs-stellar-xdr"
-rev = "cf7fdedf7ca95fccf45c82e6829d14637c9b5e4c"
+rev = "b0fa30a3a2a29be74f6a98a567e9b586800db509"
 default-features = false
+features = ["cap_0085_executable_ref"]
 
 [workspace.dependencies.wasmi]
 package = "soroban-wasmi"

Cargo.toml

@@ -99,14 +99,7 @@ ignore = [
     # Ignores 'Rand is unsound with a custom logger using rand::rng()' advisory.
     # `rand` 0.8.5 is only vulnerable when its `log` + `thread_rng` path is
     # enabled with a custom logger, which we don't use
-    "RUSTSEC-2026-0097",
-    # TEMP CAP-0084 SPIKE: ignores 'Unsoundness in `anyhow::Error::downcast_mut()`'
-    # (RUSTSEC-2026-0190, affects anyhow < 1.0.103). This PR keeps anyhow pinned at
-    # 1.0.75 to avoid an out-of-scope dependency bump; the fix (anyhow -> 1.0.103)
-    # is carried by the dedicated advisory PR stellar/rs-soroban-env#1701. Remove
-    # this once #1701 (or a release carrying the bump) lands anyhow >= 1.0.103 into
-    # main and this PR rebases.
-    "RUSTSEC-2026-0190"
+    "RUSTSEC-2026-0097"
 ]
 # Threshold for security vulnerabilities, any vulnerability with a CVSS score
 # lower than the range specified will be ignored. Note that ignored advisories

deny.toml

@@ -1708,6 +1708,65 @@
                     "return": "Void",
                     "docs": "Extend the contract instance and/or corresponding code entry TTL to be up to `extend_to` ledgers, where TTL is defined as `entry_live_until_ledger_seq - current_ledger_seq`. `extension_scope` defines whether contract instance, code, or both will be extended. The TTL extension only actually happens if it is at least `min_extension`, otherwise this function is a no-op. The amount of extension ledgers will not exceed `max_extension` ledgers. If attempting to extend an entry past the maximum allowed value (defined as the current ledger + `max_entry_ttl` - 1), its new `live_until_ledger_seq` will be clamped to the max.",
                     "min_supported_protocol": 26
+                },
+                {
+                    "export": "h",
+                    "name": "create_executable_tag",
+                    "args": [
+                        {
+                            "name": "tag_string",
+                            "type": "StringObject"
+                        }
+                    ],
+                    "return": "ExecutableTagObject",
+                    "docs": "Creates a new `ExecutableTag` object holding the contents of the provided string. The tag acts as a key identifying an executable reference contract data entry. Executable reference entries may be used by other contracts to fetch their executable.",
+                    "min_supported_protocol": 28
+                },
+                {
+                    "export": "i",
+                    "name": "create_external_ref_contract",
+                    "args": [
+                        {
+                            "name": "deployer",
+                            "type": "AddressObject"
+                        },
+                        {
+                            "name": "executable_owner",
+                            "type": "AddressObject"
+                        },
+                        {
+                            "name": "tag",
+                            "type": "ExecutableTagObject"
+                        },
+                        {
+                            "name": "salt",
+                            "type": "BytesObject"
+                        },
+                        {
+                            "name": "constructor_args",
+                            "type": "VecObject"
+                        }
+                    ],
+                    "return": "AddressObject",
+                    "docs": "Creates the contract instance on behalf of `deployer`. `deployer` must authorize this call via Soroban auth framework, i.e. this calls `deployer.require_auth` with respective arguments. Executable is read from the `executable_owner` contract storage entry keyed by `tag`. Currently the only supported external executable kind is hash of an existing Wasm. `salt` is used to create a unique contract id. `constructor_args` are forwarded into created contract's constructor (`__constructor`) function. Returns the address of the created contract.",
+                    "min_supported_protocol": 28
+                },
+                {
+                    "export": "j",
+                    "name": "update_current_contract_executable_ref",
+                    "args": [
+                        {
+                            "name": "executable_owner",
+                            "type": "AddressObject"
+                        },
+                        {
+                            "name": "tag",
+                            "type": "ExecutableTagObject"
+                        }
+                    ],
+                    "return": "Void",
+                    "docs": "Replaces the executable of the current contract with the provided executable reference. Executable is read from the `executable_owner` contract storage entry keyed by `tag`. Currently the only supported external executable kind is hash of an existing Wasm. The update happens only after the current contract invocation has successfully finished, so this can be safely called in the middle of a function.",
+                    "min_supported_protocol": 28
                 }
             ]
         },

soroban-env-common/env.json

@@ -195,7 +195,8 @@ impl<E: Env> Compare<Val> for E {
                 | Tag::VecObject
                 | Tag::MapObject
                 | Tag::AddressObject
-                | Tag::MuxedAddressObject => Err(self.error_from_error_val(
+                | Tag::MuxedAddressObject
+                | Tag::ExecutableTagObject => Err(self.error_from_error_val(
                     Error::from_type_and_code(ScErrorType::Context, ScErrorCode::InternalError),
                 )),
 

soroban-env-common/src/compare.rs

@@ -500,6 +500,7 @@ where
             | Tag::MapObject
             | Tag::AddressObject
             | Tag::MuxedAddressObject
+            | Tag::ExecutableTagObject
             | Tag::SmallCodeUpperBound
             | Tag::ObjectCodeLowerBound
             | Tag::ObjectCodeUpperBound
@@ -593,6 +594,7 @@ where
             | ScVal::Vec(_)
             | ScVal::Map(_)
             | ScVal::Address(_)
+            | ScVal::ExecutableTag(_)
             | ScVal::LedgerKeyNonce(_)
             | ScVal::LedgerKeyContractInstance
             | ScVal::ContractInstance(_) => return Err(ConversionError.into()),

soroban-env-common/src/convert.rs

@@ -4,10 +4,10 @@ use crate::Object;
 
 use super::Symbol;
 use super::{
-    AddressObject, Bool, BytesObject, ContractTtlExtension, DurationObject, Error, I128Object,
-    I256Object, I256Val, I64Object, MapObject, MuxedAddressObject, StorageType, StringObject,
-    SymbolObject, TimepointObject, U128Object, U256Object, U256Val, U32Val, U64Object, U64Val, Val,
-    VecObject, Void,
+    AddressObject, Bool, BytesObject, ContractTtlExtension, DurationObject, Error,
+    ExecutableTagObject, I128Object, I256Object, I256Val, I64Object, MapObject, MuxedAddressObject,
+    StorageType, StringObject, SymbolObject, TimepointObject, U128Object, U256Object, U256Val,
+    U32Val, U64Object, U64Val, Val, VecObject, Void,
 };
 use crate::xdr::{ScErrorCode, ScErrorType};
 
@@ -271,6 +271,7 @@ impl_checkedenvarg_for_val_or_wrapper!(DurationObject);
 impl_checkedenvarg_for_val_or_wrapper!(TimepointObject);
 impl_checkedenvarg_for_val_or_wrapper!(SymbolObject);
 impl_checkedenvarg_for_val_or_wrapper!(StringObject);
+impl_checkedenvarg_for_val_or_wrapper!(ExecutableTagObject);
 
 impl_checkedenvarg_for_val_or_wrapper!(VecObject);
 impl_checkedenvarg_for_val_or_wrapper!(MapObject);

soroban-env-common/src/env.rs

@@ -109,7 +109,7 @@ pub use val::{ConversionError, Tag, Val};
 
 #[cfg(feature = "wasmi")]
 pub use val::WasmiMarshal;
-pub use val::{AddressObject, MapObject, MuxedAddressObject, VecObject};
+pub use val::{AddressObject, ExecutableTagObject, MapObject, MuxedAddressObject, VecObject};
 pub use val::{Bool, Void};
 
 pub use compare::Compare;

soroban-env-common/src/lib.rs

@@ -49,7 +49,7 @@ pub const ENV_META_V0_SECTION_NAME: &str = "contractenvmetav0";
 // protocol number for testing purposes.
 #[cfg(feature = "next")]
 soroban_env_macros::generate_env_meta_consts!(
-    ledger_protocol_version: 28,
+    ledger_protocol_version: 29,
     pre_release_version: 1,
 );
 
@@ -59,6 +59,6 @@ soroban_env_macros::generate_env_meta_consts!(
 // network protocol number.
 #[cfg(not(feature = "next"))]
 soroban_env_macros::generate_env_meta_consts!(
-    ledger_protocol_version: 27,
+    ledger_protocol_version: 28,
     pre_release_version: 0,
 );

soroban-env-common/src/meta.rs

@@ -142,7 +142,8 @@ impl<'a> ScValObjRef<'a> {
             | ScVal::String(_)
             | ScVal::Vec(_)
             | ScVal::Map(_)
-            | ScVal::Address(_) => Some(ScValObjRef(value)),
+            | ScVal::Address(_)
+            | ScVal::ExecutableTag(_) => Some(ScValObjRef(value)),
 
             // Other values are small or large depending on
             // their actual scalar value.