Skip to content

change schema to october #245

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.

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 6 commits into from
Oct 17, 2019
Merged

change schema to october #245

merged 6 commits into from
Oct 17, 2019

Conversation

bitcoinwarrior1
Copy link
Contributor

@colourful-land please resume work on return types from this PR and then we can update everything and merge

@SmartLayer
Copy link

This issue intends to solve #225 but it's unfished yet

@SmartLayer
Copy link

@James-Sangalli I've done my changes to add bitmask to the ethereum element. Can you check if every example passes the new schema and if so, update every example to refer to the new schema? Thanks.

@bitcoinwarrior1
Copy link
Contributor Author

bitcoinwarrior1 commented Sep 30, 2019

@James-Sangalli I've done my changes to add bitmask to the ethereum element. Can you check if every example passes the new schema and if so, update every example to refer to the new schema? Thanks.

@colourful-land schema validation fails on legacy tokenscripts,try it out in the intellij IDE as it will syntax highlight.

Error for compound ZRX token:

$ make cZRX.canonicalized.xml cZRX.canonicalized.xml.INVALID:1: element token: Schemas validity error : Element '{http://tokenscript.org/2019/10/tokenscript}token': No matching global declaration available for the validation root. cZRX.canonicalized.xml.INVALID fails to validate make: [cZRX.canonicalized.xml] Error 3 (ignored)

@bitcoinwarrior1
Copy link
Contributor Author

@colourful-land might be good to add arrays to this Schema version as well?

@SmartLayer
Copy link

SmartLayer commented Sep 30, 2019

@James-Sangalli I've done my changes to add bitmask to the ethereum element. Can you check if every example passes the new schema and if so, update every example to refer to the new schema? Thanks.

@colourful-land schema validation fails on legacy tokenscripts,try it out in the intellij IDE as it will syntax highlight.

Error for compound ZRX token:

$ make cZRX.canonicalized.xml cZRX.canonicalized.xml.INVALID:1: element token: Schemas validity error : Element '{http://tokenscript.org/2019/10/tokenscript}token': No matching global declaration available for the validation root. cZRX.canonicalized.xml.INVALID fails to validate make: [cZRX.canonicalized.xml] Error 3 (ignored)

I think you can work out this one on yourself if you observe how I updated one example. Observe how I made Devcon.xml work:

$ make Devcon.canonicalized.xml
# XML Canonicalization
xmlstarlet c14n Devcon.xml  > Devcon.canonicalized.xml
# XML Validation
xmlstarlet val --xsd ../../schema/tokenscript.xsd Devcon.canonicalized.xml || (mv Devcon.canonicalized.xml Devcon.canonicalized.xml.INVALID; xmllint --noout --schema ../../schema/tokenscript.xsd Devcon.canonicalized.xml.INVALID)
Devcon.canonicalized.xml - valid

@bitcoinwarrior1
Copy link
Contributor Author

@colourful-land yup, it's working but the IDE doesn't like it mostly likely because the web path doesn't exist yet

@bitcoinwarrior1
Copy link
Contributor Author

@colourful-land have changed the TS files and removed the JS hack for compound e8 multipliers. Still WIP until we make the tokenscript schema for 2019/10 on the web

@bitcoinwarrior1
Copy link
Contributor Author

bitcoinwarrior1 commented Sep 30, 2019

@colourful-land also need to add the bitmask

@bitcoinwarrior1
Copy link
Contributor Author

@colourful-land also need to add the bitmask

Apologies, see you already have this

@bitcoinwarrior1
Copy link
Contributor Author

bitcoinwarrior1 commented Oct 1, 2019

@colourful-land ready to merge

Edit: Let's keep it open until we release the apps with new schema

@bitcoinwarrior1
Copy link
Contributor Author

@colourful-land iOS completed, just need to do android now

@bitcoinwarrior1 bitcoinwarrior1 force-pushed the october-schema branch 2 times, most recently from 9652e62 to 45e3635 Compare October 10, 2019 01:09
@bitcoinwarrior1
Copy link
Contributor Author

Android complete but needs review and iOS needs to fix issues with new schema

@bitcoinwarrior1
Copy link
Contributor Author

@colourful-land #252 is solved in 579a8d6

@bitcoinwarrior1 bitcoinwarrior1 changed the title add multipliers and change schema to october change schema to october Oct 10, 2019
@bitcoinwarrior1
Copy link
Contributor Author

iOS problem fixed here: AlphaWallet/alpha-wallet-ios#1495 once merged we are ready to go

Weiwu Zhang and others added 2 commits October 11, 2019 16:30
@bitcoinwarrior1 bitcoinwarrior1 merged commit 3e03544 into master Oct 17, 2019
@bitcoinwarrior1 bitcoinwarrior1 deleted the october-schema branch October 17, 2019 00:44
SmartLayer pushed a commit that referenced this pull request Jun 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants