WIP

Reviewed-on: #16

ebin/hakuzaru.app

@@ -3,7 +3,7 @@
               {included_applications,[]},
               {applications,[stdlib,kernel]},
               {description,"Gajumaru interoperation library"},
-              {vsn,"0.8.0"},
+              {vsn,"0.8.2"},
               {modules,[hakuzaru,hz,hz_fetcher,hz_format,hz_grids,
                         hz_key_master,hz_man,hz_sup]},
               {mod,{hakuzaru,[]}}]}.

src/hakuzaru.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(hakuzaru).
--vsn("0.8.0").
+-vsn("0.8.2").
 -author("Craig Everett <ceverett@tsuriai.jp>").
 -copyright("Craig Everett <ceverett@tsuriai.jp>").
 -license("GPL-3.0-or-later").

src/hz.erl

@@ -23,7 +23,7 @@
 %%% @end
 
 -module(hz).
--vsn("0.8.0").
+-vsn("0.8.2").
 -author("Craig Everett <ceverett@tsuriai.jp>").
 -copyright("Craig Everett <ceverett@tsuriai.jp>").
 -license("GPL-3.0-or-later").
@@ -2461,6 +2461,19 @@ spend3(DSenderID,
     hz:post_tx(Encoded).
 
 
+-spec sign(Scheme, Target, SecKey) -> Sig
+    when Scheme :: message | binary | bitcoin,
+         Target :: binary(),
+         SecKey :: binary(),
+         Sig    :: binary().
+
+sign(message, Target, SecKey) -> sign_message(Message, SecKey);
+sign(binary,  Target, SecKey) -> sign_binary(Target, SecKey);
+sign(bitcoin, Target, SecKey) -> sign_bitcoin(Target, SecKey).
+
+sign(bitcoin, Target, SecKey) -> sign_message(Target, SecKey).
+
+
 -spec sign_message(Message, SecKey) -> Sig
     when Message :: binary(),
          SecKey  :: binary(),

src/hz_fetcher.erl

@@ -1,5 +1,5 @@
 -module(hz_fetcher).
--vsn("0.8.0").
+-vsn("0.8.2").
 -author("Craig Everett <ceverett@tsuriai.jp>").
 -copyright("Craig Everett <ceverett@tsuriai.jp>").
 -license("MIT").

src/hz_format.erl

@@ -21,7 +21,7 @@
 %%% @end
 
 -module(hz_format).
--vsn("0.8.0").
+-vsn("0.8.2").
 -author("Craig Everett <ceverett@tsuriai.jp>").
 -copyright("Craig Everett <ceverett@tsuriai.jp>").
 -license("GPL-3.0-or-later").
@@ -552,8 +552,7 @@ read_w_gajus([32, $G], A) ->
     calc([{$G, A}], []);
 read_w_gajus([32, $P], A) ->
     calc([], [{$P, A}]);
-read_w_gajus(A, B) ->
-    io:format("A: ~ts, B: ~p~n", [A, B]),
+read_w_gajus(_, _) ->
     error.
 
 read_w_pucks([C | Rest], A) when $0 =< C andalso C =< $9 ->
@@ -599,10 +598,23 @@ read([32, $P], A, P) ->
     calc([], [{$P, A} | P]);
 read([C, 32 | Rest], A, G) ->
     read(Rest, [], [{C, A} | G]);
+read([$, | Rest], A, []) ->
+    read_w_gajus(Rest, A);
+read([$_ | Rest], A, []) ->
+    read_w_gajus(Rest, A);
+read([$. | Rest], A, []) ->
+    case read_w_pucks(Rest, []) of
+        {ok, P} ->
+            G = list_to_integer(lists:reverse(A)) * one(gaju),
+            {ok, G + P};
+        Error ->
+            Error
+    end;
 read([C | Rest], A, G) ->
     read(Rest, [], [{C, A} | G]);
-read(Rest, A, G) ->
-    io:format("read(\"~ts\", ~tp, ~tp) -> died!~n", [Rest, A, G]),
+read([], A, []) ->
+    read_w_gajus([], A);
+read(_, _, _) ->
     error.
 
 
@@ -622,7 +634,6 @@ read([C, 32 | Rest], A, G, P) ->
 read([C | Rest], A, G, P) ->
     read(Rest, [], G, [{C, A} | P]);
 read(_, _, _, _) ->
-    io:format("read/4 died!~n"),
     error.
 
 calc(G, P) ->

src/hz_grids.erl

@@ -37,7 +37,7 @@
 %%% @end
 
 -module(hz_grids).
--vsn("0.8.0").
+-vsn("0.8.2").
 -export([url/2, url/3, url/4, parse/1, req/2, req/3]).
 
 
@@ -190,16 +190,48 @@ l_to_i(S) ->
     end.
 
 
+-spec req(Type, Message) -> RequestMap
+    when Type       :: {sign, message | binary | bitcoin}
+                     | tx
+                     | ack
+                     | sign,
+         Message    :: binary(),
+         RequestMap :: map().
+%% @doc
+%% GRIDS maps always contain the following keys:
+%% ```
+%%  #{"grids"      => 1,
+%%    "chain"      => "gajumaru",
+%%    "network_id" => "groot.mainnet.gajumaru.io",
+%%    "type"       => "message" | "binary" | "binary" | "tx" | "ack"
+%%    "public_id"  => term(),
+%%    "payload"    => string()};
+%% '''
+
 req(Type, Message) ->
     req(Type, Message, false).
 
-req(sign, Message, ID) ->
+req({sign, message}, Message, ID) ->
     #{"grids"      => 1,
       "chain"      => "gajumaru",
       "network_id" => hz:network_id(),
       "type"       => "message",
       "public_id"  => ID,
       "payload"    => Message};
+req({sign, binary}, Binary, ID) ->
+    #{"grids"      => 1,
+      "chain"      => "gajumaru",
+      "network_id" => hz:network_id(),
+      "type"       => "binary",
+      "public_id"  => ID,
+      "payload"    => base64:encode(Binary)};
+req({sign, bitcoin}, Binary, ID) ->
+    #{"grids"      => 1,
+      "chain"      => "gajumaru",
+      "network_id" => hz:network_id(),
+      "type"       => "bitcoin",
+      "public_id"  => ID,
+      "payload"    => base64:encode(Binary)};
 req(tx, Data, ID) ->
     #{"grids"      => 1,
       "chain"      => "gajumaru",
@@ -213,4 +245,6 @@ req(ack, Message, ID) ->
       "network_id" => hz:network_id(),
       "type"       => "ack",
       "public_id"  => ID,
-      "payload"    => Message}.
+      "payload"    => Message};
+req(sign, Message, ID) ->
+    req({sign, message}, Message, ID).

src/hz_key_master.erl

@@ -8,7 +8,7 @@
 %%% @end
 
 -module(hz_key_master).
--vsn("0.8.0").
+-vsn("0.8.2").
 
 
 -export([make_key/1, encode/1, decode/1]).

src/hz_man.erl

@@ -9,7 +9,7 @@
 %%% @end
 
 -module(hz_man).
--vsn("0.8.0").
+-vsn("0.8.2").
 -behavior(gen_server).
 -author("Craig Everett <ceverett@tsuriai.jp>").
 -copyright("Craig Everett <ceverett@tsuriai.jp>").

src/hz_sup.erl

@@ -9,7 +9,7 @@
 %%% @end
 
 -module(hz_sup).
--vsn("0.8.0").
+-vsn("0.8.2").
 -behaviour(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp.meta

@@ -2,9 +2,9 @@
 {type,app}.
 {modules,[]}.
 {prefix,"hz"}.
-{author,"Craig Everett"}.
 {desc,"Gajumaru interoperation library"}.
-{package_id,{"otpr","hakuzaru",{0,8,0}}}.
+{author,"Craig Everett"}.
+{package_id,{"otpr","hakuzaru",{0,8,2}}}.
 {deps,[{"otpr","sophia",{9,0,0}},
        {"otpr","gmserialization",{0,1,3}},
        {"otpr","gmbytecode",{3,4,1}},