From 53835fc2f63a0506ca37c5ded27cccb6895d9fb7 Mon Sep 17 00:00:00 2001
From: Evgeni Margolis <emargolis@google.com>
Date: Thu, 26 Jan 2023 12:25:54 -0800
Subject: [PATCH] Updated global-attributes.xml and fixed typo in helper.js

---
 cypress/matterFixtures/data.json                               | 2 +-
 .../matter/app/zap-templates/templates/chip/helper.js          | 2 +-
 test/test-util.js                                              | 2 +-
 zcl-builtin/matter/global-attributes.xml                       | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cypress/matterFixtures/data.json b/cypress/matterFixtures/data.json
index b9bc252257..dfd379f3de 100644
--- a/cypress/matterFixtures/data.json
+++ b/cypress/matterFixtures/data.json
@@ -25,7 +25,7 @@
   "server2": "Client & Server",
   "previewBtnData": "access.out",
   "outOfRangeAmount1": "9999999999999999",
-  "availableAttributes1": "28",
+  "availableAttributes1": "32",
   "availableClusters1": "5",
   "enum8inputpath": "2",
   "int16inputpath": "1",
diff --git a/src-electron/generator/matter/app/zap-templates/templates/chip/helper.js b/src-electron/generator/matter/app/zap-templates/templates/chip/helper.js
index 486b28724f..493d726b58 100644
--- a/src-electron/generator/matter/app/zap-templates/templates/chip/helper.js
+++ b/src-electron/generator/matter/app/zap-templates/templates/chip/helper.js
@@ -438,7 +438,7 @@ function chip_server_cluster_attributes(options) {
 }
 
 /**
- * Creates block iterator over the server side cluster attributes
+ * Creates block iterator over the server side cluster events
  * for a given cluster.
  *
  * This function is meant to be used inside a {{#chip_server_clusters}}
diff --git a/test/test-util.js b/test/test-util.js
index 9e38eb4fd7..5df0ce80f6 100644
--- a/test/test-util.js
+++ b/test/test-util.js
@@ -123,7 +123,7 @@ exports.totalMatterClusters = 58
 exports.totalMatterDeviceTypes = 40
 exports.totalMatterCommandArgs = 424
 exports.totalMatterCommands = 203
-exports.totalMatterAttributes = 509
+exports.totalMatterAttributes = 510
 exports.totalMatterTags = 15
 exports.totalMatterEvents = 56
 exports.totalMatterEventFields = 83
diff --git a/zcl-builtin/matter/global-attributes.xml b/zcl-builtin/matter/global-attributes.xml
index 83a1b5e9e1..d848e4b7ec 100644
--- a/zcl-builtin/matter/global-attributes.xml
+++ b/zcl-builtin/matter/global-attributes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2021 Project CHIP Authors
+Copyright (c) 2021-2023 Project CHIP Authors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ limitations under the License.
     <attribute side="client" code="0xFFFC" define="FEATURE_MAP_CLIENT"      type="bitmap32" default="0" optional="true">FeatureMap</attribute>
     <attribute side="server" code="0xFFFC" define="FEATURE_MAP_SERVER"      type="bitmap32" default="0" optional="true">FeatureMap</attribute>
     <attribute side="server" code="0xFFFB" define="ATTRIBUTE_LIST_SERVER"   type="array" entryType="attrib_id">AttributeList</attribute>
+    <attribute side="server" code="0xFFFA" define="EVENT_LIST"              type="array" entryType="event_id">EventList</attribute>
     <attribute side="server" code="0xFFF9" define="ACCEPTED_COMMAND_LIST"   type="array" entryType="command_id">AcceptedCommandList</attribute>
     <attribute side="server" code="0xFFF8" define="GENERATED_COMMAND_LIST"   type="array" entryType="command_id">GeneratedCommandList</attribute>