draft new ERC for contract working with ts#430

Draft

SmartLayer wants to merge 785 commits intomainfrom

This pull request is big! We're only showing the most recent 250 commits

Commits on Dec 4, 2019

added redeemed text, compressed images
rosieprom
committed

Commits on Dec 5, 2019

Commits on Dec 8, 2019

fixed shared.css to work on Android/iOS
rosieprom
committed

Commits on Dec 9, 2019

changed the background image and some height issue fix
rosieprom
committed

Commits on Dec 13, 2019

Commits on Dec 16, 2019

fix up names
JamesANZ
committed

Commits on Dec 17, 2019

Commits on Dec 18, 2019

Commits on Dec 28, 2019

add Chinese to UEFA
JamesANZ
committed

Commits on Dec 29, 2019

allowing multiple views in <action> or <token-card>.
Weiwu Zhang
committed

Commits on Dec 31, 2019

Merge pull request #308 from AlphaWallet/translate-uefa-to-chinese
JamesANZ
authored

Commits on Jan 2, 2020

this is the 1st part of a 3-part serial
Weiwu Zhang
committed

Commits on Jan 7, 2020

Replace logo and title used in UEFA ticket
hboon
committed

Commits on Jan 8, 2020

Commits on Jan 10, 2020

Commits on Jan 17, 2020

Commits on Jan 18, 2020

rename star wars sports
JamesANZ
committed

Commits on Jan 21, 2020

update images of DAI
JamesANZ
committed

Commits on Jan 22, 2020

Commits on Feb 1, 2020

Commits on Feb 2, 2020

adding a few paragraphs to explain the difference between signing a tokenscript and expressing trust towards a tokenscript
Weiwu Zhang
committed

Commits on Feb 3, 2020

allowing event card in <cards>
Weiwu Zhang
committed
rename <token-card> to <token>
Weiwu Zhang
committed

Commits on Feb 17, 2020

Commits on Feb 20, 2020

Update JavaScript doc with API for TokenScript view container access. Ref: https://community.tokenscript.org/t/weekly-design-meeting-21/329

hboon
authored and
Weiwu Zhang
committed

Commits on Feb 21, 2020

change action back to a global element so it can be uesd as root element
Weiwu Zhang
authored

Commits on Mar 13, 2020

Update design_paper.md
zhangzhongnan928
authored

Commits on Mar 14, 2020

Commits on Mar 16, 2020

Update README.md
zhangzhongnan928
authored

Commits on Mar 23, 2020

a minimalist asnx schema for urn:ietf:params:xml:ns:asnx namespace, just enough to release the event support we are having now.
Weiwu Zhang
committed
adding comments
Weiwu Zhang
committed
adding ethereum namespace for ethereum-only attributes
Weiwu Zhang
committed

Commits on Mar 31, 2020

forgot this spot (adding indexed attribute) in the last commit
Weiwu Zhang
committed

Commits on Apr 9, 2020

now allowing actions to have two attributes: exclude and available-to, both are references to a selection
Weiwu Zhang
committed
using xml.xsd we hosted instead of w3c's which sometimes becomes unavailable
Weiwu Zhang
committed
remove the <selections> elements which we no longer use
Weiwu Zhang
committed

Commits on Apr 10, 2020

finish removing <attribute-types> and <selections>
Weiwu Zhang
committed
Update tutorial link
jzaki
authored
Fix typo
jzaki
authored

Commits on Apr 16, 2020

Create We need a better framework for applications using blockchain 中文
 zhangzhongnan928
authored

Commits on May 4, 2020

Commits on May 10, 2020

move the definition of "as" attribute and "mapping" element to data where it belongs
Weiwu Zhang
committed
clarification in express-of-trust
Weiwu Zhang
committed
upping namespace to 2020/06 for quite a few schema-breaking changes introduced in the last months' TS weekly meetings
Weiwu Zhang
committed

Commits on May 11, 2020

moving etheruem calls to its own namespace
Weiwu Zhang
committed
renaming name to label
Weiwu Zhang
committed
for attribute-types, changing attribute id into name
Weiwu Zhang
committed

