Merge pull request 'Fix hz_grids:req/2,3 and add req/4' (#18) from grids-fix into master

Reviewed-on: #18

.gitignore

@@ -8,9 +8,7 @@ cancer
 erl_crash.dump
 ebin/*.beam
 doc/*.html
-doc/*.css
 doc/edoc-info
-doc/erlang.png
 rel/example_project
 .concrete/DEV_MODE
 .rebar

doc/overview.edoc

@@ -1,5 +1,5 @@
 @author Craig Everett <craigeverett@qpq.swiss> [https://git.qpq.swiss/QPQ-AG/hakuzaru]
-@version 0.8.2
+@version 0.8.0
 @title Hakuzaru: Gajumaru blockchain bindings for Erlang
 
 @doc
@@ -35,7 +35,7 @@ ceverett@steak:~$ zxh run hakuzaru
 Erlang/OTP 27 [erts-15.2] [source] [64-bit] [smp:16:16] [ds:16:16:10] [async-threads:1] [jit:ns]
 
 Eshell V15.2 (press Ctrl+G to abort, type help(). for help)
-Fetching otpr-hakuzaru-0.8.2
+Fetching otpr-hakuzaru-0.8.0
 [100.00%]
 Recompile: src/hz_sup
 Recompile: src/hz_man
@@ -45,7 +45,7 @@ Recompile: src/hz_format
 Recompile: src/hz_fetcher
 Recompile: src/hz
 Recompile: src/hakuzaru
-Starting otpr-hakuzaru-0.8.2.
+Starting otpr-hakuzaru-0.8.0.
 hz_man starting.
 Started [hakuzaru]
 1> hz:chain_nodes([{"groot.testnet.gajumaru.io", 3013}]).

doc/stylesheet.css

@@ -0,0 +1,75 @@
+/* standard EDoc style sheet */
+body {
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    margin-left: .25in;
+    margin-right: .2in;
+    margin-top: 0.2in;
+    margin-bottom: 0.2in;
+    color: #696969;
+    background-color: #ffffff;
+}
+a:link{
+    color: #000000;
+}
+a:visited{
+    color: #000000;
+}
+a:hover{
+    color: #d8613c;
+}
+h1,h2 {
+ 	margin-left: -0.2in;
+}
+div.navbar {
+	background-color: #000000;
+	padding: 0.2em;
+}
+h2.indextitle {
+	padding: 0.4em;
+    color: #dfdfdf;
+	background-color: #000000;
+}
+div.navbar a:link {
+    color: #dfdfdf;
+}
+div.navbar a:visited {
+    color: #dfdfdf;
+}
+div.navbar a:hover {
+    color: #d8613c;
+}
+h3.function,h3.typedecl {
+	background-color: #000000;
+    color: #dfdfdf;
+ 	padding-left: 1em;
+}
+div.spec {
+ 	margin-left: 2em;
+	background-color: #eeeeee;
+}
+a.module {
+	text-decoration:none
+}
+a.module:hover {
+	background-color: #eeeeee;
+}
+ul.definitions {
+	list-style-type: none;
+}
+ul.index {
+	list-style-type: none;
+	background-color: #eeeeee;
+}
+
+/*
+ * Minor style tweaks
+ */
+ul {
+	list-style-type: square;
+}
+table {
+	border-collapse: collapse;
+}
+td {
+	padding: 3
+}

ebin/hakuzaru.app

@@ -3,7 +3,7 @@
               {included_applications,[]},
               {applications,[stdlib,kernel]},
               {description,"Gajumaru interoperation library"},
-              {vsn,"0.8.2"},
+              {vsn,"0.8.3"},
               {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.2").
+-vsn("0.8.3").
 -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.2").
+-vsn("0.8.3").
 -author("Craig Everett <ceverett@tsuriai.jp>").
 -copyright("Craig Everett <ceverett@tsuriai.jp>").
 -license("GPL-3.0-or-later").
@@ -2461,19 +2461,6 @@ 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.2").
+-vsn("0.8.3").
 -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.2").
+-vsn("0.8.3").
 -author("Craig Everett <ceverett@tsuriai.jp>").
 -copyright("Craig Everett <ceverett@tsuriai.jp>").
 -license("GPL-3.0-or-later").

src/hz_grids.erl

@@ -37,8 +37,8 @@
 %%% @end
 
 -module(hz_grids).
--vsn("0.8.2").
+-vsn("0.8.3").
--export([url/2, url/3, url/4, parse/1, req/2, req/3]).
+-export([url/2, url/3, url/4, parse/1, req/2, req/3, req/4]).
 
 
 -spec url(Instruction, HTTP) -> Result
@@ -190,61 +190,31 @@ 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}, Message, ID) ->
+req(Type, Message, ID) ->
+    {ok, NetworkID} = hz:network_id(),
+    req(Type, Message, ID, NetworkID).
+
+req(sign, Message, ID, NetworkID) ->
     #{"grids"      => 1,
       "chain"      => "gajumaru",
-      "network_id" => hz:network_id(),
+      "network_id" => NetworkID,
       "type"       => "message",
       "public_id"  => ID,
       "payload"    => Message};
-req({sign, binary}, Binary, ID) ->
+req(tx, Data, ID, NetworkID) ->
     #{"grids"      => 1,
       "chain"      => "gajumaru",
-      "network_id" => hz:network_id(),
+      "network_id" => NetworkID,
-      "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",
-      "network_id" => hz:network_id(),
       "type"       => "tx",
       "public_id"  => ID,
       "payload"    => Data};
-req(ack, Message, ID) ->
+req(ack, Message, ID, NetworkID) ->
     #{"grids"      => 1,
       "chain"      => "gajumaru",
-      "network_id" => hz:network_id(),
+      "network_id" => NetworkID,
       "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.2").
+-vsn("0.8.3").
 
 
 -export([make_key/1, encode/1, decode/1]).

src/hz_man.erl

@@ -9,7 +9,7 @@
 %%% @end
 
 -module(hz_man).
--vsn("0.8.2").
+-vsn("0.8.3").
 -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.2").
+-vsn("0.8.3").
 -behaviour(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp.meta

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