Skip to content
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

Solc 0.6.0 #316

Merged
merged 3 commits into from
Mar 24, 2020
Merged

Solc 0.6.0 #316

merged 3 commits into from
Mar 24, 2020

Conversation

MrChico
Copy link
Member

@MrChico MrChico commented Dec 23, 2019

draft pr for visibility,
Non-exhaustive list of things that need fixing in order to support 0.6.0 are:

  • Upgrade ds-test to follow the breaking changes convensions
  • Fix Solidity.hs to accomodate the new srcmap format

@MrChico MrChico marked this pull request as ready for review March 18, 2020 19:48
@MrChico
Copy link
Member Author

MrChico commented Mar 18, 2020

The main hurdle to allowing for solc-0.6 has been the breaking change in the srcmap format, which this PR supports. Together with dapphub/ds-test#14, the basic dapp workflow now works with solc-0.6, even if a lot of ds packages still need updating.

I suggest we don't let updating the rest of ds-* block this though

done (xs, s, p) = let (xs', _, _) = go ';' (xs, s, p) in xs'

go ':' (xs, F1 [] _, p@(SM a _ _ _)) = (xs, F2 a [] 1, p)
go ':' (xs, F1 ds k, p) = (xs, F2 (k * digits ds) [] 1, p)
go :: Char -> (Seq SrcMap, SrcMapParseState, SrcMap) -> (Seq SrcMap, SrcMapParseState, SrcMap)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good luck reviewing this!

@asymmetric
Copy link
Contributor

I'm fine with merging this if you've tested it.

@MrChico MrChico merged commit 8731ff8 into master Mar 24, 2020
@asymmetric asymmetric deleted the solc-0.6.0 branch March 24, 2020 19:56
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