From 9b36c771c7998f1e3ab4fca2fd96c09c4e2a68c5 Mon Sep 17 00:00:00 2001 From: Sean Hinde Date: Mon, 1 Nov 2021 18:37:12 +0100 Subject: [PATCH 1/2] Update to use latest enacl with new API --- rebar.config | 2 +- src/aeser_contract_code.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rebar.config b/rebar.config index b388e03..d84c9d4 100644 --- a/rebar.config +++ b/rebar.config @@ -1,4 +1,4 @@ {erl_opts, [debug_info]}. {deps, [ {base58, {git, "https://github.com/aeternity/erl-base58.git", {ref, "60a3356"}}} - , {enacl, {git, "https://github.com/aeternity/enacl.git", {ref, "26180f4"}}} + , {enacl, {git, "https://github.com/aeternity/enacl.git", {ref, "793ddb5"}}} ]}. diff --git a/src/aeser_contract_code.erl b/src/aeser_contract_code.erl index dab6b17..baddccf 100644 --- a/src/aeser_contract_code.erl +++ b/src/aeser_contract_code.erl @@ -23,7 +23,7 @@ serialize(CodeMap = #{ byte_code := ByteCode SourceHash = case CodeMap of #{ source_hash := SHash } -> SHash; #{ contract_source := SrcStr } -> - {ok, SHash} = enacl:generichash(32, list_to_binary(SrcStr)), + SHash = enacl:generichash(32, list_to_binary(SrcStr)), SHash end, -- 2.30.2 From 27bb4331aa3ebdbe088a20f736e47c8794809285 Mon Sep 17 00:00:00 2001 From: Sean Hinde Date: Tue, 2 Nov 2021 09:36:45 +0100 Subject: [PATCH 2/2] Small tidy up --- src/aeser_contract_code.erl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/aeser_contract_code.erl b/src/aeser_contract_code.erl index baddccf..0605420 100644 --- a/src/aeser_contract_code.erl +++ b/src/aeser_contract_code.erl @@ -23,8 +23,7 @@ serialize(CodeMap = #{ byte_code := ByteCode SourceHash = case CodeMap of #{ source_hash := SHash } -> SHash; #{ contract_source := SrcStr } -> - SHash = enacl:generichash(32, list_to_binary(SrcStr)), - SHash + enacl:generichash(32, list_to_binary(SrcStr)) end, %% Compiler version -- 2.30.2