compiler: add ability to generate .abi.json file #916
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master-2.x #916 +/- ##
==============================================
+ Coverage 67.86% 67.90% +0.04%
==============================================
Files 142 142
Lines 13433 13471 +38
==============================================
+ Hits 9116 9148 +32
- Misses 3900 3906 +6
Partials 417 417
Continue to review full report at Codecov.
|
roman-khimov
requested changes
Apr 29, 2020
pkg/compiler/compiler.go
Outdated
| ABIInfo string | ||
|
|
||
| // Contract metadata. | ||
| ContractDetails *request.ContractDetails |
There was a problem hiding this comment.
Please move ContractDetails out of rpc/request to smartcontract, importing anything RPC-related into the compiler is just weird.
pkg/compiler/debug.go
Outdated
| @@ -260,3 +298,40 @@ func parsePairJSON(data []byte, sep string) (string, string, error) { | |||
| } | |||
| return ss[0], ss[1], nil | |||
| } | |||
|
|
|||
| func (di *DebugInfo) convertToABI(contract []byte, cd *request.ContractDetails) ABI { | |||
There was a problem hiding this comment.
Can we add some test for it?
AnnaShaleva
force-pushed
the
compiler/generate_abi
branch
from
51f63fe
to
70cbb7e
Compare
|
Also as part of #902, for the current moment we have difference in abi.json parameters/variables type format which leads to
However, that's not critical error. |
roman-khimov
reviewed
May 1, 2020
pkg/compiler/compiler.go
Outdated
| @@ -11,6 +11,8 @@ import ( | |||
| "path/filepath" | |||
| "strings" | |||
|
|
|||
| "github.com/nspcc-dev/neo-go/pkg/smartcontract" | |||
|
|
|||
roman-khimov
reviewed
May 1, 2020
pkg/compiler/debug.go
Outdated
| @@ -8,6 +8,11 @@ import ( | |||
| "go/types" | |||
| "strconv" | |||
| "strings" | |||
|
|
|||
| "github.com/nspcc-dev/neo-go/pkg/smartcontract" | |||
|
|
|||
roman-khimov
requested changes
May 1, 2020
pkg/compiler/debug_test.go
Outdated
| @@ -3,6 +3,9 @@ package compiler | |||
| import ( | |||
| "testing" | |||
|
|
|||
| "github.com/nspcc-dev/neo-go/pkg/crypto/hash" | |||
| "github.com/nspcc-dev/neo-go/pkg/smartcontract" | |||
|
|
|||
pkg/compiler/debug.go
Outdated
| params := make([]DebugParam, 0, ps.NumFields()) | ||
| for i := range params { | ||
| params := make([]DebugParam, ps.NumFields()) | ||
| count := 0 |
There was a problem hiding this comment.
I think append() style would still look a bit better here (not needing any count, for example), to fix the original problem you only need to change the range iterator.
AnnaShaleva
force-pushed
the
compiler/generate_abi
branch
from
70cbb7e
to
5525cf8
Compare
Method `methodInfoFromScope(...)` always returned an empty parameters set, so we were missing this information in both .abi.json and .debug.json files. Fixed now.
A part of integration with NEO Blockchain Toolkit (see #902). To be able to deploy smart-contract compiled with neo-go compiler via NEO Express, we have to generate additional .abi.json file. This file contains the following information: - hash of the compiled contract - smart-contract metadata (title, description, version, author, email, has-storage, has-dynamic-invoke, is-payable) - smart-contract entry point - functions - events However, this .abi.json file is slightly different from the one, described in manifest.go, so we have to add auxilaury stractures for json marshalling. The .abi.json format used by NEO-Express is described [here](https://github.com/neo-project/neo-devpack-dotnet/blob/master/src/Neo.Compiler.MSIL/FuncExport.cs#L66).
AnnaShaleva
force-pushed
the
compiler/generate_abi
branch
from
5525cf8
to
99d0baf
Compare
roman-khimov
approved these changes
May 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A part of integration with NEO Blockchain Toolkit (see #902). To be
able to deploy smart-contract compiled with neo-go compiler via NEO
Express, we have to generate additional .abi.json file. This file
contains the following information:
email, has-storage, has-dynamic-invoke, is-payable)
However, this .abi.json file is slightly different from the one,
described in manifest.go, so we have to add auxilaury stractures for
json marshalling. The .abi.json format used by NEO-Express is described
here.