From cecc9778985a6555d2e1036a5b64cfdbb6200c9d Mon Sep 17 00:00:00 2001 From: Thomas Arts Date: Tue, 6 Aug 2019 13:11:31 +0200 Subject: [PATCH 1/2] Compiler returns abi_version --- src/aeso_compiler.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/aeso_compiler.erl b/src/aeso_compiler.erl index 548ed8e..0280edd 100644 --- a/src/aeso_compiler.erl +++ b/src/aeso_compiler.erl @@ -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(). From 6aed5dfacb46b51adeca6e17acef24bc713290d1 Mon Sep 17 00:00:00 2001 From: Thomas Arts Date: Tue, 6 Aug 2019 13:20:03 +0200 Subject: [PATCH 2/2] Upgrade to newer aebytecode version --- .gitignore | 2 ++ rebar.config | 2 +- rebar.lock | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 45a6ec2..78df591 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ rebar3.crashdump *.erl~ *.aes~ aesophia +.qcci +current_counterexample.eqc diff --git a/rebar.config b/rebar.config index fa40b01..d8dc2ba 100644 --- a/rebar.config +++ b/rebar.config @@ -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", diff --git a/rebar.lock b/rebar.lock index cf62848..1f85a27 100644 --- a/rebar.lock +++ b/rebar.lock @@ -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",