QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

Fix calldata #812

Merged
zxq9 merged 2 commits from calldata-fix into master 2021-06-24 16:19:05 +09:00
Conversation 3 Commits 2 Files Changed 2 +3 -1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,3 +21,4 @@ rebar3.crashdump
aesophia aesophia
.qcci .qcci
current_counterexample.eqc current_counterexample.eqc
test/contracts/test.aes

3
src/aeso_compiler.erl
View File

@ -244,8 +244,9 @@ check_call1(ContractString0, FunName, Args, Options) ->
fate -> fate ->
%% First check the contract without the __call function %% First check the contract without the __call function
#{ fcode := OrgFcode #{ fcode := OrgFcode
, fcode_env := #{child_con_env := ChildContracts}
, ast := Ast } = string_to_code(ContractString0, Options), , ast := Ast } = string_to_code(ContractString0, Options),
FateCode = aeso_fcode_to_fate:compile(OrgFcode, []), FateCode = aeso_fcode_to_fate:compile(ChildContracts, OrgFcode, []),
%% collect all hashes and compute the first name without hash collision to %% collect all hashes and compute the first name without hash collision to
SymbolHashes = maps:keys(aeb_fate_code:symbols(FateCode)), SymbolHashes = maps:keys(aeb_fate_code:symbols(FateCode)),
CallName = first_none_match(?CALL_NAME, SymbolHashes, CallName = first_none_match(?CALL_NAME, SymbolHashes,