@layerzerolabs/common-utils-stellar-contracts 0.2.122 → 0.2.123

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/common-utils-stellar-contracts",
-  "version": "0.2.122",
+  "version": "0.2.123",
   "private": false,
   "license": "MIT",
   "files": [
@@ -11,11 +11,11 @@
     "clippy.toml"
   ],
   "dependencies": {
-    "@layerzerolabs/common-utils-macros-stellar-contracts": "0.2.122"
+    "@layerzerolabs/common-utils-macros-stellar-contracts": "0.2.123"
   },
   "devDependencies": {
-    "@layerzerolabs/build-utils-rust": "0.2.122",
-    "@layerzerolabs/vm-tooling-stellar": "0.2.122"
+    "@layerzerolabs/vm-tooling-stellar": "0.2.123",
+    "@layerzerolabs/build-utils-rust": "0.2.123"
   },
   "publishConfig": {
     "access": "public",
@@ -36,7 +36,9 @@
     "build": "pnpm resolve-dependencies && pnpm exec lz-tool --script \"cargo build\" stellar",
     "clean": "rm -rf ./dependencies ./target ./node_modules",
     "format": "pnpm exec lz-tool --script \"cargo fmt\" stellar",
-    "lint": "pnpm resolve-dependencies && pnpm exec lz-tool --script \"cargo clippy -- -D warnings\" 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 --features testutils\" stellar"
   }

package/rustfmt.toml

@@ -1,15 +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/src/testing_utils.rs

