Support target artifact selection in JSON I/O by axic · Pull Request #2146 · argotorg/solidity

axic · 2017-04-20T19:17:51Z

Fixes #2897. Depends on #2729.

axic · 2017-04-20T22:38:44Z

libsolidity/interface/StandardCompiler.cpp

+bool isTargetRequired(Json::Value const& _targets, string const& _target)
+{
+	for (auto const& target: _targets)
+		if (target == _target)


Need to support sub matches, e.g. evm.assembly should be enabled by both evm.assembly, evm, evm.*, etc.

@chriseth do you have any code suggestion for doing so? E.g. requiring evm.assembly matches both the user supplied evm.assembly, evm.* and evm, without hardcoding these paths.

chriseth · 2017-07-13T13:03:22Z

What is left to do here? Can you work on this next, @axic?

axic · 2017-07-13T23:16:46Z

Reviewed it again, I think the API (isTargetRequired) and the part using it is clear enough, but the actual implementation is broken, hence the tests failures.

It also doesn't support wildcards properly and shortest match.

axic · 2017-08-10T18:59:47Z

Need to add tests for matching different combinations (evm, evm.*, evm.assembly, etc.)

axic · 2017-08-10T19:04:37Z

test/libsolidity/StandardCompiler.cpp

+		},
+		"outputSelection": {
+			"fileA": {
+				"A": [ "abi", "devdoc", "userdoc", "evm", "metadata" ]


This is annoying, one of the reasons for the failing tests was a missing comma here at the end 😕

chriseth · 2017-10-18T16:25:02Z

Changelog.md

 Features:
 * Parser: Better error message for unexpected trailing comma in parameter lists.
- * Standard JSON: Support the ``outputSelection`` field for selective compilation of supplied sources.
+ * Standard JSON: Support the ``outputSelection`` field for selective compilation.


Please move to 0.4.19

axic · 2017-10-19T10:11:50Z

Depends on argotorg/solc-js#159.

axic · 2017-10-19T13:23:09Z

@chriseth This is working now (as confirmed by circleci). It still needs support for shorcuts (e.g. evm.bytecode matching evm.bytecode.object)

axic · 2017-10-19T14:05:50Z

@chriseth can you review this? it may be worth even merging it in this state, though more tests cannot hurt.

chriseth · 2017-10-19T14:11:48Z

solc/jsonCompiler.cpp

 	input["settings"]["optimizer"]["runs"] = 200;

+	// Enable all SourceUnit-level outputs.
+	input["settings"]["outputSelection"]["*"][""][0] = "*";


Does [0] automatically make it an array?

Yep. Had an ugly large code before to do it manually.

chriseth · 2017-10-19T14:16:44Z

libsolidity/interface/StandardCompiler.cpp

 	return sources;
 }

+bool isTargetRequired(Json::Value const& _targets, string const& _target)


Perhaps better requested than required?

Sure, but also please see my other naming suggestion below.

chriseth · 2017-10-19T14:20:32Z

libsolidity/interface/StandardCompiler.cpp

+			{
+				/// Special case for SourceUnit-level targets (such as AST)
+				if (
+					_targets[file].isMember("") &&


Can you extract this condition into a function and also use it in line 129?

axic · 2017-11-22T13:35:41Z

@chriseth I think this should be ready now?

axic · 2017-11-22T16:31:00Z

@chriseth added two more commits to simplify/optimize it even more (last 3 commits should be squashed). Please check those two.

chriseth · 2017-11-23T17:59:36Z

Looks good!

axic added the in progress label Apr 20, 2017

axic mentioned this pull request Apr 20, 2017

Support "standardised" JSON compiler input/output #1639

Merged

13 tasks

axic force-pushed the jsonio-target-selection branch from 3561ab1 to 06903c9 Compare April 20, 2017 22:17

axic commented Apr 20, 2017

View reviewed changes

axic force-pushed the jsonio-target-selection branch 2 times, most recently from 5255f71 to bdf2ddd Compare April 24, 2017 15:15

axic force-pushed the jsonio-target-selection branch from bdf2ddd to f214c66 Compare May 2, 2017 16:05

axic force-pushed the jsonio-target-selection branch from f214c66 to a2fc9b1 Compare May 30, 2017 18:12

axic force-pushed the jsonio-target-selection branch from a2fc9b1 to 27ab6bf Compare June 27, 2017 08:26

axic force-pushed the jsonio-target-selection branch from 27ab6bf to fa6f8b3 Compare July 13, 2017 23:24

axic mentioned this pull request Jul 18, 2017

Generate ABI only argotorg/solc-js#112

Closed

axic force-pushed the jsonio-target-selection branch 2 times, most recently from 5027c83 to a7aa3bc Compare July 19, 2017 11:15

axic commented Aug 10, 2017

View reviewed changes

axic force-pushed the jsonio-target-selection branch 5 times, most recently from d8ac20f to 1e62516 Compare August 10, 2017 20:29

axic force-pushed the jsonio-target-selection branch from a6a62b6 to dea2b70 Compare August 23, 2017 12:17

axic force-pushed the jsonio-target-selection branch 3 times, most recently from 378c0d5 to c369352 Compare October 5, 2017 10:21

chriseth reviewed Oct 18, 2017

View reviewed changes

axic changed the title ~~[WIP] Support target selection in JSON I/O~~ [WIP] Support target artifact selection in JSON I/O Oct 18, 2017

axic force-pushed the jsonio-target-selection branch 2 times, most recently from bd622d1 to 64bd962 Compare October 19, 2017 01:20

axic force-pushed the jsonio-target-selection branch from 64bd962 to 76b9165 Compare October 19, 2017 13:10

chriseth reviewed Oct 19, 2017

View reviewed changes

axic changed the title ~~[WIP] Support target artifact selection in JSON I/O~~ Support target artifact selection in JSON I/O Nov 22, 2017

axic force-pushed the jsonio-target-selection branch from c9f237f to cb9fe1d Compare November 22, 2017 13:35

axic force-pushed the jsonio-target-selection branch from cb9fe1d to 8a86249 Compare November 22, 2017 13:36

axic added the nextrelease label Nov 22, 2017

chriseth approved these changes Nov 22, 2017

View reviewed changes

axic force-pushed the jsonio-target-selection branch from 8a86249 to 9b9405e Compare November 22, 2017 16:30

axic force-pushed the jsonio-target-selection branch from 9b9405e to cb06f02 Compare November 29, 2017 16:09

axic added 8 commits November 29, 2017 20:10

Add target selection helpers to StandardCompiler

d37e6ba

Limit output according to the selected targets in StandardCompiler

8da245c

Specify output selection in tests

73d25c8

Request all outputs in JSONCompiler

123d85a

Add workaround for bytecode/deployedBytecode selection

bbcec95

Update standard json documentation

59bed63

Rename target selection to use the word artifact

b202319

Simplify target selection code

3576ccf

axic force-pushed the jsonio-target-selection branch from cb06f02 to 3576ccf Compare November 29, 2017 20:10

axic merged commit ffb3a3c into develop Nov 29, 2017

axic deleted the jsonio-target-selection branch November 29, 2017 21:09

axic removed in progress labels Nov 29, 2017

Conversation

axic commented Apr 20, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chriseth commented Jul 13, 2017

Uh oh!

axic commented Jul 13, 2017

Uh oh!

axic commented Aug 10, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

axic commented Oct 19, 2017

Uh oh!

axic commented Oct 19, 2017

Uh oh!

axic commented Oct 19, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

axic commented Nov 22, 2017

Uh oh!

axic commented Nov 22, 2017

Uh oh!

chriseth commented Nov 23, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

axic commented Apr 20, 2017 •

edited

Loading

axic commented Oct 19, 2017 •

edited

Loading