fix: rust fmt, batch syntax error, k6 json import, ios workspace, kotlin patch

- Run cargo fmt across all contracts: fixes formatting diffs that were
  causing cargo fmt --check to fail in CI (access_control, api, batch,
  credit, metering, oracle, proxy, security, subscription modules)
- Remove stray match arm in contracts/batch/src/lib.rs:264 that had
  drifted outside any match expression, causing a compile-time parse
  error and blocking cargo fmt from processing the file
- Fix k6 baseline JSON import: ES module import of .json files is
  evaluated as JavaScript source by Goja, failing at string-keyed
  properties. Use JSON.parse(open()) instead, which is the correct
  k6 API for reading files in the init phase
- Fix Detox iOS workspace case: expo prebuild generates SubTrackr.xcworkspace
  from the app name field but .detoxrc.js was pointing to subtrackr
  (lowercase), causing xcodebuild to report the workspace does not exist
- Strengthen e2e Kotlin patch: the previous sed on android/build.gradle
  did not reach the four expo Gradle included builds which each declare
  their own kotlin("jvm") version "1.9.24" independently. Patch all four
  node_modules plugin build.gradle.kts files directly before Gradle runs

Author: sweetesty

.detoxrc.js

@@ -18,13 +18,13 @@ module.exports = {
       type: 'ios.app',
       binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/SubTrackr.app',
       build:
-        'xcodebuild -workspace ios/subtrackr.xcworkspace -scheme subtrackr -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build',
+        'xcodebuild -workspace ios/SubTrackr.xcworkspace -scheme SubTrackr -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build',
     },
     'ios.release': {
       type: 'ios.app',
       binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/SubTrackr.app',
       build:
-        'xcodebuild -workspace ios/subtrackr.xcworkspace -scheme subtrackr -configuration Release -sdk iphonesimulator -derivedDataPath ios/build',
+        'xcodebuild -workspace ios/SubTrackr.xcworkspace -scheme SubTrackr -configuration Release -sdk iphonesimulator -derivedDataPath ios/build',
     },
     'android.debug': {
       type: 'android.apk',

.github/workflows/e2e-detox.yml

@@ -82,13 +82,20 @@ jobs:
           java-version: '17'
       - name: Expo Prebuild
         run: npx expo prebuild -p android
-      - name: Patch Kotlin version for React Native 0.85 compatibility
+      - name: Patch Kotlin 1.9 to 2.1.20 in expo Gradle included builds
         run: |
-          if [ -f android/build.gradle ]; then
-            sed -i 's/kotlinVersion = "1\.[0-9][^"]*"/kotlinVersion = "2.1.20"/' android/build.gradle
-            echo "android/build.gradle kotlinVersion after patch:"
-            grep "kotlinVersion" android/build.gradle || echo "(not found)"
-          fi
+          for f in \
+            node_modules/expo-dev-launcher/expo-dev-launcher-gradle-plugin/build.gradle.kts \
+            node_modules/expo-modules-autolinking/android/expo-gradle-plugin/build.gradle.kts \
+            node_modules/expo-modules-autolinking/android/expo-gradle-plugin/expo-autolinking-plugin-shared/build.gradle.kts \
+            node_modules/expo-modules-core/expo-module-gradle-plugin/build.gradle.kts; do
+            if [ -f "$f" ]; then
+              sed -i 's/version "1\.[0-9][^"]*"/version "2.1.20"/g' "$f"
+              echo "Patched $f: $(grep -E 'version \"[0-9]' $f | head -2)"
+            fi
+          done
+          [ -f android/build.gradle ] && \
+            sed -i 's/kotlinVersion = "1\.[0-9][^"]*"/kotlinVersion = "2.1.20"/' android/build.gradle || true
       - name: Build Detox Android
         run: npm run e2e:build-android
       - name: Detox Android — core lifecycle

contracts/access_control/src/lib.rs

@@ -2,7 +2,9 @@
 
 mod roles;
 
-use roles::{contains_permission, role_permissions, DataKey, Delegation, MultisigAction, MultisigProposal};
+use roles::{
+    contains_permission, role_permissions, DataKey, Delegation, MultisigAction, MultisigProposal,
+};
 use soroban_sdk::{contract, contractimpl, Address, Env, Symbol, Vec};
 use subtrackr_types::{Permission, Role, RoleChangeAction, RoleChangeEntry};
 
@@ -41,7 +43,10 @@ fn save_role_change(
 }
 
 fn get_user_permissions(env: &Env, user: &Address) -> Vec<Permission> {
-    let roles_opt: Option<Vec<Role>> = env.storage().instance().get(&DataKey::UserRoles(user.clone()));
+    let roles_opt: Option<Vec<Role>> = env
+        .storage()
+        .instance()
+        .get(&DataKey::UserRoles(user.clone()));
     let mut all_perms: Vec<Permission> = Vec::new(env);
 
     if let Some(roles) = roles_opt {
@@ -108,7 +113,13 @@ impl RoleManager {
             .instance()
             .set(&DataKey::MultisigProposalCount, &0u64);
 
-        save_role_change(&env, &admin, &Role::Admin, RoleChangeAction::Granted, &admin);
+        save_role_change(
+            &env,
+            &admin,
+            &Role::Admin,
+            RoleChangeAction::Granted,
+            &admin,
+        );
 
         env.events().publish(
             (Symbol::new(&env, "access_control_initialized"),),
@@ -157,18 +168,10 @@ impl RoleManager {
             .instance()
             .set(&DataKey::UserRoles(user.clone()), &user_roles);
 
-        save_role_change(
-            &env,
-            &user,
-            &role,
-            RoleChangeAction::Granted,
-            &caller,
-        );
+        save_role_change(&env, &user, &role, RoleChangeAction::Granted, &caller);
 
-        env.events().publish(
-            (Symbol::new(&env, "role_granted"),),
-            (caller, user, role),
-        );
+        env.events()
+            .publish((Symbol::new(&env, "role_granted"),), (caller, user, role));
     }
 
     pub fn revoke_role(env: Env, caller: Address, user: Address, role: Role) {
@@ -273,22 +276,15 @@ impl RoleManager {
             }
         }
 
-        save_role_change(
-            &env,
-            &user,
-            &role,
-            RoleChangeAction::Revoked,
-            &caller,
-        );
+        save_role_change(&env, &user, &role, RoleChangeAction::Revoked, &caller);
 
-        env.events().publish(
-            (Symbol::new(&env, "role_revoked"),),
-            (caller, user, role),
-        );
+        env.events()
+            .publish((Symbol::new(&env, "role_revoked"),), (caller, user, role));
     }
 
     pub fn has_permission(env: Env, user: Address, permission: Permission) -> bool {
-        if env.storage()
+        if env
+            .storage()
             .instance()
             .get::<_, bool>(&DataKey::EmergencyPaused)
             .unwrap_or(false)
@@ -367,10 +363,7 @@ impl RoleManager {
             "Unauthorized: missing DelegatePermission"
         );
 
-        let expires_at = env
-            .ledger()
-            .timestamp()
-            .saturating_add(duration_secs);
+        let expires_at = env.ledger().timestamp().saturating_add(duration_secs);
 
         let delegation = Delegation {
             delegator: delegator.clone(),
@@ -388,7 +381,12 @@ impl RoleManager {
         );
     }
 
-    pub fn revoke_delegation(env: Env, delegator: Address, delegate: Address, permission: Permission) {
+    pub fn revoke_delegation(
+        env: Env,
+        delegator: Address,
+        delegate: Address,
+        permission: Permission,
+    ) {
         delegator.require_auth();
 
         let key = DataKey::Delegation(delegate.clone(), permission.clone());
@@ -490,11 +488,7 @@ impl RoleManager {
         entries
     }
 
-    pub fn propose_multisig_action(
-        env: Env,
-        proposer: Address,
-        action: MultisigAction,
-    ) -> u64 {
+    pub fn propose_multisig_action(env: Env, proposer: Address, action: MultisigAction) -> u64 {
         proposer.require_auth();
         assert!(
             !env.storage()
@@ -605,10 +599,7 @@ impl RoleManager {
         );
 
         let now = env.ledger().timestamp();
-        assert!(
-            now >= proposal.execute_after,
-            "Timelock not yet elapsed"
-        );
+        assert!(now >= proposal.execute_after, "Timelock not yet elapsed");
 
         match proposal.action {
             MultisigAction::SetEmergencyAdmin(ref new_admin) => {

contracts/api/src/auth.rs

@@ -107,19 +107,12 @@ pub fn revoke_api_key(env: &Env, caller: Address, key_id: ApiKeyId, now: u64) {
 
     key.status = ApiKeyStatus::Revoked;
     key.revoked_at = now;
-    env.storage()
-        .instance()
-        .set(&DataKey::ApiKey(key_id), &key);
+    env.storage().instance().set(&DataKey::ApiKey(key_id), &key);
 
     log_audit(env, key_id, String::from_str(env, "revoked"), caller, now);
 }
 
-pub fn rotate_api_key(
-    env: &Env,
-    caller: Address,
-    key_id: ApiKeyId,
-    now: u64,
-) -> Bytes {
+pub fn rotate_api_key(env: &Env, caller: Address, key_id: ApiKeyId, now: u64) -> Bytes {
     let mut key: ApiKey = env
         .storage()
         .instance()
@@ -135,9 +128,7 @@ pub fn rotate_api_key(
     let new_hash = hash_key_bytes(env, &new_raw);
     key.key_hash = new_hash;
     key.last_used_at = 0;
-    env.storage()
-        .instance()
-        .set(&DataKey::ApiKey(key_id), &key);
+    env.storage().instance().set(&DataKey::ApiKey(key_id), &key);
 
     log_audit(env, key_id, String::from_str(env, "rotated"), caller, now);
     new_raw
@@ -196,13 +187,7 @@ pub fn get_api_key_audit(env: &Env, key_id: ApiKeyId) -> Vec<ApiKeyAuditEntry> {
     entries
 }
 
-fn log_audit(
-    env: &Env,
-    key_id: ApiKeyId,
-    action: String,
-    changed_by: Address,
-    now: u64,
-) {
+fn log_audit(env: &Env, key_id: ApiKeyId, action: String, changed_by: Address, now: u64) {
     let mut count: u64 = env
         .storage()
         .instance()

contracts/api/src/lib.rs

@@ -33,11 +33,7 @@ impl SubTrackrApi {
 
     /// Create a new API key. Returns `(key_id, raw_key_bytes)`.
     /// The raw key is returned exactly once and must be stored off-chain.
-    pub fn create_api_key(
-        env: Env,
-        owner: Address,
-        config: ApiKeyConfig,
-    ) -> (ApiKeyId, Bytes) {
+    pub fn create_api_key(env: Env, owner: Address, config: ApiKeyConfig) -> (ApiKeyId, Bytes) {
         owner.require_auth();
         let now = env.ledger().timestamp();
         auth::create_api_key(&env, owner, config, now)

contracts/api/src/ratelimit.rs

@@ -1,7 +1,5 @@
 use soroban_sdk::Env;
-use subtrackr_types::{
-    ApiKey, ApiKeyId, ApiUsageRecord, RateLimitStatus, TimeRange, UsageReport,
-};
+use subtrackr_types::{ApiKey, ApiKeyId, ApiUsageRecord, RateLimitStatus, TimeRange, UsageReport};
 
 use crate::DataKey;
 
@@ -20,17 +18,17 @@ fn bump_window(env: &Env, key: DataKey, now: u64, period: u64) -> (u32, u64) {
         Some(r) if r.window_start == ws => r.count + 1,
         _ => 1,
     };
-    env.storage()
-        .instance()
-        .set(&key, &ApiUsageRecord { window_start: ws, count });
+    env.storage().instance().set(
+        &key,
+        &ApiUsageRecord {
+            window_start: ws,
+            count,
+        },
+    );
     (count, ws + period)
 }
 
-pub fn check_rate_limit(
-    env: &Env,
-    key: &ApiKey,
-    now: u64,
-) -> RateLimitStatus {
+pub fn check_rate_limit(env: &Env, key: &ApiKey, now: u64) -> RateLimitStatus {
     let cfg = &key.rate_limit;
 
     let (min_count, min_reset) = bump_window(
@@ -88,11 +86,7 @@ pub fn check_rate_limit(
     }
 }
 
-pub fn get_api_usage(
-    env: &Env,
-    key_id: ApiKeyId,
-    period: TimeRange,
-) -> UsageReport {
+pub fn get_api_usage(env: &Env, key_id: ApiKeyId, period: TimeRange) -> UsageReport {
     let mut total: u32 = 0;
     let mut ws = window_start(period.start, SECS_PER_MINUTE);
     let end = period.end;
@@ -114,11 +108,7 @@ pub fn get_api_usage(
     }
 }
 
-pub fn calculate_api_charge(
-    env: &Env,
-    key: &ApiKey,
-    period: TimeRange,
-) -> i128 {
+pub fn calculate_api_charge(env: &Env, key: &ApiKey, period: TimeRange) -> i128 {
     let usage = get_api_usage(env, key.id, period);
     let billable = usage.total_requests.saturating_sub(1000);
     let price_per_k = key.usage_tier.price_per_thousand();

contracts/api/src/test.rs

@@ -1,8 +1,6 @@
 #![cfg(test)]
 
-use soroban_sdk::{
-    testutils::Address as _, testutils::Ledger as _, Address, Bytes, BytesN, Env,
-};
+use soroban_sdk::{testutils::Address as _, testutils::Ledger as _, Address, Bytes, BytesN, Env};
 use subtrackr_types::{ApiKeyConfig, ApiKeyStatus, RateLimitConfig, TimeRange, UsageTier};
 
 use crate::{SubTrackrApi, SubTrackrApiClient};
@@ -158,8 +156,12 @@ fn test_list_api_keys_by_owner() {
     let mut found1 = false;
     let mut found2 = false;
     for k in keys.iter() {
-        if k.id == id1 { found1 = true; }
-        if k.id == id2 { found2 = true; }
+        if k.id == id1 {
+            found1 = true;
+        }
+        if k.id == id2 {
+            found2 = true;
+        }
     }
     assert!(found1);
     assert!(found2);
@@ -179,7 +181,11 @@ fn test_audit_trail() {
     client.revoke_api_key(&owner, &key_id);
 
     let audit = client.get_api_key_audit(&key_id);
-    assert_eq!(audit.len(), 2, "Should have rotate and revoke audit entries");
+    assert_eq!(
+        audit.len(),
+        2,
+        "Should have rotate and revoke audit entries"
+    );
     assert_eq!(
         audit.get(0).unwrap().action,
         soroban_sdk::String::from_str(&env, "rotated")
@@ -268,10 +274,7 @@ fn test_rate_limit_per_hour() {
         client.check_rate_limit(&key_id, &key_hash);
     }
     let status = client.check_rate_limit(&key_id, &key_hash);
-    assert!(
-        !status.is_allowed,
-        "Should be blocked by hourly limit"
-    );
+    assert!(!status.is_allowed, "Should be blocked by hourly limit");
 }
 
 #[test]