Merge branch 'master' into subscription_resumption/session_retry

.clang-tidy

@@ -35,6 +35,7 @@ Checks: >
   -clang-analyzer-cplusplus.Move,
   -clang-analyzer-deadcode.DeadStores,
   -clang-analyzer-nullability.NullablePassedToNonnull,
+  -clang-analyzer-optin.core.EnumCastOutOfRange,
   -clang-analyzer-optin.cplusplus.UninitializedObject,
   -clang-analyzer-optin.cplusplus.VirtualCall,
   -clang-analyzer-optin.osx.cocoa.localizability.EmptyLocalizationContextChecker,

.devcontainer/devcontainer.json

@@ -14,7 +14,7 @@
     "mounts": [
         "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
     ],
-    "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 22",
+    "initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 22",
     "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
     "customizations": {

.github/.wordlist.txt

@@ -14,29 +14,19 @@ abfb
 ABI
 ABIs
 ables
-AccessControl
-AccessControlEntry
+accesscontrol
 accessor
 Accessors
-AccountLogin
 acdbc
 ack
 ACKed
 ACL
 ACLs
 actdiag
-AdapterAddress
-AdapterName
 adb
 AddNOC
-AddOrUpdateThreadNetwork
-AddOrUpdateWiFiNetwork
 addr
-AddResponse
-AddThreadNetwork
-AddStatus
 adk
-AdministratorCommissioning
 adoc
 adr
 AdvAutonomous
@@ -48,7 +38,6 @@ AE
 aef
 AES
 AIDL
-AlarmCode
 algs
 alloc
 Ameba
@@ -61,15 +50,12 @@ AnnounceOTAProvider
 AnnounceOTAProviderRequest
 APIs
 apk
-AppConfig
 AppImpl
 AppleTV
 appliable
-ApplianceControl
 applianceeventsandalert
 ApplianceIdentification
 appliancestatistics
-ApplicationBasic
 ApplicationId
 ApplicationIdentifier
 ApplicationLauncher
@@ -171,7 +157,6 @@ BRD
 breakpoint
 bredr
 BridgedDeviceBasicInformation
-bridgedLightEndpoint
 bringup
 BroadcastReceiver
 BromateConcentrationMeasurement
@@ -259,9 +244,6 @@ CLIs
 cloudbuild
 CLRF
 clusterAttrs
-clusterId
-clusterList
-clusterListName
 ClusterName
 ClusterObjectTests
 ClusterRevision
@@ -315,7 +297,6 @@ ContentApp's
 ContentAppPlatform
 ContentLaunch
 ContentLauncher
-continuousHinting
 contrib
 controllee
 conv
@@ -382,7 +363,6 @@ DefaultOTARequestor
 DefaultOTARequestorDriver
 DefaultOTARequestorStorage
 DefaultSuccess
-defaultValue
 definedValue
 DehumidificationControl
 DelayedActionTime
@@ -415,9 +395,7 @@ DeviceLayer
 DeviceNetworkProvisioningDelegate
 DeviceNetworkProvisioningDelegateImpl
 DevicePairingDelegate
-deviceSoftwareVersionModel
 DeviceTemperatureConfiguration
-deviceType
 DevKitC
 DevKitM
 devtype
@@ -511,8 +489,6 @@ EnableNetwork
 EnableWiFiNetwork
 endian
 EndpointId
-endpointName
-endsWith
 eno
 entrypoint
 enum
@@ -523,6 +499,7 @@ epochStartTime
 eq
 errorValue
 esd
+espcoredump
 ESPPORT
 Espressif
 esptool
@@ -579,7 +556,6 @@ FlowMeasurement
 FluorideConcentrationMeasurement
 focusable
 forkpty
-formatOnSave
 FOTA
 FreeRTOS
 FreeRTOSConfig
@@ -613,7 +589,6 @@ GetIP
 getManualTests
 GetSafeAttributePersistenceProvider
 getstarted
-getTests
 GH
 ghcr
 ghp
@@ -634,11 +609,10 @@ GPL
 GPLv
 Gradle
 gradlew
+graphviz
 Groupcast
 GroupId
 GroupKeyManagement
-groupKeySecurityPolicy
-groupKeySetID
 groupsettings
 gsdk
 gtk
@@ -692,8 +666,6 @@ ifconfig
 ifdef
 ifdefs
 IGMP
-ignoreApplyUpdate
-ignoreQueryImage
 ihex
 IlluminanceMeasurement
 IM
@@ -1620,4 +1592,4 @@ zephyrproject
 zhengyaohan
 Zigbee
 zigbeealliance
-zigbeethread
+zigbeethread

.github/workflows/bloat_check.yaml

@@ -33,7 +33,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
 
         steps:
             - name: Checkout

.github/workflows/build.yaml

@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -135,7 +135,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -283,7 +283,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -343,7 +343,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -451,7 +451,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0

.github/workflows/chef.yaml

@@ -33,7 +33,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build:32
+            image: ghcr.io/project-chip/chip-build:35
             options: --user root
 
         steps:
@@ -54,7 +54,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-esp32:32
+            image: ghcr.io/project-chip/chip-build-esp32:35
             options: --user root
 
         steps:
@@ -75,7 +75,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-nrf-platform:32
+            image: ghcr.io/project-chip/chip-build-nrf-platform:35
             options: --user root
 
         steps:
@@ -96,7 +96,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:32
+            image: ghcr.io/project-chip/chip-build-telink:35
             options: --user root
 
         steps:
@@ -108,7 +108,7 @@ jobs:
                 platform: telink
             # - name: Update Zephyr to specific revision (for developers purpose)
             #   shell: bash
-            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py e6a32f41ccec55c2233631406842b71ff270089d"
+            #   run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py b5c8028ec94f3efa69decff3a09f0d6f8a21fd6d"
             - name: CI Examples Telink
               shell: bash
               run: |

.github/workflows/cherry-picks.yaml

@@ -14,7 +14,6 @@ jobs:
             (github.event.pull_request.merged == true)
             && (
                    (contains(github.event.pull_request.labels.*.name, 'sve'))
-               ||  (contains(github.event.pull_request.labels.*.name, 'spec'))
                ||  (contains(github.event.pull_request.labels.*.name, 'request sve'))
                ||  (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
             )
@@ -27,11 +26,12 @@ jobs:
               uses: carloscastrojumo/[email protected]
               with:
                   token: ${{ secrets.MATTER_PAT }}
-                  branch: sve-2
+                  branch: 1.3-sve
                   labels: |
                       sve cherry pick
                   reviewers: |
                       woody-apple
                       andy31415
+                      raju-apple
 env:
     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cirque.yaml

@@ -40,7 +40,7 @@ jobs:
         # need to run with privilege, which isn't supported by job.XXX.contaner
         #  https://github.com/actions/container-action/issues/2
         #         container:
-        #             image: ghcr.io/project-chip/chip-build-cirque:32
+        #             image: ghcr.io/project-chip/chip-build-cirque:35
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"
@@ -71,7 +71,7 @@ jobs:
             - name: Get Cirque Bootstrap cache key
               id: cirque-bootstrap-cache-key
               run: echo "val=$(scripts/tests/cirque_tests.sh cachekeyhash)" >> $GITHUB_OUTPUT
-            - uses: Wandalen/wretry.action@v1.3.0
+            - uses: Wandalen/wretry.action@v1.4.4
               name: Cirque Bootstrap cache
               if: ${{ !env.ACT }}
               continue-on-error: true

.github/workflows/darwin-tests.yaml

@@ -99,13 +99,16 @@ jobs:
                         --target darwin-x64-tv-app-${BUILD_VARIANT} \
                         --target darwin-x64-bridge-${BUILD_VARIANT} \
                         --target darwin-x64-lit-icd-${BUILD_VARIANT} \
+                        --target darwin-x64-microwave-oven-${BUILD_VARIANT} \
+                        --target darwin-x64-rvc-${BUILD_VARIANT} \
                         build \
                         --copy-artifacts-to objdir-clone \
                      "
             - name: Run Tests
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
+                     --runner darwin_framework_tool_python \
                      --chip-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin-framework-tool \
                      --target-skip-glob '{TestAccessControlConstraints}' \
                      run \
@@ -117,6 +120,8 @@ jobs:
                      --ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
                      --tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
                      --bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
+                     --microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
+                     --rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
                   "
             - name: Run OTA Test
               run: |

.github/workflows/darwin.yaml

@@ -103,26 +103,30 @@ jobs:
               # target versions instead?
               run: |
                   mkdir -p /tmp/darwin/framework-tests
-                  ../../../out/debug/chip-all-clusters-app --interface-id -1 > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
+                  echo "This is a simple log" > /tmp/darwin/framework-tests/end_user_support_log.txt
+                  ../../../out/debug/chip-all-clusters-app --interface-id -1 --end_user_support_log /tmp/darwin/framework-tests/end_user_support_log.txt > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
                   ../../../out/debug/chip-all-clusters-app --interface-id -1 --dac_provider ../../../credentials/development/commissioner_dut/struct_cd_origin_pid_vid_correct/test_case_vector.json --product-id 32768 --discriminator 3839 --secured-device-port 5539 --KVS /tmp/chip-all-clusters-app-kvs2 > >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid-err.log >&2) &
-                  # Disable BLE because the app does not have the permission to use
-                  # it and that may crash the CI.
-                  #
-                  # -enableUndefinedBehaviorSanitizer instruments the code in Matter.framework,
-                  # but to instrument the code in the underlying libCHIP we need to pass CHIP_IS_UBSAN=YES
-                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1'> >(tee /tmp/darwin/framework-tests/darwin-tests-asan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-err.log >&2)
+                  # Disable BLE (CHIP_IS_BLE=NO) because the app does not have the permission to use it and that may crash the CI.
+
+                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1'> >(tee /tmp/darwin/framework-tests/darwin-tests-asan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-err.log >&2)
                   # And the same thing, but with MTR_PER_CONTROLLER_STORAGE_ENABLED turned off, so we test that it does not break for now.
-                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1 MTR_PER_CONTROLLER_STORAGE_ENABLED=0' > >(tee /tmp/darwin/framework-tests/darwin-tests-asan-controller-storage.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-controller-storage-err.log >&2)
+                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1 MTR_PER_CONTROLLER_STORAGE_ENABLED=0' > >(tee /tmp/darwin/framework-tests/darwin-tests-asan-controller-storage.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-controller-storage-err.log >&2)
                   # And the same thing, but with MTR_NO_AVAILABILITY not turned on.  This requires -Wno-unguarded-availability-new to avoid availability errors.
-                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new' CHIP_IS_UBSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited}' > >(tee /tmp/darwin/framework-tests/darwin-tests-asan-with-availability-annotations.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-with-availability-annotations-err.log >&2)
-                  # -enableThreadSanitizer instruments the code in Matter.framework,
-                  # but to instrument the code in the underlying libCHIP we need to pass CHIP_IS_TSAN=YES
-                  xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableThreadSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_TSAN=YES CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1' > >(tee /tmp/darwin/framework-tests/darwin-tests-tsan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-tsan-err.log >&2)
+                  TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1 xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-unguarded-availability-new' CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited}' > >(tee /tmp/darwin/framework-tests/darwin-tests-asan-with-availability-annotations.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-asan-with-availability-annotations-err.log >&2)
+
+                  xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx -enableThreadSanitizer YES OTHER_CFLAGS='${inherited} -Werror -Wconversion' CHIP_IS_BLE=NO GCC_PREPROCESSOR_DEFINITIONS='${inherited} MTR_NO_AVAILABILITY=1' > >(tee /tmp/darwin/framework-tests/darwin-tests-tsan.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-tsan-err.log >&2)
               working-directory: src/darwin/Framework
             - name: Build Matter TV Casting Bridge
               run: |
                   xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos
               working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge
+            - name: Uploading .ips files in Xcode derived data to debug the failure
+              uses: actions/upload-artifact@v4
+              if: ${{ failure() && !env.ACT }}
+              with:
+                  name: darwin-framework-derived-data
+                  path: ~/Library/Developer/Xcode/DerivedData/**/*.ips
+                  retention-days: 5
             - name: Uploading log files
               uses: actions/upload-artifact@v4
               if: ${{ failure() && !env.ACT }}

.github/workflows/doxygen.yaml

@@ -81,7 +81,7 @@ jobs:
 
         runs-on: ubuntu-latest
         container:
-            image: ghcr.io/project-chip/chip-build-doxygen:32
+            image: ghcr.io/project-chip/chip-build-doxygen:35
 
         if: github.actor != 'restyled-io[bot]'