Small tidy up

Add paying_for_tx to aeser_chain_objects

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"}}}
        ]}.

src/aeser_api_encoder.erl

@@ -38,8 +38,7 @@
                     | poi
                     | state_trees
                     | call_state_tree
-                    | bytearray
-                    | fate_code.
+                    | bytearray.
 
 -type extended_type() :: known_type() | block_hash | {id_hash, [known_type()]}.
 
@@ -200,8 +199,7 @@ type2enc(state)                -> ?BASE64;
 type2enc(poi)                  -> ?BASE64;
 type2enc(state_trees)          -> ?BASE64;
 type2enc(call_state_tree)      -> ?BASE64;
-type2enc(bytearray)            -> ?BASE64;
-type2enc(fate_code)            -> ?BASE64.
+type2enc(bytearray)            -> ?BASE64.
 
 
 type2pfx(key_block_hash)       -> <<"kh">>;
@@ -229,8 +227,7 @@ type2pfx(state)                -> <<"st">>;
 type2pfx(poi)                  -> <<"pi">>;
 type2pfx(state_trees)          -> <<"ss">>;
 type2pfx(call_state_tree)      -> <<"cs">>;
-type2pfx(bytearray)            -> <<"ba">>;
-type2pfx(fate_code)            -> <<"fc">>.
+type2pfx(bytearray)            -> <<"ba">>.
 
 pfx2type(<<"kh">>) -> key_block_hash;
 pfx2type(<<"mh">>) -> micro_block_hash;
@@ -257,8 +254,7 @@ pfx2type(<<"st">>) -> state;
 pfx2type(<<"pi">>) -> poi;
 pfx2type(<<"ss">>) -> state_trees;
 pfx2type(<<"cs">>) -> call_state_tree;
-pfx2type(<<"ba">>) -> bytearray;
-pfx2type(<<"fc">>) -> fate_code.
+pfx2type(<<"ba">>) -> bytearray.
 
 -spec byte_size_for_type(known_type()) -> non_neg_integer() | not_applicable.
 
@@ -287,8 +283,7 @@ byte_size_for_type(state)                -> 32;
 byte_size_for_type(poi)                  -> not_applicable;
 byte_size_for_type(state_trees)          -> not_applicable;
 byte_size_for_type(call_state_tree)      -> not_applicable;
-byte_size_for_type(bytearray)            -> not_applicable;
-byte_size_for_type(fate_code)            -> not_applicable.
+byte_size_for_type(bytearray)            -> not_applicable.
 
 
 %% TODO: Fix the base58 module so that it consistently uses binaries instead

src/aeser_chain_objects.erl

@@ -58,6 +58,7 @@ tag(contract_call) -> 41;
 tag(contract_create_tx) -> 42;
 tag(contract_call_tx) -> 43;
 tag(channel_create_tx) -> 50;
+tag(channel_set_delegates_tx) -> 501;
 tag(channel_deposit_tx) -> 51;
 tag(channel_withdraw_tx) -> 52;
 tag(channel_force_progress_tx) -> 521;
@@ -89,6 +90,7 @@ tag(accounts_mtree) -> 626;
 tag(compiler_sophia) -> 70;
 tag(ga_attach_tx) -> 80;
 tag(ga_meta_tx) -> 81;
+tag(paying_for_tx) -> 82;
 tag(key_block) -> 100;
 tag(micro_block) -> 101;
 tag(light_micro_block) -> 102;
@@ -116,6 +118,7 @@ rev_tag(41) -> contract_call;
 rev_tag(42) -> contract_create_tx;
 rev_tag(43) -> contract_call_tx;
 rev_tag(50) -> channel_create_tx;
+rev_tag(501) -> channel_set_delegates_tx;
 rev_tag(51) -> channel_deposit_tx;
 rev_tag(52) -> channel_withdraw_tx;
 rev_tag(521) -> channel_force_progress_tx;
@@ -147,6 +150,7 @@ rev_tag(626) -> accounts_mtree;
 rev_tag(70) -> compiler_sophia;
 rev_tag(80) -> ga_attach_tx;
 rev_tag(81) -> ga_meta_tx;
+rev_tag(82) -> paying_for_tx;
 rev_tag(100) -> key_block;
 rev_tag(101) -> micro_block;
 rev_tag(102) -> light_micro_block;

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 } ->
-                         {ok, SHash} = enacl:generichash(32, list_to_binary(SrcStr)),
-                         SHash
+                         enacl:generichash(32, list_to_binary(SrcStr))
                  end,
 
     %% Compiler version

test/aeser_api_encoder_tests.erl

@@ -23,7 +23,6 @@
                , {commitment        , 32}
                , {peer_pubkey       , 32}
                , {state             , 32}
-               , {fate_code         , not_applicable}
                , {poi               , not_applicable}]).
 
 encode_decode_test_() ->