Pt 167126818 #609

Merged
zxq9 merged 2 commits from PT-167126818 into master 2019-08-06 22:30:48 +09:00
Showing only changes of commit cecc977898 - Show all commits

View File

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