Fix ac_acct_state tag and restore key_block mapping

The previous commit accidentally removed key_block (tag 100) instead of
adding ac_acct_state (tag 99).

src/gmser_api_encoder.erl

@@ -36,6 +36,7 @@
                     | transaction
                     | tx_hash
                     | account_pubkey
+                    | {account_pubkey, 0..6}
                     | account_seckey
                     | associate_chain
                     | entry
@@ -107,8 +108,12 @@ safe_decode_keypair(#{<<"pub">> := EncPub, <<"priv">> := EncPriv}) ->
 
 -spec encode(known_type(), payload() | gmser_id:id()) -> encoded().
 encode(id_hash, Payload) ->
-    {IdType, Val} = gmser_id:specialize(Payload),
+    case gmser_id:to_map(Payload) of
-    encode(id2type(IdType), Val);
+        #{type := account, subtype := SubT, value := Val} ->
+            encode({account_pubkey, SubT}, Val);
+        #{type := IdType, value := Val} ->
+            encode(id2type(IdType), Val)
+    end;
 encode(Type, Payload) ->
     case type_size_check(Type, Payload) of
         ok ->
@@ -237,17 +242,16 @@ id2type(associate_chain) -> associate_chain;
 id2type(channel)         -> channel;
 id2type(commitment)      -> commitment;
 id2type(contract)        -> contract_pubkey;
-id2type(contract_source) -> contract_source;
 id2type(name)            -> name;
 id2type(native_token)    -> native_token;
 id2type(entry)           -> entry.
 
+type2id({account_pubkey, SubT}) -> {account, SubT};
 type2id(account_pubkey)  -> account;
 type2id(associate_chain) -> associate_chain;
 type2id(channel)         -> channel;
 type2id(commitment)      -> commitment;
 type2id(contract_pubkey) -> contract;
-type2id(contract_source) -> contract_source;
 type2id(name)            -> name;
 type2id(native_token)    -> native_token;
 type2id(entry)           -> entry.
@@ -266,6 +270,7 @@ type2enc(contract_store_value) -> ?BASE64;
 type2enc(contract_source)      -> ?BASE64;
 type2enc(transaction)          -> ?BASE64;
 type2enc(tx_hash)              -> ?BASE58;
+type2enc({account_pubkey, _})  -> ?BASE58;
 type2enc(account_pubkey)       -> ?BASE58;
 type2enc(account_seckey)       -> ?BASE58;
 type2enc(associate_chain)      -> ?BASE58;
@@ -298,6 +303,13 @@ type2pfx(contract_store_value) -> <<"cv">>;
 type2pfx(contract_source)      -> <<"cx">>;
 type2pfx(transaction)          -> <<"tx">>;
 type2pfx(tx_hash)              -> <<"th">>;
+type2pfx({account_pubkey,0})   -> <<"a0">>;
+type2pfx({account_pubkey,1})   -> <<"a1">>;
+type2pfx({account_pubkey,2})   -> <<"a2">>;
+type2pfx({account_pubkey,3})   -> <<"a3">>;
+type2pfx({account_pubkey,4})   -> <<"a4">>;
+type2pfx({account_pubkey,5})   -> <<"a5">>;
+type2pfx({account_pubkey,6})   -> <<"a6">>;
 type2pfx(account_pubkey)       -> <<"ak">>;
 type2pfx(account_seckey)       -> <<"sk">>;
 type2pfx(associate_chain)      -> <<"ac">>;
@@ -329,6 +341,13 @@ pfx2type(<<"ct">>) -> contract_pubkey;
 pfx2type(<<"cx">>) -> contract_source;
 pfx2type(<<"tx">>) -> transaction;
 pfx2type(<<"th">>) -> tx_hash;
+pfx2type(<<"a0">>) -> {account_pubkey, 0};
+pfx2type(<<"a1">>) -> {account_pubkey, 1};
+pfx2type(<<"a2">>) -> {account_pubkey, 2};
+pfx2type(<<"a3">>) -> {account_pubkey, 3};
+pfx2type(<<"a4">>) -> {account_pubkey, 4};
+pfx2type(<<"a5">>) -> {account_pubkey, 5};
+pfx2type(<<"a6">>) -> {account_pubkey, 6};
 pfx2type(<<"ak">>) -> account_pubkey;
 pfx2type(<<"sk">>) -> account_seckey;
 pfx2type(<<"ac">>) -> associate_chain;
@@ -363,6 +382,7 @@ byte_size_for_type(contract_source)      -> not_applicable;
 byte_size_for_type(transaction)          -> not_applicable;
 byte_size_for_type(tx_hash)              -> 32;
 byte_size_for_type(account_pubkey)       -> 32;
+byte_size_for_type({account_pubkey, _})  -> 32;
 byte_size_for_type(account_seckey)       -> 32;
 byte_size_for_type(associate_chain)      -> 32;
 byte_size_for_type(signature)            -> 64;

src/gmser_chain_objects.erl

@@ -100,6 +100,8 @@ tag(ac_deposit_tx) -> 94;
 tag(ac_update_cops_tx) -> 95;
 tag(ac_rollup_tx) -> 96;
 tag(ac_proposal_tx) -> 97;
+tag(ac_receipt) -> 98;
+tag(ac_acct_state) -> 99;
 tag(key_block) -> 100;
 tag(micro_block) -> 101;
 tag(light_micro_block) -> 102;
@@ -115,7 +117,16 @@ tag(entry) -> 140;
 tag(entry_create_tx) -> 141;
 tag(entry_transfer_tx) -> 142;
 tag(entry_destroy_tx) -> 143;
-tag(pof) -> 200.
+tag(account_key_store) -> 144;
+tag(account_create_tx) -> 145;
+tag(account_sig_store) -> 146;
+tag(auth_tx) -> 147;
+tag(proposal_gossip_tx) -> 148;
+tag(account_auth_update_tx) -> 149;
+tag(pof) -> 200;
+%% Gajumaru AC side transactions
+tag(ac_side_withdraw_tx) -> 300;
+tag(ac_side_rollup_tx) -> 301.
 
 rev_tag(10) -> account;
 rev_tag(11) -> signed_tx;
@@ -179,6 +190,8 @@ rev_tag(94)  -> ac_deposit_tx;
 rev_tag(95)  -> ac_update_cops_tx;
 rev_tag(96)  -> ac_rollup_tx;
 rev_tag(97)  -> ac_proposal_tx;
+rev_tag(98)  -> ac_receipt;
+rev_tag(99)  -> ac_acct_state;
 rev_tag(100) -> key_block;
 rev_tag(101) -> micro_block;
 rev_tag(102) -> light_micro_block;
@@ -194,4 +207,13 @@ rev_tag(140) -> entry;
 rev_tag(141) -> entry_create_tx;
 rev_tag(142) -> entry_transfer_tx;
 rev_tag(143) -> entry_destroy_tx;
-rev_tag(200) -> pof.
+rev_tag(144) -> account_key_store;
+rev_tag(145) -> account_create_tx;
+rev_tag(146) -> account_sig_store;
+rev_tag(147) -> auth_tx;
+rev_tag(148) -> proposal_gossip_tx;
+rev_tag(149) -> account_auth_update_tx;
+rev_tag(200) -> pof;
+%% Gajumaru AC side transactions
+rev_tag(300) -> ac_side_withdraw_tx;
+rev_tag(301) -> ac_side_rollup_tx.

src/gmser_id.erl

@@ -14,6 +14,9 @@
         , specialize/1
         , specialize/2
         , specialize_type/1
+        , is_account/1
+        , account_pubkey/1
+        , to_map/1
         , is_id/1
         ]).
 