Commits on May 13, 2020

Commits on May 15, 2020

Commits on May 16, 2020

Merge pull request #353 from AlphaWallet/rename-names
JamesANZ
authored

Commits on May 19, 2020

add in local-ref to ethereum:value (#354)

JamesANZ
and
Weiwu Zhang
authored

Commits on May 20, 2020

Commits on May 24, 2020

Commits on May 31, 2020

rename id to name for all <selection>
Weiwu Zhang
committed
using asnx module correctly, as per RFC4912, to include sequence in a named type
Weiwu Zhang
committed

Commits on Jun 1, 2020

Merge pull request #359 from AlphaWallet/id-and-asnx-module-correction
JamesANZ
authored

Commits on Jun 12, 2020

add sample activities for ERC20 & ERC721

JamesANZ
authored and
Weiwu Zhang
committed
directory structure - the ERCs implemented in TokenScripts are real tokenscripts, not examples.
Weiwu Zhang
committed
adding README
Weiwu Zhang
committed
relax schema rules so that ERCs can be implemented in TokenScript
Weiwu Zhang
committed
updating tokenscript to validate
Weiwu Zhang
committed

Commits on Jun 24, 2020

modifies readme for tokenscript
lucas
committed

Commits on Jun 25, 2020

RFC4912 required a <type> for a named type that defines a type
Weiwu Zhang
committed
apply the same RFC4912 comformation change to the default ERC scripts
Weiwu Zhang
committed
corrisponding change in ERC72 was left out in the last commit
Weiwu Zhang
committed

Commits on Jun 26, 2020

Commits on Jun 29, 2020

Commits on Jun 30, 2020

updating the tokenscript schema README to explain the release cycle. (#371)
Weiwu Zhang
authored

Commits on Jul 5, 2020

RFC4912 required a <type> for a named type that defines a type
Weiwu Zhang
committed
apply the same RFC4912 comformation change to the default ERC scripts
Weiwu Zhang
committed
corrisponding change in ERC72 was left out in the last commit
Weiwu Zhang
committed
allowing <origins> and allowing empty <asnx:element>
Weiwu Zhang
committed
making ERC721 compatible with the <origins> style too
Weiwu Zhang
committed
retro-rename the 3rd element in ERC20 transfer/approve events to amount to fit JavaScript which uses the word 'amount'
Weiwu Zhang
committed

Commits on Jul 8, 2020

Add the link to basic tutorial
zhangzhongnan928
authored

Commits on Jul 13, 2020

Commits on Jul 14, 2020

revert a change in the previous version which forced asnx:element to have children
Weiwu Zhang
committed

Commits on Jul 15, 2020

forgot a few patches in the previous comment that replaces card attributes with card origins
Weiwu Zhang
committed
ah still wrong, correcting LHS field name
Weiwu Zhang
committed
Merge branch 'master' into correct-violation-of-rfc4912+add-origins-in-activity
Weiwu Zhang
committed

Commits on Jul 20, 2020

adding the keyref constraints on the newly added card/origins's events
Weiwu Zhang
committed
requiring contract in Ethereum Event as Sangalli would need
Weiwu Zhang
committed
Merge pull request #373 from AlphaWallet/correct-violation-of-rfc4912+add-origins-in-activity
Weiwu Zhang
authored

Commits on Jul 22, 2020

adding use="required" to the attributes that needs it
Weiwu Zhang
committed
make function required when calling, optional when making a transaction
Weiwu Zhang
committed

Commits on Jul 25, 2020

Commits on Jul 26, 2020

refactor view as we only need them in cards
Weiwu Zhang
committed
allowing guide-view
Weiwu Zhang
committed
requiring name for cards, reasons explained https://community.tokenscript.org/t/cards-name/406
Weiwu Zhang
committed

Commits on Jul 28, 2020

attempt to make the keyref enforcement work on ethereum:call's type as well
Weiwu Zhang
committed
Resolved issue - The XPath expression //ts:origins/ethereum:event|//ts:origins/ethereum:call could not be compiled.

darakhbharat
authored and
Weiwu Zhang
committed

Commits on Aug 7, 2020

introducing distinct as per previous ts meeting
Weiwu Zhang
committed
introducing distinct as per previous ts meeting
Weiwu Zhang
committed
unify token as top level element & as reference, both allow name
Weiwu Zhang
committed

Commits on Sep 3, 2020

Commits on Sep 6, 2020

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
darakhbharat
committed

Commits on Sep 8, 2020

Merge pull request #386 from AlphaWallet/fix-erc721-activity-views-reference-to-implicit-tokenid
JamesANZ
authored

Commits on Sep 17, 2020

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 <at…
darakhbharat
committed

Commits on Sep 19, 2020

Commits on Oct 11, 2020

XSLT is not needed for xml.xsd
Weiwu Zhang
committed
Merge branch 'master' of github.com:AlphaWallet/TokenScript
Weiwu Zhang
committed

Commits on Oct 12, 2020

Commits on Oct 20, 2020

Merge pull request #388 from AlphaWallet/distinct
Weiwu Zhang
authored
providing a basic frame for using tokenscript on a web page
Weiwu Zhang
committed
adding notes on future extensibility
Weiwu Zhang
committed
first version handed to Oleg
Weiwu Zhang
committed
new version with TokenNegotiation
Weiwu Zhang
committed
realised that doing .then() on the 2nd round of negotiation isn't necessary in this example thanks to prior event listener
Weiwu Zhang
committed
using meta correctly + using x.509 convention that objectClass be in lowercase
Weiwu Zhang
committed
added bootstrap.js to parse XML and updated entry-token.html(fixed errors, added comments, changed come logic)

oleggrib
authored and
Weiwu Zhang
committed
sample JSON to be transformed from module
Weiwu Zhang
committed
breaking down the negotiation into active/passive pair
Weiwu Zhang
committed
refactored bootstrap.js , created Negotiator global object to parse XML file and meta tags. if meta token defined then its auto create top-left bar with token view, in other way user have to click …

oleggrib
authored and
Weiwu Zhang
committed
James Brown provided a new contract address for Rinkby
Weiwu Zhang
committed
JB updated the contract address for token holder 0x0C770da98559DD6806a6C7cbC77411cF7a9042Ae
Weiwu Zhang
committed
adding definition for balanceOf
Weiwu Zhang
committed
most of methods moved to Negotiator. Negotiator do all work to prepare floating box, listeners, pop-up select, XML parsing. TokenScript class render iframe and inject helpers.

oleggrib
authored and
Weiwu Zhang
committed
updated token ID to use tokenID=... or ownerAddress=0x...

oleggrib
authored and
Weiwu Zhang
committed
adding an 2nd example with activity defined
Weiwu Zhang
committed
added event parsing code with console output. to run code we have to press button

oleggrib
authored and
Weiwu Zhang
committed
fix : let -> var

oleggrib
authored and
Weiwu Zhang
committed
added erc-20 activity cards pop-up

oleggrib
authored and
Weiwu Zhang
committed
ready to be taken into master soon, renaming directories
Weiwu Zhang
committed
changed message for connect/disconnect network and added button to Connect to Metamask

oleggrib
authored and
Weiwu Zhang
committed
convert the error message to a table for better display
Weiwu Zhang
committed
breaking things a bit by assuming passive negotiation and show the filter expression.
Weiwu Zhang
committed
added upload/download XML and filters

oleggrib
authored and
Weiwu Zhang
committed
fixed box title

oleggrib
authored and
Weiwu Zhang
committed
added tests, some code moved to separate module, active negotiation pop-up removed

oleggrib
authored and
Weiwu Zhang
committed
every card use own iframe

oleggrib
authored and
Weiwu Zhang
committed
added live event update, new event marker, erc20 token props list and lot other improvements

oleggrib
authored and
Weiwu Zhang
committed

Commits on Oct 22, 2020

Commits on Oct 25, 2020

token name is required thanks to the previous merge of Oleg's token negotiation
Weiwu Zhang
committed

Commits on Oct 26, 2020

no longer using IDREF (replaced most with keyref) since many months ago but found this left-over
Weiwu Zhang
committed

Commits on Oct 31, 2020

allow contract reference & attribute refer to another
Weiwu Zhang
committed

Commits on Nov 2, 2020

allowing accessing storage
Weiwu Zhang
committed

Commits on Dec 24, 2020

docs are generated from the document repository
Weiwu Zhang
committed
Set theme jekyll-theme-minimal
Weiwu Zhang
committed

Commits on Jan 7, 2021

Commits on Jan 28, 2021

adding flow chart for authenticator and negotiator
Weiwu Zhang
committed

Commits on Apr 7, 2021

Commits on Apr 8, 2021

using ES module instead of nodejs require (for webpack). Also making the folder structure webpack friendly
Weiwu Zhang
committed

Commits on Apr 9, 2021

updating readme since most of its content is moved to the sub-directories
Weiwu Zhang
committed
adding the index.js which was forgotten earlier.
Weiwu Zhang
committed

Commits on Dec 2, 2021

Update README.md (#421)
zhangzhongnan928
authored

Commits on May 9, 2022

version obtained from Tore which is based on an earlier version from James
Weiwu
committed

Commits on May 10, 2022

Added Hu's suggestions
Tore Kasper Frederiksen
committed
Changed getScriptURI to scriptURI
Tore Kasper Frederiksen
committed

Commits on May 16, 2022

wording update and dos2unix endian update
Weiwu Zhang
committed

Commits on May 17, 2022

Updated naming convention
Tore Kasper Frederiksen
committed

Commits on May 18, 2022

half-way attempt to divide the ERC into 2
Weiwu Zhang
committed
Merge branch 'new_ercs' of github.com:TokenScript/TokenScript into new_ercs
Weiwu Zhang
committed
splitting ERCs into 2
Weiwu Zhang
committed
amending to add optional contract inteface
Weiwu Zhang
committed
renaming
Weiwu Zhang
committed

Commits on May 20, 2022

Added details to both the split and combined ERCs
Tore Kasper Frederiksen
committed

Commits on May 25, 2022

rename so every file look the same
Weiwu Zhang
committed
wording update, mostly
Weiwu Zhang
committed
Refine language
Weiwu Zhang
committed
wording update, mostly
Weiwu Zhang
committed
Refine language
Weiwu Zhang
committed
Merge branch 'new_ercs' of https://github.com/TokenScript/TokenScript into new_ercs
Tore Kasper Frederiksen
committed
to make it clear ERC5XX0 doesn't require new key pairs at all
Weiwu Zhang
committed
Changed from struct to string[]
Tore Kasper Frederiksen
committed
Merge branch 'new_ercs' of https://github.com/TokenScript/TokenScript into new_ercs
Tore Kasper Frederiksen
committed
Added suggestion of self administration of array of scripturi
Tore Kasper Frederiksen
committed

Commits on May 30, 2022

Add sample implementations
JamesSmartCell
committed

Commits on Jun 7, 2022

trivial text change.
Weiwu Zhang
authored

Commits on Jun 16, 2022

sorry James, I'm removing this large chunk because it belongs to the 2nd ERC and it made the first ERC too wordy
Weiwu Zhang
committed
Merge branch 'new_ercs' of github.com:TokenScript/TokenScript into new_ercs
Weiwu Zhang
committed
copy-editing, and fixing the first 4 out of 5 problems in feedback:
Weiwu Zhang
committed
Tried to shorten ERC5xx0 a bit
Tore Kasper Frederiksen
committed

Commits on Jun 17, 2022

Added Henderson's test case
Tore Kasper Frederiksen
committed
updated to avoid the issues Jason's feedback revealed.
Weiwu Zhang
authored
spelling
Weiwu Zhang
authored
Update ERC5XX0 draft.md
Weiwu Zhang
authored
Update ERC5XX0 draft.md
Weiwu Zhang
authored
use download instead of location to resources
Weiwu Zhang
authored

Commits on Jun 20, 2022

Tried to shorten and proof read 5xx1
Tore Kasper Frederiksen
committed
Tried to shorten and proof read 5xx1
Tore Kasper Frederiksen
committed
more shortening
Tore Kasper Frederiksen
committed