Skip to content

Distinct #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 20, 2020
Merged

Distinct #388

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b02703
introducing distinct as per previous ts meeting
Aug 7, 2020
c4ca79f
distinct attribute is not allowed for attributes in <card>, only if i…
darakhbharat Sep 6, 2020
73020c6
Completed: 1. all attribute element under the token can have only one…
darakhbharat Sep 17, 2020
aae2315
Merge branch 'master' into distinct
darakhbharat Sep 19, 2020
1faec47
formatting changes
darakhbharat Sep 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 27 additions & 21 deletions schema/tokenscript.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,13 @@
<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"/>
<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()"/>
</complexType>
<keyref name="typeRef" refer="ts:namedTypeName">
<selector xpath=".//ts:origins/ethereum:event|.//ts:origins/ethereum:call"></selector>
Expand Down Expand Up @@ -90,7 +92,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
Expand Down Expand Up @@ -253,25 +255,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 -->
Expand Down