@@ -29,12 +32,17 @@
             , val
             }).
 
--type tag() :: 'account'
+-type subtype() :: 0..6.
+-type id_map() :: #{ type := simple_tag()
+                   , subtype => subtype()
+                   , value := binary() }.
+
+-type tag() :: {'account', subtype()} | simple_tag().
+-type simple_tag() :: 'account'
                     | 'associate_chain'
                     | 'channel'
                     | 'commitment'
                     | 'contract'
-             | 'contract_source'
                     | 'name'
                     | 'native_token'
                     | 'entry'.
@@ -57,7 +65,8 @@
                            ___TAG___ =:= contract;
                            ___TAG___ =:= channel;
                            ___TAG___ =:= associate_chain;
-                           ___TAG___ =:= entry 
+                           ___TAG___ =:= entry;
+                           ___TAG___ =:= native_token
        ).
 -define(IS_VAL(___VAL___), byte_size(___VAL___) =:= 32).
 
@@ -69,6 +78,8 @@
 create(Tag, Val) when ?IS_TAG(Tag), ?IS_VAL(Val) ->
     #id{ tag = Tag
        , val = Val};
+create({account,I}, Val) when is_binary(Val), I >= 0, I =< 6 ->
+    #id{ tag = {account, I}, val = Val};
 create(Tag, Val) when ?IS_VAL(Val) ->
     error({illegal_tag, Tag});
 create(Tag, Val) when ?IS_TAG(Tag)->
@@ -78,28 +89,66 @@ create(Tag, Val) ->
 
 
 -spec specialize(id()) -> {tag(), val()}.
