From 0b02703fa3f40aa399f1d98b2a5fb6baeaa26a62 Mon Sep 17 00:00:00 2001
From: Weiwu Zhang <a@colourful.land>
Date: Fri, 7 Aug 2020 19:31:34 +1000
Subject: [PATCH 1/4] introducing distinct as per previous ts meeting

---
 schema/tokenscript.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/schema/tokenscript.xsd b/schema/tokenscript.xsd
index 2ce229b1..3a95b22d 100644
--- a/schema/tokenscript.xsd
+++ b/schema/tokenscript.xsd
@@ -267,6 +267,7 @@
                 <element ref="ts:origins"/>
             </sequence>
             <attribute name="name" use="required" type="NCName"/>
+            <attribute name="distinct" type="boolean" default="false"/>
             <attribute name="oid" type="NMTOKEN"/>
         </complexType>
     </element>

From c4ca79ff4afcfd330958021eb0273ad987fd5724 Mon Sep 17 00:00:00 2001
From: darakhbharat <darakhbharat@gmail.com>
Date: Sun, 6 Sep 2020 19:29:40 +0530
Subject: [PATCH 2/4] distinct attribute is not allowed for attributes in
 <card>, only if it is directly in <token> (the global element <token>). The
 changes are XSD 1.0 compatible

---
 schema/tokenscript.xsd | 47 +++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/schema/tokenscript.xsd b/schema/tokenscript.xsd
index 3a95b22d..59dc1aa0 100644
--- a/schema/tokenscript.xsd
+++ b/schema/tokenscript.xsd
@@ -47,10 +47,11 @@
                 <element ref="ts:cards"/>
                 <element minOccurs="0" ref="ts:grouping"/>
                 <element minOccurs="0" ref="ts:ordering"/>
-                <element minOccurs="0" maxOccurs="unbounded" ref="ts:attribute"/>
+				<element name="attribute" minOccurs="0" maxOccurs="unbounded" type="ts:attributeWithDistinct"/>
                 <element minOccurs="0" maxOccurs="unbounded" ref="dsig:Signature"/>
             </sequence>
             <attribute name="custodian" type="boolean" default="false"/>
+			<!--assert test="if(not(ts:origins)) then (count(ts:attribute[string(@distinct) = 'true']) = 1) else true()"/-->
         </complexType>
         <keyref name="typeRef" refer="ts:namedTypeName">
             <selector xpath=".//ts:origins/ethereum:event|.//ts:origins/ethereum:call"></selector>
@@ -89,7 +90,7 @@
         <sequence>
             <element minOccurs="0" name="label" type="ts:text"/>
             <element minOccurs="0" ref="ts:origins"/>
-            <element minOccurs="0" maxOccurs="unbounded" ref="ts:attribute"/>
+			<element name="attribute" minOccurs="0" maxOccurs="unbounded" type="ts:attribute"/>
             <element minOccurs="0" maxOccurs="unbounded" ref="ts:selection"/>
             <!-- consider putting input and output in transaction
                  declaration later when/if DvP Security is
@@ -252,25 +253,29 @@
             <attribute name="field" use="required" type="NCName"/>
         </complexType>
     </element>
-    <element name="attribute">
-        <complexType>
-            <sequence>
-                <element name="type">
-                    <complexType>
-                        <sequence>
-                            <element name="syntax"/>
-                        </sequence>
-                    </complexType>
-                </element>
-                <!-- label is not needed if the attribute is only used for selection -->
-                <element minOccurs="0" name="label" type="ts:text"/>
-                <element ref="ts:origins"/>
-            </sequence>
-            <attribute name="name" use="required" type="NCName"/>
-            <attribute name="distinct" type="boolean" default="false"/>
-            <attribute name="oid" type="NMTOKEN"/>
-        </complexType>
-    </element>
+	<complexType name="attribute">
+		<sequence>
+			<element name="type">
+				<complexType>
+					<sequence>
+						<element name="syntax"/>
+					</sequence>
+				</complexType>
+			</element>
+			<!-- label is not needed if the attribute is only used for selection -->
+			<element minOccurs="0" name="label" type="ts:text"/>
+			<element ref="ts:origins"/>
+		</sequence>
+		<attribute name="name" use="required" type="NCName"/>
+		<attribute name="oid" type="NMTOKEN"/>
+	</complexType>
+	<complexType name="attributeWithDistinct">
+		<complexContent>
+			<extension base="ts:attribute">
+				<attribute name="distinct" type="boolean" default="false"/>
+			</extension>
+		</complexContent>
+	</complexType>
     <simpleType name="syntax">
         <restriction base="NMTOKEN">
             <enumeration value="1.3.6.1.4.1.1466.115.121.1.7"/><!-- Boolean -->

From 73020c6ef586f19896ebbb43dad4f30266260c70 Mon Sep 17 00:00:00 2001
From: darakhbharat <darakhbharat@gmail.com>
Date: Thu, 17 Sep 2020 10:45:22 +0530
Subject: [PATCH 3/4] Completed: 1. all attribute element under the token can
 have only one attribute distinct with value true. 2. TokenScript that did not
 define <origins> under <token>, require at least one of the <attribute> has
 distinct.

---
 schema/tokenscript.xsd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/schema/tokenscript.xsd b/schema/tokenscript.xsd
index 59dc1aa0..356e094c 100644
--- a/schema/tokenscript.xsd
+++ b/schema/tokenscript.xsd
@@ -51,7 +51,8 @@
                 <element minOccurs="0" maxOccurs="unbounded" ref="dsig:Signature"/>
             </sequence>
             <attribute name="custodian" type="boolean" default="false"/>
-			<!--assert test="if(not(ts:origins)) then (count(ts:attribute[string(@distinct) = 'true']) = 1) else true()"/-->
+			<assert test="count(ts:attribute[string(@distinct) = 'true']) le 1"/>
+			<assert test="if(not(ts:origins)) then count(ts:attribute[string(@distinct) = 'true']) = 1 else true()"/>
         </complexType>
         <keyref name="typeRef" refer="ts:namedTypeName">
             <selector xpath=".//ts:origins/ethereum:event|.//ts:origins/ethereum:call"></selector>

From 1faec4784bd50c17908527bc7858bfd78b2531d5 Mon Sep 17 00:00:00 2001
From: darakhbharat <darakhbharat@gmail.com>
Date: Sat, 19 Sep 2020 13:52:55 +0530
Subject: [PATCH 4/4] formatting changes

---
 schema/tokenscript.xsd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/schema/tokenscript.xsd b/schema/tokenscript.xsd
index a8f21636..842e01b1 100644
--- a/schema/tokenscript.xsd
+++ b/schema/tokenscript.xsd
@@ -52,8 +52,8 @@
             </sequence>
             <attribute name="custodian" type="boolean" default="false"/>
             <attribute name="name" type="NCName"/>
-      			<assert test="count(ts:attribute[string(@distinct) = 'true']) le 1"/>
-			      <assert test="if(not(ts:origins)) then count(ts:attribute[string(@distinct) = 'true']) = 1 else true()"/>
+      		<assert test="count(ts:attribute[string(@distinct) = 'true']) le 1"/>
+			<assert test="if(not(ts:origins)) then count(ts:attribute[string(@distinct) = 'true']) = 1 else true()"/>
         </complexType>
         <keyref name="typeRef" refer="ts:namedTypeName">
             <selector xpath=".//ts:origins/ethereum:event|.//ts:origins/ethereum:call"></selector>