Merge pull request #118 from aeternity/PT-167126818

Pt 167126818
This commit is contained in:
Thomas Arts 2019-08-06 15:30:47 +02:00 committed by GitHub
commit df12f6af91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions

2
.gitignore vendored
View File

@ -19,3 +19,5 @@ rebar3.crashdump
*.erl~
*.aes~
aesophia
.qcci
current_counterexample.eqc

View File

@ -2,7 +2,7 @@
{erl_opts, [debug_info]}.
{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {ref,"17c2a93"}}}
{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {ref,"2a9035d"}}}
, {getopt, "1.0.1"}
, {eblake2, "1.0.0"}
, {jsx, {git, "https://github.com/talentdeficit/jsx.git",

View File

@ -1,7 +1,7 @@
{"1.1.0",
[{<<"aebytecode">>,
{git,"https://github.com/aeternity/aebytecode.git",
{ref,"17c2a93e7213387a0fd9f9f9395e12de50355982"}},
{ref,"2a9035d5ef72bc65e51e4b9a1a958bb8ba2c6747"}},
0},
{<<"aeserialization">>,
{git,"https://github.com/aeternity/aeserialization.git",

View File

@ -121,7 +121,8 @@ from_string1(aevm, ContractString, Options) ->
{ok, #{byte_code => ByteCode,
compiler_version => Version,
contract_source => ContractString,
type_info => TypeInfo
type_info => TypeInfo,
abi_version => aeb_aevm_abi:abi_version()
}};
from_string1(fate, ContractString, Options) ->
#{fcode := FCode} = string_to_code(ContractString, Options),
@ -132,7 +133,8 @@ from_string1(fate, ContractString, Options) ->
compiler_version => Version,
contract_source => ContractString,
type_info => [],
fate_code => FateCode
fate_code => FateCode,
abi_version => aeb_fate_abi:abi_version()
}}.
-spec string_to_code(string(), options()) -> map().