Skip to content

RFC4912 required a <type> for a named type that defines a type #365

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 3 commits into from
Jul 13, 2020
Merged

RFC4912 required a <type> for a named type that defines a type #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c506dc1
RFC4912 required a <type> for a named type that defines a type
Jun 25, 2020
5c260b1
apply the same RFC4912 comformation change to the default ERC scripts
Jun 25, 2020
a632653
corrisponding change in ERC72 was left out in the last commit
Jun 25, 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
24 changes: 14 additions & 10 deletions ERCs/ERC20/ERC20-TokenScript.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@
>
<asnx:module name="ERC20-Events">
<namedType name="Approval">
<sequence>
<element name="owner" ethereum:type="address" ethereum:indexed="true"/>
<element name="spender" ethereum:type="address" ethereum:indexed="true"/>
<element name="value" ethereum:type="uint256" ethereum:indexed="false"/>
</sequence>
<type>
<sequence>
<element name="owner" ethereum:type="address" ethereum:indexed="true"/>
<element name="spender" ethereum:type="address" ethereum:indexed="true"/>
<element name="value" ethereum:type="uint256" ethereum:indexed="false"/>
</sequence>
</type>
</namedType>
<namedType name="Transfer">
<sequence>
<element name="from" ethereum:type="address" ethereum:indexed="true"/>
<element name="to" ethereum:type="address" ethereum:indexed="true"/>
<element name="value" ethereum:type="uint256" ethereum:indexed="false"/>
</sequence>
<type>
<sequence>
<element name="from" ethereum:type="address" ethereum:indexed="true"/>
<element name="to" ethereum:type="address" ethereum:indexed="true"/>
<element name="value" ethereum:type="uint256" ethereum:indexed="false"/>
</sequence>
</type>
</namedType>
</asnx:module>
<ts:cards>
Expand Down
24 changes: 14 additions & 10 deletions ERCs/ERC721/ERC721-TokenScript.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@
>
<asnx:module name="ERC721-Events">
<namedType name="Approval">
<sequence>
<element name="_owner" ethereum:type="address" ethereum:indexed="true"/>
<element name="_approved" ethereum:type="address" ethereum:indexed="true"/>
<element name="_tokenId" ethereum:type="uint256" ethereum:indexed="false"/>
</sequence>
<type>
<sequence>
<element name="_owner" ethereum:type="address" ethereum:indexed="true"/>
<element name="_approved" ethereum:type="address" ethereum:indexed="true"/>
<element name="_tokenId" ethereum:type="uint256" ethereum:indexed="false"/>
</sequence>
</type>
</namedType>
<namedType name="Transfer">
<sequence>
<element name="_from" ethereum:type="address" ethereum:indexed="true"/>
<element name="_to" ethereum:type="address" ethereum:indexed="true"/>
<element name="_tokenId" ethereum:type="uint256" ethereum:indexed="false"/>
</sequence>
<type>
<sequence>
<element name="_from" ethereum:type="address" ethereum:indexed="true"/>
<element name="_to" ethereum:type="address" ethereum:indexed="true"/>
<element name="_tokenId" ethereum:type="uint256" ethereum:indexed="false"/>
</sequence>
</type>
</namedType>
</asnx:module>
<ts:cards>
Expand Down
47 changes: 36 additions & 11 deletions schema/asnx.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,54 @@

<complexType name="namedType">
<choice>
<element name="sequence" type="asnx:container"/>
<element name="element" type="asnx:element"/>
<element name="type" type="asnx:type">
</element>
</choice>
<attribute name="name" type="NCName"/>
</complexType>

<complexType name="type">
<choice>
<element name="sequence" type="asnx:container"/>
<element name="enumerated" type="asnx:enumerated"/>
</choice>
</complexType>

<complexType name="enumerated">
<sequence>
<element name="enumeration" maxOccurs="unbounded">
<complexType>
<attribute name="name" type="NCName"/>
<attribute name="number" type="integer"/>
</complexType>
</element>
</sequence>
</complexType>

<complexType name="container">
<choice maxOccurs="unbounded">
<element name="element" type="asnx:element"/>
</choice>
</complexType>

<complexType name="element">
<choice>
<element name="type" type="asnx:type"/>
</choice>
<attribute name="name" type="NCName"/>
<attribute name="type" type="asnx:type"/>
<attribute name="type">
<simpleType>
<restriction base="string">
<enumeration value="asnx:UTF8String"/>
<enumeration value="asnx:INTEGER"/>
<enumeration value="asnx:BOOLEAN"/>
<enumeration value="asnx:OCTET-STRING"/>
<enumeration value="asnx:UTCTime"/>
</restriction>
</simpleType>
</attribute>
<attribute ref="ethereum:type"/>
<attribute ref="ethereum:indexed"/>
</complexType>

<simpleType name="type">
<restriction base="string">
<enumeration value="asnx:UTF8String"/>
<enumeration value="asnx:INTEGER"/>
<enumeration value="asnx:BOOLEAN"/>
<enumeration value="asnx:OCTET-STRING"/>
</restriction>
</simpleType>
</schema>