@@ -19,11 +19,9 @@ use soroban_sdk::{testutils::Events, xdr, Address, Env, Event, TryFromVal, Val,
 /// }
 /// ```
 pub fn decode_event_topics_data(env: &Env, event: &xdr::ContractEvent) -> Option<(Vec<Val>, Val)> {
-    // In the current Soroban SDK version this is always `V0`.
-    // Using a single-variant match avoids "irrefutable let-else" warnings.
-    let v0 = match &event.body {
-        xdr::ContractEventBody::V0(v0) => v0,
-    };
+    // In the current Soroban SDK version this enum has a single variant (`V0`),
+    // so this destructure is infallible.
+    let xdr::ContractEventBody::V0(v0) = &event.body;
 
     let mut topics = Vec::<Val>::new(env);
     for t in v0.topics.iter() {
@@ -120,7 +118,6 @@ pub fn assert_contains_event<E: Event>(env: &Env, contract: &Address, expected:
 ///     &Event2 { ... },
 /// ]);
 /// ```
-
 pub fn assert_eq_events(env: &Env, contract: &Address, expected_events: &[&dyn Event]) {
     // Note: this module is only compiled for tests / testutils usage, where `std` is available.
     extern crate std;
@@ -143,7 +140,6 @@ pub fn assert_eq_events(env: &Env, contract: &Address, expected_events: &[&dyn E
 ///     &Event2 { ... },
 /// ]);
 /// ```
-
 pub fn assert_contains_events(env: &Env, contract: &Address, expected_events: &[&dyn Event]) {
     // Note: this module is only compiled for tests / testutils usage, where `std` is available.
     extern crate std;

package/src/tests/buffer_writer.rs

@@ -303,7 +303,7 @@ fn test_write_primitives_roundtrip() {
         .write_u16(0x3456)
         .write_u32(0x789ABCDE)
         .write_u64(0x0102030405060708)
-        .write_u128(0x10111213141516171819_1a1b1c1d1e1f);
+        .write_u128(0x1011_1213_1415_1617_1819_1a1b_1c1d_1e1f);
 
     let bytes = writer.to_bytes();
     // 1 + 2 + 4 + 8 + 16 = 31
@@ -315,7 +315,7 @@ fn test_write_primitives_roundtrip() {
     assert_eq!(reader.read_u16(), 0x3456);
     assert_eq!(reader.read_u32(), 0x789ABCDE);
     assert_eq!(reader.read_u64(), 0x0102030405060708);
-    assert_eq!(reader.read_u128(), 0x10111213141516171819_1a1b1c1d1e1f);
+    assert_eq!(reader.read_u128(), 0x1011_1213_1415_1617_1819_1a1b_1c1d_1e1f);
 }
 
 #[test]

package/src/tests/bytes_ext.rs

@@ -86,8 +86,8 @@ fn test_to_array_boundary_values() {
     let data: [u8; 10] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
     let bytes = Bytes::from_array(&env, &data);
     let arr: [u8; 10] = bytes.to_array();
-    for i in 0..10 {
-        assert_eq!(arr[i], i as u8);
+    for (i, value) in arr.iter().enumerate() {
+        assert_eq!(*value, i as u8);
     }
 }
 
@@ -154,7 +154,7 @@ fn test_to_array_preserves_all_values() {
     let bytes = Bytes::from_array(&env, &data);
     let arr: [u8; 256] = bytes.to_array();
 
-    for i in 0..256 {
-        assert_eq!(arr[i], i as u8, "Mismatch at index {}", i);
+    for (i, value) in arr.iter().enumerate() {
+        assert_eq!(*value, i as u8, "Mismatch at index {}", i);
     }
 }

package/src/tests/multisig.rs

@@ -712,8 +712,8 @@ fn recover_signer_invalid_r_zero_fails() {
     let mut sig_bytes = [0u8; 65];
     // r = 0 (bytes 0-31 already 0)
     // s = some non-zero value (bytes 32-63)
-    for i in 32..64 {
-        sig_bytes[i] = 1;
+    for value in sig_bytes.iter_mut().take(64).skip(32) {
+        *value = 1;
     }
     sig_bytes[64] = 27; // v
     let signature = BytesN::from_array(&env, &sig_bytes);
@@ -732,8 +732,8 @@ fn recover_signer_invalid_s_zero_fails() {
     // Signature with s=0 (invalid for secp256k1)
     let mut sig_bytes = [0u8; 65];
     // r = some non-zero value (bytes 0-31)
-    for i in 0..32 {
-        sig_bytes[i] = 1;
+    for value in sig_bytes.iter_mut().take(32) {
+        *value = 1;
     }
     // s = 0 (bytes 32-63 already 0)
     sig_bytes[64] = 27; // v

package/src/tests/testing_utils.rs

@@ -239,16 +239,14 @@ fn test_decode_event_topics_data_roundtrip() {
     assert_eq!(raw.len(), 1);
 
     let event = &raw[0];
-    let v0 = match &event.body {
-        xdr::ContractEventBody::V0(v0) => v0,
-    };
+    let xdr::ContractEventBody::V0(v0) = &event.body;
 
     let (topics, data) = decode_event_topics_data(&env, event).expect("event should decode");
 
     // `Val` doesn't implement `PartialEq` in this SDK version, so compare by converting back to XDR.
     let topics_xdr: std::vec::Vec<xdr::ScVal> =
         topics.iter().map(|t| xdr::ScVal::try_from_val(&env, &t).expect("topic Val must convert to XDR")).collect();
-    assert_eq!(topics_xdr.len(), v0.topics.len() as usize);
+    assert_eq!(topics_xdr.len(), v0.topics.len());
     for (i, t) in v0.topics.iter().enumerate() {
         assert_eq!(topics_xdr[i], *t);
     }

package/src/tests/upgradeable.rs

@@ -368,7 +368,7 @@ fn test_upgrade_success() {
 
     env.as_contract(&contract_id, || {
         // Initially, migrating flag should be false (default)
-        assert_eq!(UpgradeableStorage::migrating(&env), false);
+        assert!(!UpgradeableStorage::migrating(&env));
     });
 
     // Call the actual upgrade function with valid WASM hash
@@ -377,7 +377,7 @@ fn test_upgrade_success() {
 
     env.as_contract(&contract_id, || {
         // Verify the flag is set by upgrade()
-        assert_eq!(UpgradeableStorage::migrating(&env), true);
+        assert!(UpgradeableStorage::migrating(&env));
     });
 }
 
@@ -412,7 +412,7 @@ fn test_migrate_success() {
 
     env.as_contract(&contract_id, || {
         // Verify migration flag was cleared
-        assert_eq!(UpgradeableStorage::migrating(&env), false);
+        assert!(!UpgradeableStorage::migrating(&env));
 
         // Verify migration data was stored (proving __migrate was called)
         let stored_value: Option<bool> = env.storage().instance().get(&Symbol::new(&env, "migrated"));
@@ -431,7 +431,7 @@ fn test_migrate_requires_auth() {
     // Set the migrating flag so we know failure is due to auth, not MigrationNotAllowed.
     env.as_contract(&contract_id, || {
         UpgradeableStorage::set_migrating(&env, &true);
-        assert_eq!(UpgradeableStorage::migrating(&env), true);
+        assert!(UpgradeableStorage::migrating(&env));
     });
 
     let migration_data = Val::VOID.to_xdr(&env);
@@ -448,7 +448,7 @@ fn test_migrate_rejects_invalid_migration_data_and_does_not_clear_flag() {
     // Allow migrate (so we hit the decode path rather than MigrationNotAllowed).
     env.as_contract(&contract_id, || {
         UpgradeableStorage::set_migrating(&env, &true);
-        assert_eq!(UpgradeableStorage::migrating(&env), true);
+        assert!(UpgradeableStorage::migrating(&env));
     });
 
     // Valid XDR, but not a u32 payload => should fail decoding in Upgradeable::migrate.
@@ -458,7 +458,7 @@ fn test_migrate_rejects_invalid_migration_data_and_does_not_clear_flag() {
 
     // Since migration failed before reaching the "clear flag" line, migrating should still be true.
     env.as_contract(&contract_id, || {
-        assert_eq!(UpgradeableStorage::migrating(&env), true);
+        assert!(UpgradeableStorage::migrating(&env));
     });
 }
 
@@ -476,7 +476,7 @@ fn test_can_upgrade_and_migrate_multiple_times() {
     client.upgrade(&wasm_hash);
     client.migrate(&migration_data);
     env.as_contract(&contract_id, || {
-        assert_eq!(UpgradeableStorage::migrating(&env), false);
+        assert!(!UpgradeableStorage::migrating(&env));
         let stored_value: Option<bool> = env.storage().instance().get(&Symbol::new(&env, "migrated"));
         assert_eq!(stored_value, Some(true));
     });
@@ -485,7 +485,7 @@ fn test_can_upgrade_and_migrate_multiple_times() {
     client.upgrade(&wasm_hash);
     client.migrate(&migration_data);
     env.as_contract(&contract_id, || {
-        assert_eq!(UpgradeableStorage::migrating(&env), false);
+        assert!(!UpgradeableStorage::migrating(&env));
         let stored_value: Option<bool> = env.storage().instance().get(&Symbol::new(&env, "migrated"));
         assert_eq!(stored_value, Some(true));
     });