+specialize(#id{tag = {Tag,_}, val = Val}) ->
+    {Tag, Val};
 specialize(#id{tag = Tag, val = Val}) ->
     {Tag, Val}.
 
 -spec specialize(id(), tag()) -> val().
+specialize(#id{tag = {Tag, _}, val = Val}, Tag) when is_binary(Val) ->
+    Val;
 specialize(#id{tag = Tag, val = Val}, Tag) when ?IS_TAG(Tag), ?IS_VAL(Val) ->
     Val.
 
 -spec specialize_type(id()) -> tag().
+specialize_type(#id{tag = {Tag, _}}) when ?IS_TAG(Tag) ->
+    Tag;
 specialize_type(#id{tag = Tag}) when ?IS_TAG(Tag) ->
     Tag.
 
+-spec is_account(id() | term()) -> boolean().
+is_account(#id{tag = account}) ->
+    true;
+is_account(#id{tag = {account, _}}) ->
+    true;
+is_account(_) ->
+    false.
+
+-spec account_pubkey(id()) -> val().
+account_pubkey(#id{tag = account, val = Val}) when ?IS_VAL(Val) ->
+    Val;
+account_pubkey(#id{tag = {account, _}, val = Val}) when ?IS_VAL(Val) ->
+    Val.
+
+-spec to_map(id()) -> id_map().
+to_map(#id{tag = {Tag, SubType}, val = Val}) when ?IS_TAG(Tag) ->
+    #{ type => Tag
+     , subtype => SubType
+     , value => Val };
+to_map(#id{tag = Tag, val = Val}) when ?IS_TAG(Tag) ->
+    #{ type => Tag
+     , value => Val }.
+
+
 -spec is_id(term()) -> boolean().
 is_id(#id{}) -> true;
 is_id(_) -> false.
 
 -spec encode(id()) -> binary().
+encode(#id{tag = {account, N}, val = Val}) when N =< 2#111_1111 ->
+    Ext = 2#1000_0000 bor N,
+    <<Ext:8, Val/binary>>;
 encode(#id{tag = Tag, val = Val}) ->
     Res = <<(encode_tag(Tag)):?TAG_SIZE/unit:8, Val/binary>>,
     true = ?SERIALIZED_SIZE =:= byte_size(Res),
     Res.
 
 -spec decode(binary()) -> id().
+decode(<<Ext:8, Rest/binary>>) when Ext >= 2#1000_0000 ->
+    %% Extended account id type
+    Type = Ext band 2#0111_1111,
+    #id{ tag = {account, Type}
+       , val = Rest };
 decode(<<Tag:?TAG_SIZE/unit:8, Val:?PUB_SIZE/binary>>) ->
     #id{ tag = decode_tag(Tag)
        , val = Val}.

test/gmser_api_encoder_tests.erl

@@ -194,7 +194,16 @@ known_types() ->
     Forms = get_forms(),
     [{type, _, union, Types}] =
         [Def || {attribute, _, type, {known_type, Def, []}} <- Forms],
-    [Name || {atom,_, Name} <- Types].
+    lists:flatmap(fun known_type_entry/1, Types).
+
+known_type_entry({atom, _, Name}) ->
+    [Name];
+known_type_entry({type, _, tuple,
+                  [{atom, _, account_pubkey},
+                   {type, _, range, [{integer, _, Lo}, {integer, _, Hi}]}]}) ->
+    [{account_pubkey, N} || N <- lists:seq(Lo, Hi)];
+known_type_entry(Other) ->
+    error({unsupported_known_type, Other}).
 
 mapped_prefixes() ->
     Forms = get_forms(),

test/gmser_id_tests.erl

@@ -0,0 +1,44 @@
+-module(gmser_id_tests).
+
+-include_lib("eunit/include/eunit.hrl").
+
+-define(PUBKEY, <<12345:32/unit:8>>).
+
+is_account_test() ->
+    {"is_account recognizes standard and extended account ids",
+     fun() ->
+             ?assert(gmser_id:is_account(gmser_id:create(account, ?PUBKEY))),
+             ?assert(gmser_id:is_account(gmser_id:create({account, 0}, ?PUBKEY))),
+             ?assert(gmser_id:is_account(gmser_id:create({account, 5}, ?PUBKEY))),
+             ?assertNot(gmser_id:is_account(gmser_id:create(contract, ?PUBKEY))),
+             ?assertNot(gmser_id:is_account(not_an_id))
+     end}.
+
+account_pubkey_test() ->
+    {"account_pubkey returns the 32-byte account hash",
+     fun() ->
+             ?assertEqual(?PUBKEY,
+                          gmser_id:account_pubkey(gmser_id:create(account, ?PUBKEY))),
+             ?assertEqual(?PUBKEY,
+                          gmser_id:account_pubkey(gmser_id:create({account, 3}, ?PUBKEY))),
+             ?assertEqual(?PUBKEY,
+                          gmser_id:account_pubkey(gmser_id:create({account, 6}, ?PUBKEY)))
+     end}.
+
+account_pubkey_matches_specialize_test() ->
+    {"account_pubkey agrees with specialize/2 for account ids",
+     fun() ->
+             Id = gmser_id:create({account, 2}, ?PUBKEY),
+             ?assertEqual(gmser_id:specialize(Id, account),
+                          gmser_id:account_pubkey(Id))
+     end}.
+
+extended_account_roundtrip_test() ->
+    {"extended account ids round-trip through encode/decode",
+     fun() ->
+             Id = gmser_id:create({account, 4}, ?PUBKEY),
+             ?assert(gmser_id:is_account(Id)),
+             Id1 = gmser_id:decode(gmser_id:encode(Id)),
+             ?assertEqual(?PUBKEY, gmser_id:account_pubkey(Id1)),
+             ?assertEqual(account, gmser_id:specialize_type(Id1))
+     end}.