@layerzerolabs/protocol-stellar-v2 0.2.121 → 0.2.123

package/Cargo.toml

@@ -1,15 +1,19 @@
 [workspace]
 resolver = "2"
 members = [
-    "contracts/*",
-    "contracts/message-libs/*",
-    "contracts/oapps/*",
-    "contracts/workers/*",
+    "endpoint-v2",
+    "upgrader",
+    "layerzero-views",
+    "message-libs/*",
+    "workers/*",
 ]
+# Vendored path deps (build-utils-rust resolve) land under dependencies/ inside this workspace root;
+# cargo would otherwise auto-adopt them as members and try to test them (their test dirs are stripped
+# when vendored). Exclude so they stay plain path deps.
+exclude = ["dependencies"]
 
 [workspace.package]
 edition = "2021"
-license = "MIT"
 version = "0.0.1"
 
 [workspace.dependencies]
@@ -17,46 +21,27 @@ soroban-sdk = { version = "25.1.1", features = ["hazmat-address", "hazmat-crypto
 
 # Third-party dependencies (production)
 cfg-if = { version = "1.0", default-features = false }
-heck = "0.5"
-itertools = "0.14"
-proc-macro2 = "1.0"
-quote = "1.0"
-syn = { version = "2.0", features = ["full", "extra-traits"] }
+sha3 = "0.10"
 
 # Third-party dependencies (testing only)
 ed25519-dalek = "2"
 hex-literal = "1.0.0"
-insta = "1.44.3"
 k256 = "0.13"
-prettyplease = "0.2.37"
 rand = "0.8"
-anyhow = "1.0"
-sha2 = "0.10"
-base64 = "0.22"
-sha3 = "0.10"
-trybuild = "1.0.114"
 
 # Internal workspace dependencies
-common-macros = { path = "contracts/common-macros" }
-dvn = { path = "contracts/workers/dvn" }
-dvn-fee-lib = { path = "contracts/workers/dvn-fee-lib" }
-endpoint-v2 = { path = "contracts/endpoint-v2", default-features = false }
-executor = { path = "contracts/workers/executor" }
-executor-fee-lib = { path = "contracts/workers/executor-fee-lib" }
-executor-helper = { path = "contracts/workers/executor-helper" }
-fee-lib-interfaces = { path = "contracts/workers/fee-lib-interfaces" }
-message-lib-common = { path = "contracts/message-libs/message-lib-common" }
-blocked-message-lib = { path = "contracts/message-libs/blocked-message-lib" }
-oapp = { path = "contracts/oapps/oapp" }
-oapp-macros = { path = "contracts/oapps/oapp-macros" }
-oft = { path = "contracts/oapps/oft" }
-oft-core = { path = "contracts/oapps/oft-core" }
-price-feed = { path = "contracts/workers/price-feed" }
-simple-message-lib = { path = "contracts/message-libs/simple-message-lib" }
-treasury = { path = "contracts/message-libs/treasury" }
-uln302 = { path = "contracts/message-libs/uln-302", default-features = false }
-utils = { path = "contracts/utils" }
-worker = { path = "contracts/workers/worker" }
+common-macros = { path = "dependencies/common-utils-macros-stellar-contracts" }
+dvn = { path = "workers/dvn" }
+dvn-fee-lib = { path = "workers/dvn-fee-lib" }
+endpoint-v2 = { path = "endpoint-v2", default-features = false }
+executor = { path = "workers/executor" }
+executor-fee-lib = { path = "workers/executor-fee-lib" }
+fee-lib-interfaces = { path = "workers/fee-lib-interfaces" }
+message-lib-common = { path = "message-libs/message-lib-common" }
+simple-message-lib = { path = "message-libs/simple-message-lib" }
+uln302 = { path = "message-libs/uln-302", default-features = false }
+utils = { path = "dependencies/common-utils-stellar-contracts" }
+worker = { path = "workers/worker" }
 
 # Fast dev builds for testing
 [profile.dev]

package/{contracts/endpoint-v2 → endpoint-v2}/Cargo.toml

@@ -2,7 +2,6 @@
 name = "endpoint-v2"
 version.workspace = true
 edition.workspace = true
-license.workspace = true
 publish = false
 
 [lib]
@@ -11,7 +10,7 @@ doctest = false
 
 [features]
 library = []
-testutils = []
+testutils = ["soroban-sdk/testutils"]
 
 [dependencies]
 cfg-if = { workspace = true }
@@ -21,6 +20,8 @@ utils = { workspace = true }
 common-macros = { workspace = true }
 
 [dev-dependencies]
+# self-dep to enable this crate's `testutils` for its own test build
+endpoint-v2 = { path = ".", features = ["testutils"] }
 soroban-sdk = { workspace = true, features = ["testutils"] }
 utils = { workspace = true, features = ["testutils"] }
 hex-literal = { workspace = true }

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/endpoint_v2/pay_messaging_fees.rs

@@ -23,7 +23,13 @@ fn pay_messaging_fees(
     let env = &context.env;
     let endpoint_addr = &context.endpoint_client.address;
     env.as_contract(endpoint_addr, || {
-        EndpointV2::pay_messaging_fees_for_test(env, pay_in_zro, native_fee_recipients, zro_fee_recipients, refund_address)
+        EndpointV2::pay_messaging_fees_for_test(
+            env,
+            pay_in_zro,
+            native_fee_recipients,
+            zro_fee_recipients,
+            refund_address,
+        )
     })
 }
 

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/endpoint_v2/quote.rs

@@ -304,8 +304,8 @@ fn test_quote_with_large_message() {
 
     // Create a large message (1024 bytes)
     let mut large_message_data = [0u8; 1024];
-    for i in 0..1024 {
-        large_message_data[i] = (i % 256) as u8;
+    for (i, byte) in large_message_data.iter_mut().enumerate() {
+        *byte = (i % 256) as u8;
     }
     let large_message = Bytes::from_array(env, &large_message_data);
 

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/endpoint_v2/ttl_config.rs

@@ -141,7 +141,10 @@ fn test_freeze_ttl_configs_already_frozen() {
 
     // Try to freeze again
     context.mock_owner_auth("freeze_ttl_configs", ());
-    assert_eq!(endpoint.try_freeze_ttl_configs().unwrap_err().unwrap(), TtlConfigurableError::TtlConfigAlreadyFrozen.into());
+    assert_eq!(
+        endpoint.try_freeze_ttl_configs().unwrap_err().unwrap(),
+        TtlConfigurableError::TtlConfigAlreadyFrozen.into()
+    );
 }
 
 #[test]

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/endpoint_v2/verifiable.rs

@@ -146,7 +146,6 @@ fn test_verifiable_upper_bound_is_enforced_when_inbound_nonce_nonzero() {
     assert!(!endpoint_client.verifiable(&too_far, &receiver));
 }
 
-
 #[test]
 fn test_verifiable_true_when_payload_hash_exists_even_if_nonce_outside_window() {
     let context = setup();

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/message_lib_manager/require_receive_lib_for_eid.rs

@@ -11,7 +11,9 @@ fn test_require_receive_lib_for_eid_unregistered_lib() {
     let endpoint_client = &context.endpoint_client;
 
     let lib = context.setup_mock_message_lib(MessageLibType::Receive, vec![env, context.eid]);
-    env.as_contract(&endpoint_client.address, || EndpointV2::require_receive_lib_for_eid_for_test(env, &lib, context.eid));
+    env.as_contract(&endpoint_client.address, || {
+        EndpointV2::require_receive_lib_for_eid_for_test(env, &lib, context.eid)
+    });
 }
 
 #[test]
@@ -24,7 +26,9 @@ fn test_require_receive_lib_for_eid_wrong_lib_type() {
     let lib = context.setup_mock_message_lib(MessageLibType::Send, vec![env, context.eid]);
     context.register_library_with_auth(&lib);
 
-    env.as_contract(&endpoint_client.address, || EndpointV2::require_receive_lib_for_eid_for_test(env, &lib, context.eid));
+    env.as_contract(&endpoint_client.address, || {
+        EndpointV2::require_receive_lib_for_eid_for_test(env, &lib, context.eid)
+    });
 }
 
 #[test]
@@ -38,7 +42,9 @@ fn test_require_receive_lib_for_eid_unsupported_eid() {
     let lib = context.setup_mock_message_lib(MessageLibType::Receive, vec![env, context.eid]);
     context.register_library_with_auth(&lib);
 
-    env.as_contract(&endpoint_client.address, || EndpointV2::require_receive_lib_for_eid_for_test(env, &lib, unsupported_eid));
+    env.as_contract(&endpoint_client.address, || {
+        EndpointV2::require_receive_lib_for_eid_for_test(env, &lib, unsupported_eid)
+    });
 }
 
 #[test]

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/message_lib_manager/require_send_lib_for_eid.rs

@@ -38,7 +38,9 @@ fn test_require_send_lib_for_eid_unsupported_eid() {
     let lib = context.setup_mock_message_lib(MessageLibType::Send, vec![env, context.eid]);
     context.register_library_with_auth(&lib);
 
-    env.as_contract(&endpoint_client.address, || EndpointV2::require_send_lib_for_eid_for_test(env, &lib, unsupported_eid));
+    env.as_contract(&endpoint_client.address, || {
+        EndpointV2::require_send_lib_for_eid_for_test(env, &lib, unsupported_eid)
+    });
 }
 
 #[test]
@@ -49,7 +51,9 @@ fn test_require_send_lib_for_eid_success_for_send_and_send_and_receive() {
 
     let send_lib = context.setup_mock_message_lib(MessageLibType::Send, vec![env, context.eid]);
     context.register_library_with_auth(&send_lib);
-    env.as_contract(&endpoint_client.address, || EndpointV2::require_send_lib_for_eid_for_test(env, &send_lib, context.eid));
+    env.as_contract(&endpoint_client.address, || {
+        EndpointV2::require_send_lib_for_eid_for_test(env, &send_lib, context.eid)
+    });
 
     let send_and_receive = context.setup_mock_message_lib(MessageLibType::SendAndReceive, vec![env, context.eid]);
     context.register_library_with_auth(&send_and_receive);

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/message_lib_manager/require_supported_eid.rs

@@ -10,7 +10,9 @@ fn test_require_supported_eid_with_supported() {
     let endpoint_client = &context.endpoint_client;
 
     let send_lib = context.setup_mock_message_lib(MessageLibType::Send, vec![env, context.eid]);
-    env.as_contract(&endpoint_client.address, || EndpointV2::require_supported_eid_for_test(env, &send_lib, context.eid));
+    env.as_contract(&endpoint_client.address, || {
+        EndpointV2::require_supported_eid_for_test(env, &send_lib, context.eid)
+    });
 }
 
 // The require_supported_eid rejects when the library does not support the EID
@@ -23,7 +25,9 @@ fn test_require_supported_eid_with_unsupported() {
 
     let unsupported_eid = context.eid + 1;
     let send_lib = context.setup_mock_message_lib(MessageLibType::Send, vec![env, context.eid]);
-    env.as_contract(&endpoint_client.address, || EndpointV2::require_supported_eid_for_test(env, &send_lib, unsupported_eid));
+    env.as_contract(&endpoint_client.address, || {
+        EndpointV2::require_supported_eid_for_test(env, &send_lib, unsupported_eid)
+    });
 }
 
 // The require_supported_eid panics if the library address has no deployed contract

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/messaging_channel/clear_payload.rs

@@ -239,10 +239,7 @@ fn test_clear_payload_missing_intermediate_nonce() {
 
     // inbound_nonce should be 1 (nonce 2 is missing), and nonce 3 should be pending.
     assert_eq!(endpoint_client.inbound_nonce(&receiver, &src_eid, &sender), 1);
-    assert_eq!(
-        endpoint_client.pending_inbound_nonces(&receiver, &src_eid, &sender),
-        soroban_sdk::vec![env, 3u64]
-    );
+    assert_eq!(endpoint_client.pending_inbound_nonces(&receiver, &src_eid, &sender), soroban_sdk::vec![env, 3u64]);
 
     // Clearing nonce 1 succeeds.
     clear_payload(&context, &receiver, src_eid, &sender, 1, &payload1);

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/messaging_channel/inbound.rs

@@ -191,10 +191,7 @@ fn test_inbound_accepts_upper_bound_when_inbound_nonce_nonzero() {
 
     // Nonce 356 is not consecutive to 100, so it stays pending and inbound_nonce does not advance.
     assert_eq!(endpoint_client.inbound_nonce(&receiver, &src_eid, &sender), 100);
-    assert_eq!(
-        endpoint_client.pending_inbound_nonces(&receiver, &src_eid, &sender),
-        soroban_sdk::vec![env, 356u64]
-    );
+    assert_eq!(endpoint_client.pending_inbound_nonces(&receiver, &src_eid, &sender), soroban_sdk::vec![env, 356u64]);
     assert_eq!(endpoint_client.inbound_payload_hash(&receiver, &src_eid, &sender, &356u64), Some(hash));
 }
 

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/messaging_channel/nilify.rs

@@ -193,24 +193,15 @@ fn test_nilify_closes_gap_and_drains_pending_nonces() {
     });
 
     assert_eq!(endpoint_client.inbound_nonce(&receiver, &src_eid, &sender), 1);
-    assert_eq!(
-        endpoint_client.pending_inbound_nonces(&receiver, &src_eid, &sender),
-        soroban_sdk::vec![env, 3u64]
-    );
+    assert_eq!(endpoint_client.pending_inbound_nonces(&receiver, &src_eid, &sender), soroban_sdk::vec![env, 3u64]);
 
     // Nilify nonce 2 with None closes the gap and should drain pending to advance inbound nonce to 3.
     nilify_with_auth(&context, &receiver, &receiver, src_eid, &sender, 2u64, &None);
 
     assert_eq!(endpoint_client.inbound_nonce(&receiver, &src_eid, &sender), 3);
     assert!(endpoint_client.pending_inbound_nonces(&receiver, &src_eid, &sender).is_empty());
-    assert_eq!(
-        endpoint_client.inbound_payload_hash(&receiver, &src_eid, &sender, &2u64),
-        Some(nil_hash(&context))
-    );
-    assert_eq!(
-        endpoint_client.inbound_payload_hash(&receiver, &src_eid, &sender, &3u64),
-        Some(payload_hash_3)
-    );
+    assert_eq!(endpoint_client.inbound_payload_hash(&receiver, &src_eid, &sender, &2u64), Some(nil_hash(&context)));
+    assert_eq!(endpoint_client.inbound_payload_hash(&receiver, &src_eid, &sender, &3u64), Some(payload_hash_3));
 }
 
 // Nilify is allowed when nonce <= inbound_nonce if an `inbound_payload_hash` exists

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/messaging_channel/pending_inbound_nonces.rs

@@ -108,4 +108,3 @@ fn test_pending_inbound_nonces_isolated_by_path() {
     assert_eq!(endpoint_client.pending_inbound_nonces(&receiver_a, &src_eid_b, &sender_a), vec![env, 2u64]);
     assert_eq!(endpoint_client.pending_inbound_nonces(&receiver_a, &src_eid_a, &sender_b), vec![env, 2u64]);
 }
-

package/{contracts/endpoint-v2 → endpoint-v2}/src/tests/messaging_composer/lz_compose_alert.rs

@@ -40,6 +40,7 @@ fn default_fixture(env: &Env) -> LzComposeAlertFixture {
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 fn invoke_lz_compose_alert_with_auth<'a>(
     context: &TestSetup,
     endpoint_client: &EndpointV2Client<'a>,

package/{contracts/layerzero-views → layerzero-views}/Cargo.toml

@@ -2,7 +2,6 @@
 name = "layerzero-views"
 version.workspace = true
 edition.workspace = true
-license.workspace = true
 publish = false
 
 [lib]
@@ -11,11 +10,7 @@ doctest = false
 
 [features]
 library = []
-testutils = []
-# Network selection
-mainnet = []
-testnet = []
-sandbox = []
+testutils = ["soroban-sdk/testutils"]
 
 [dependencies]
 soroban-sdk = { workspace = true }

package/{contracts/message-libs → message-libs}/blocked-message-lib/Cargo.toml

@@ -2,7 +2,6 @@
 name = "blocked-message-lib"
 version.workspace = true
 edition.workspace = true
-license.workspace = true
 publish = false
 
 [lib]

package/{contracts/message-libs → message-libs}/message-lib-common/Cargo.toml

@@ -2,14 +2,14 @@
 name = "message-lib-common"
 version.workspace = true
 edition.workspace = true
-license.workspace = true
+publish = false
 
 [lib]
 crate-type = ["rlib"]
 doctest = false
 
 [features]
-testutils = []
+testutils = ["soroban-sdk/testutils"]
 
 [dependencies]
 soroban-sdk = { workspace = true }

package/{contracts/message-libs → message-libs}/simple-message-lib/Cargo.toml

@@ -2,7 +2,6 @@
 name = "simple-message-lib"
 version.workspace = true
 edition.workspace = true
-license.workspace = true
 publish = false
 
 [lib]
@@ -11,7 +10,7 @@ doctest = false
 
 [features]
 library = []
-testutils = []
+testutils = ["soroban-sdk/testutils"]
 
 [dependencies]
 cfg-if = { workspace = true }

package/{contracts/message-libs → message-libs}/treasury/Cargo.toml

@@ -2,7 +2,6 @@
 name = "treasury"
 version.workspace = true
 edition.workspace = true
-license.workspace = true
 publish = false
 
 [lib]
@@ -11,7 +10,7 @@ doctest = false
 
 [features]
 library = []
-testutils = []
+testutils = ["soroban-sdk/testutils"]
 
 [dependencies]
 cfg-if = { workspace = true }

package/{contracts/message-libs → message-libs}/uln-302/Cargo.toml

@@ -2,7 +2,6 @@
 name = "uln302"
 version.workspace = true
 edition.workspace = true
-license.workspace = true
 publish = false
 
 [lib]
@@ -11,7 +10,7 @@ doctest = false
 
 [features]
 library = []
-testutils = []
+testutils = ["soroban-sdk/testutils"]
 
 [dependencies]
 cfg-if = { workspace = true }
@@ -23,6 +22,8 @@ endpoint-v2 = { workspace = true, features = ["library"] }
 message-lib-common = { workspace = true }
 
 [dev-dependencies]
+# self-dep to enable this crate's `testutils` for its own test build
+uln302 = { path = ".", features = ["testutils"] }
 soroban-sdk = { workspace = true, features = ["testutils"] }
 endpoint-v2 = { workspace = true, features = ["testutils"] }
 message-lib-common = { workspace = true, features = ["testutils"] }

package/{contracts/message-libs → message-libs}/uln-302/src/tests/send_uln302/send.rs

@@ -76,8 +76,16 @@ fn test_send_events_emittance() {
         &setup.env,
         &setup.uln302.address,
         &[
-            &ExecutorFeePaid {  guid: packet.guid.clone(),executor: executor.clone(), fee: native_fee_recipients.get(0).unwrap().clone() },
-            &DVNFeePaid { guid: packet.guid.clone(),dvns: dvns.slice(0..2).clone(), fees: native_fee_recipients.slice(1..3).clone() },
+            &ExecutorFeePaid {
+                guid: packet.guid.clone(),
+                executor: executor.clone(),
+                fee: native_fee_recipients.get(0).unwrap().clone(),
+            },
+            &DVNFeePaid {
+                guid: packet.guid.clone(),
+                dvns: dvns.slice(0..2).clone(),
+                fees: native_fee_recipients.slice(1..3).clone(),
+            },
         ],
     );
 
@@ -164,8 +172,16 @@ fn test_send_events_emittance_with_zro() {
         &setup.env,
         &setup.uln302.address,
         &[
-            &ExecutorFeePaid {  guid: packet.guid.clone(), executor: executor.clone(), fee: native_fee_recipients.get(0).unwrap().clone() },
-            &DVNFeePaid { guid: packet.guid.clone(), dvns: dvns.slice(0..2).clone(), fees: native_fee_recipients.slice(1..3).clone() },
+            &ExecutorFeePaid {
+                guid: packet.guid.clone(),
+                executor: executor.clone(),
+                fee: native_fee_recipients.get(0).unwrap().clone(),
+            },
+            &DVNFeePaid {
+                guid: packet.guid.clone(),
+                dvns: dvns.slice(0..2).clone(),
+                fees: native_fee_recipients.slice(1..3).clone(),
+            },
         ],
     );
 

package/{contracts/message-libs → message-libs}/uln-302/src/tests/uln302/get_app_receive_uln_config.rs

@@ -34,8 +34,8 @@ fn test_get_oapp_receive_uln_config() {
     endpoint.set_config(&Address::generate(&env), &oapp, &uln302.address, &params);
 
     let oapp_config = uln302.oapp_receive_uln_config(&oapp, &eid).unwrap();
-    assert_eq!(oapp_config.use_default_confirmations, true);
-    assert_eq!(oapp_config.use_default_required_dvns, false);
+    assert!(oapp_config.use_default_confirmations);
+    assert!(!oapp_config.use_default_required_dvns);
 }
 
 #[test]

package/package.json

@@ -1,15 +1,26 @@
 {
   "name": "@layerzerolabs/protocol-stellar-v2",
-  "version": "0.2.121",
+  "version": "0.2.123",
   "private": false,
   "license": "LZBL-1.3",
+  "files": [
+    "endpoint-v2",
+    "layerzero-views",
+    "message-libs",
+    "upgrader",
+    "workers",
+    "Cargo.toml",
+    "rust-toolchain.toml",
+    "rustfmt.toml",
+    "clippy.toml"
+  ],
+  "dependencies": {
+    "@layerzerolabs/common-utils-macros-stellar-contracts": "0.2.123",
+    "@layerzerolabs/common-utils-stellar-contracts": "0.2.123"
+  },
   "devDependencies": {
-    "@types/node": "^22.18.6",
-    "tsx": "^4.21.0",
-    "typescript": "^5.8.2",
-    "@layerzerolabs/common-node-utils": "0.2.121",
-    "@layerzerolabs/vm-tooling-stellar": "0.2.121",
-    "@layerzerolabs/stellar-ts-bindings-gen": "0.2.121"
+    "@layerzerolabs/build-utils-rust": "0.2.123",
+    "@layerzerolabs/vm-tooling-stellar": "0.2.123"
   },
   "publishConfig": {
     "access": "public",
@@ -23,16 +34,22 @@
       "onesig-client"
     ]
   },
+  "implicitDependencies": {
+    "@layerzerolabs/common-utils-stellar-contracts": "workspace:*",
+    "@layerzerolabs/common-utils-macros-stellar-contracts": "workspace:*"
+  },
   "scripts": {
-    "build": "pnpm build:contracts && pnpm generate:sdk",
-    "build:contracts": "pnpm exec lz-tool stellar contract build",
-    "build:contracts:native": "pnpm exec lz-tool --docker-platform native stellar contract build",
-    "build:native": "pnpm build:contracts:native && pnpm generate:sdk",
+    "build": "pnpm build:contracts",
+    "build:contracts": "pnpm resolve-dependencies && pnpm exec lz-tool stellar contract build",
+    "build:contracts:native": "pnpm resolve-dependencies && pnpm exec lz-tool --docker-platform native stellar contract build",
+    "build:native": "pnpm build:contracts:native",
+    "clean": "rm -rf ./dependencies ./target ./node_modules",
     "format": "pnpm exec lz-tool --script \"cargo fmt\" stellar",
-    "generate:sdk": "stellar-ts-bindings-gen --config ts-bindings-gen.toml",
-    "lint": "pnpm exec lz-tool --script \"cargo clippy -- -D warnings\" stellar",
-    "lint:fix": "pnpm exec lz-tool --script \"cargo clippy --fix --allow-dirty --allow-staged && cargo fmt\" stellar",
-    "test": "pnpm exec lz-tool --script \"cargo nextest run\" stellar",
+    "format:check": "pnpm exec lz-tool --script \"cargo fmt -- --check\" stellar",
+    "lint": "pnpm resolve-dependencies && pnpm exec lz-tool --script \"cargo fmt -- --check && cargo clippy --all-targets -- -D warnings\" stellar",
+    "lint:fix": "pnpm resolve-dependencies && pnpm exec lz-tool --script \"cargo clippy --all-targets --fix --allow-dirty --allow-staged && cargo fmt\" stellar",
+    "resolve-dependencies": "pnpm exec build-utils-rust resolve",
+    "test": "pnpm resolve-dependencies && pnpm exec lz-tool --script \"cargo nextest run\" stellar",
     "test:snapshot:check": "pnpm exec turbo-snapshot check",
     "test:snapshot:update": "pnpm exec turbo-snapshot update"
   }

package/rustfmt.toml

@@ -1,17 +1,12 @@
-
-format_macro_bodies = true
+# Only stable rustfmt options are kept here: the Stellar docker toolchain runs
+# rustfmt on the stable channel (rust 1.90.0), which silently drops unstable
+# options (they only apply on nightly). Do not re-add unstable options unless the
+# tooling is switched to a pinned nightly (see the Solana packages for that setup).
 max_width = 120
-format_macro_matchers = true
-format_strings = true
-imports_granularity = "Crate"
-match_arm_blocks = false
-reorder_impl_items = true
-group_imports = "StdExternalCrate"
 use_field_init_shorthand = true
 use_small_heuristics = "Max"
-wrap_comments = true
-format_code_in_doc_comments = true
-
-# most of these are unstable, so we enable them
-unstable_features = true
 
+# style_edition is a stable option honored by the docker toolchain. Pin it to
+# 2021 to match every crate's `edition = "2021"` so formatting stays stable
+# across rustfmt versions (setting it to 2024 would reformat the code).
+style_edition = "2021"

package/{contracts/upgrader → upgrader}/Cargo.toml

@@ -2,7 +2,6 @@
 name = "upgrader"
 version.workspace = true
 edition.workspace = true
-license.workspace = true
 publish = false
 
 [lib]

package/upgrader/src/tests/mod.rs

@@ -0,0 +1 @@
+pub mod test_upgrader;

package/{contracts/workers → workers}/dvn/Cargo.toml

@@ -2,12 +2,11 @@
 name = "dvn"
 version.workspace = true
 edition.workspace = true
-license.workspace = true
 publish = false
 
 [features]
 library = []
-testutils = []
+testutils = ["soroban-sdk/testutils"]
 
 [lib]
 crate-type = ["cdylib", "rlib"]