Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 46345da283 | |||
| bc870e5f2d | |||
| 4ee1825b43 | |||
| be6aceb41a | |||
| 8a9f060b2d | |||
| 9adbf67ebd |
@@ -1,3 +1,9 @@
|
|||||||
|
2026-02-25(PRH):
|
||||||
|
grids: instead of spying the chain for a tx, let's use dead drop
|
||||||
|
|
||||||
|
- so for "generate", need to form tx for the user to sign
|
||||||
|
- make dead drop -> have process that knows each tx and the dead drop location
|
||||||
|
|
||||||
OPEN LOOPS - 2025-11-12
|
OPEN LOOPS - 2025-11-12
|
||||||
- websockets
|
- websockets
|
||||||
- separate websocket handling from websocket parsing/sending
|
- separate websocket handling from websocket parsing/sending
|
||||||
|
|||||||
@@ -35,13 +35,14 @@
|
|||||||
<label for="grids-a">Amount (P):</label>
|
<label for="grids-a">Amount (P):</label>
|
||||||
<input type = "number"
|
<input type = "number"
|
||||||
id = "grids-a"
|
id = "grids-a"
|
||||||
value = "6000000">
|
value = "69"
|
||||||
|
disabled>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
<label for="grids-p">Payload:</label>
|
<label for="grids-p">Payload:</label>
|
||||||
<input type = "text"
|
<input type = "text"
|
||||||
id = "grids-p"
|
id = "grids-p"
|
||||||
value = "test payload">
|
disabled>
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
<input type = "button"
|
<input type = "button"
|
||||||
|
|||||||
Vendored
+5
-1
@@ -20,6 +20,10 @@ async function main() {
|
|||||||
let submit_btn = document.getElementById('grids-submit');
|
let submit_btn = document.getElementById('grids-submit');
|
||||||
let grids_url_elt = document.getElementById('grids-url');
|
let grids_url_elt = document.getElementById('grids-url');
|
||||||
let grids_png_elt = document.getElementById('grids-png');
|
let grids_png_elt = document.getElementById('grids-png');
|
||||||
|
let rand_data = new Uint8Array(32);
|
||||||
|
window.crypto.getRandomValues(rand_data);
|
||||||
|
let hex = rand_data.toHex().toUpperCase();
|
||||||
|
p_input.value = 'text payload ' + hex;
|
||||||
// Page initialization
|
// Page initialization
|
||||||
submit_btn.addEventListener('click', async function (e) {
|
submit_btn.addEventListener('click', async function (e) {
|
||||||
await on_submit(n_input, r_input, a_input, p_input, grids_url_elt, grids_png_elt);
|
await on_submit(n_input, r_input, a_input, p_input, grids_url_elt, grids_png_elt);
|
||||||
@@ -59,7 +63,7 @@ async function grids_request(net_id, recipient, amount, payload) {
|
|||||||
'amount': amount,
|
'amount': amount,
|
||||||
'payload': payload };
|
'payload': payload };
|
||||||
let obj_text = JSON.stringify(obj, undefined, 4);
|
let obj_text = JSON.stringify(obj, undefined, 4);
|
||||||
let url = '/grids-spend';
|
let url = '/grids-mkdd';
|
||||||
let req_options = { method: 'POST',
|
let req_options = { method: 'POST',
|
||||||
headers: { 'content-type': 'application/json' },
|
headers: { 'content-type': 'application/json' },
|
||||||
body: obj_text };
|
body: obj_text };
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"grids-basic.js","sourceRoot":"","sources":["../ts/grids-basic.ts"],"names":[],"mappings":"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"}
|
{"version":3,"file":"grids-basic.js","sourceRoot":"","sources":["../ts/grids-basic.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;AAEH,IAAI,EAAE,CAAC;AAGP;;GAEG;AACH,KAAK,UACL,IAAI;IAGA,IAAI,OAAO,GAAM,QAAQ,CAAC,cAAc,CAAC,SAAS,CAA0B,CAAC;IAC7E,IAAI,OAAO,GAAM,QAAQ,CAAC,cAAc,CAAC,SAAS,CAA0B,CAAC;IAC7E,IAAI,OAAO,GAAM,QAAQ,CAAC,cAAc,CAAC,SAAS,CAA0B,CAAC;IAC7E,IAAI,OAAO,GAAM,QAAQ,CAAC,cAAc,CAAC,SAAS,CAA0B,CAAC;IAC7E,IAAI,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAqB,CAAC;IAE7E,IAAI,aAAa,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAwB,CAAC;IAChF,IAAI,aAAa,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAqB,CAAC;IAE7E,IAAI,SAAS,GAAgB,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IAChD,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACzC,IAAI,GAAG,GAAY,SAAS,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,CAAC;IACnD,OAAO,CAAC,KAAK,GAAG,eAAe,GAAG,GAAG,CAAC;IAEtC,sBAAsB;IACtB,UAAU,CAAC,gBAAgB,CACvB,OAAO,EACP,KAAK,WAAU,CAAC;QACZ,MAAM,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC,CAAA;IACrF,CAAC,CACJ,CAAC;IAEF,iBAAiB;IACjB,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC;AAChC,CAAC;AAED,KAAK,UACL,SAAS,CACJ,OAAgC,EAChC,OAAgC,EAChC,OAAgC,EAChC,OAAgC,EAChC,aAAmC,EACnC,aAAgC;IAGjC,kBAAkB;IAClB,IAAI,UAAU,GAAY,OAAO,CAAC,KAAK,CAAC;IACxC,IAAI,SAAS,GAAa,OAAO,CAAC,KAAK,CAAC;IACxC,IAAI,MAAM,GAAgB,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAClD,IAAI,OAAO,GAAe,OAAO,CAAC,KAAK,CAAC;IAExC,IAAI,MAAM,GAAsB,MAAM,aAAa,CAAC,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAE5F,yBAAyB;IACzB,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;QACZ,IAAI,GAAG,GAAmB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;QAC5C,IAAI,UAAU,GAAY,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;QAEnD,IAAI,UAAU,GAAY,wBAAwB,CAAA;QAElD,IAAI,GAAG,GAAG,UAAU,GAAG,UAAU,CAAC;QAElC,aAAa,CAAC,SAAS,GAAG,GAAG,CAAC;QAC9B,aAAa,CAAC,GAAG,GAAS,GAAG,CAAC;QAE9B,aAAa,CAAC,MAAM,GAAG,KAAK,CAAC;QAC7B,aAAa,CAAC,MAAM,GAAG,KAAK,CAAC;IACjC,CAAC;SACI,CAAC;QACF,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;AACL,CAAC;AASD;;GAEG;AACH,KAAK,UACL,aAAa,CACR,MAAkB,EAClB,SAAkB,EAClB,MAAkB,EAClB,OAAkB;IAGnB,kCAAkC;IAClC,IAAI,GAAG,GAAiB,EAAC,YAAY,EAAG,MAAM;QACrB,WAAW,EAAI,SAAS;QACxB,QAAQ,EAAO,MAAM;QACrB,SAAS,EAAM,OAAO,EAAC,CAAC;IACjD,IAAI,QAAQ,GAAY,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAG1D,IAAI,GAAG,GAAG,aAAa,CAAC;IACxB,IAAI,WAAW,GAAI,EAAC,MAAM,EAAG,MAAM;QACf,OAAO,EAAE,EAAC,cAAc,EAAE,kBAAkB,EAAC;QAC7C,IAAI,EAAK,QAAQ,EAAC,CAAC;IAGvC,IAAI,MAAM,GACF,EAAC,EAAE,EAAM,KAAK;QACb,KAAK,EAAG,kCAAkC,EAAC,CAAC;IAErD,IAAI,CAAC;QACD,IAAI,QAAQ,GAAc,MAAM,KAAK,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QACxD,IAAI,QAAQ,CAAC,EAAE;YACX,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAuB,CAAC;aACnD,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;YAC5C,MAAM,GAAG,EAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,mBAAmB,EAAC,CAAC;QACrD,CAAC;IACL,CAAC;IACD,OAAO,CAAM,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QACjC,MAAM,GAAG,EAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAC,CAAC;IACjD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"libfewd.js","sourceRoot":"","sources":["../ts/libfewd.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,WAAW,EACX,qBAAqB,EACxB,CAAC;AAGF,SACA,WAAW,CACN,gBAAmC,EACnC,cAAsC,EACtC,UAAyB;IAG1B,+DAA+D;IAC/D,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC1B,IAAI,aAAa,GAAW,cAAc,CAAC,YAAY,CAAC;QACxD,sCAAsC;QACtC,IAAI,aAAa,GAAG,UAAU;YAC1B,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;;YAE3D,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;KAC/D;AACL,CAAC;AAGD,SACA,qBAAqB,CAChB,gBAAmC,EACnC,cAAsC;IAGvC,IAAI,gBAAgB,CAAC,OAAO,EAAE;QAC1B,mBAAmB;QACnB,cAAc,CAAC,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC;KAC1D;AACL,CAAC"}
|
{"version":3,"file":"libfewd.js","sourceRoot":"","sources":["../ts/libfewd.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,WAAW,EACX,qBAAqB,EACxB,CAAC;AAGF,SACA,WAAW,CACN,gBAAmC,EACnC,cAAsC,EACtC,UAAyB;IAG1B,+DAA+D;IAC/D,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC3B,IAAI,aAAa,GAAW,cAAc,CAAC,YAAY,CAAC;QACxD,sCAAsC;QACtC,IAAI,aAAa,GAAG,UAAU;YAC1B,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;;YAE3D,cAAc,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;IAChE,CAAC;AACL,CAAC;AAGD,SACA,qBAAqB,CAChB,gBAAmC,EACnC,cAAsC;IAGvC,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC3B,mBAAmB;QACnB,cAAc,CAAC,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC;IAC3D,CAAC;AACL,CAAC"}
|
||||||
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"wfc.js","sourceRoot":"","sources":["../ts/wfc.ts"],"names":[],"mappings":"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"}
|
{"version":3,"file":"wfc.js","sourceRoot":"","sources":["../ts/wfc.ts"],"names":[],"mappings":"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"}
|
||||||
@@ -27,6 +27,11 @@ main
|
|||||||
let grids_url_elt = document.getElementById('grids-url') as HTMLTextAreaElement;
|
let grids_url_elt = document.getElementById('grids-url') as HTMLTextAreaElement;
|
||||||
let grids_png_elt = document.getElementById('grids-png') as HTMLImageElement;
|
let grids_png_elt = document.getElementById('grids-png') as HTMLImageElement;
|
||||||
|
|
||||||
|
let rand_data : Uint8Array = new Uint8Array(32);
|
||||||
|
window.crypto.getRandomValues(rand_data);
|
||||||
|
let hex : string = rand_data.toHex().toUpperCase();
|
||||||
|
p_input.value = 'text payload ' + hex;
|
||||||
|
|
||||||
// Page initialization
|
// Page initialization
|
||||||
submit_btn.addEventListener(
|
submit_btn.addEventListener(
|
||||||
'click',
|
'click',
|
||||||
@@ -103,7 +108,7 @@ grids_request
|
|||||||
let obj_text : string = JSON.stringify(obj, undefined, 4);
|
let obj_text : string = JSON.stringify(obj, undefined, 4);
|
||||||
|
|
||||||
|
|
||||||
let url = '/grids-spend';
|
let url = '/grids-mkdd';
|
||||||
let req_options = {method: 'POST',
|
let req_options = {method: 'POST',
|
||||||
headers: {'content-type': 'application/json'},
|
headers: {'content-type': 'application/json'},
|
||||||
body: obj_text};
|
body: obj_text};
|
||||||
|
|||||||
+48
-70
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
-export([
|
-export([
|
||||||
%% caller context
|
%% caller context
|
||||||
mk_spend/4,
|
mkdd/4,
|
||||||
|
|
||||||
%% api
|
%% api
|
||||||
start_link/0,
|
start_link/0,
|
||||||
@@ -21,17 +21,18 @@
|
|||||||
|
|
||||||
-include("$zx_include/zx_logger.hrl").
|
-include("$zx_include/zx_logger.hrl").
|
||||||
|
|
||||||
%% for craig's autism
|
-type hex() :: binary().
|
||||||
-record(sp,
|
-define(SEC, 1).
|
||||||
{recipient :: string(),
|
-define(MIN, 60*SEC).
|
||||||
amount :: non_neg_integer(),
|
-define(DEAD_DROP_TTL, 30*MIN).
|
||||||
payload :: binary()}).
|
|
||||||
|
|
||||||
-type search_pattern() :: #sp{}.
|
-record(dd,
|
||||||
-type sp() :: search_pattern().
|
{created_at :: integer(),
|
||||||
|
payload :: string()}).
|
||||||
|
-type dd() :: #dd{}.
|
||||||
|
|
||||||
-record(s,
|
-record(s,
|
||||||
{looking_for = [] :: [{sp(), NotifyWhenSeen :: pid()}]}).
|
{drops = #{} :: #{hex() := dd()}}).
|
||||||
|
|
||||||
-type state() :: #s{}.
|
-type state() :: #s{}.
|
||||||
|
|
||||||
@@ -40,7 +41,7 @@
|
|||||||
%% caller context
|
%% caller context
|
||||||
%%-----------------------------------------------------------------------------
|
%%-----------------------------------------------------------------------------
|
||||||
|
|
||||||
-spec mk_spend(NetworkId, Recipient, Amount, Payload) -> Result
|
-spec mkdd(NetworkId, Recipient, Amount, Payload) -> Result
|
||||||
when NetworkId :: string(),
|
when NetworkId :: string(),
|
||||||
Recipient :: string(),
|
Recipient :: string(),
|
||||||
Amount :: non_neg_integer(),
|
Amount :: non_neg_integer(),
|
||||||
@@ -50,10 +51,10 @@
|
|||||||
URL :: string(),
|
URL :: string(),
|
||||||
QR_PNG :: binary().
|
QR_PNG :: binary().
|
||||||
% @doc
|
% @doc
|
||||||
% Very important: amount MUST be an integer >= 0
|
% make a dead drop
|
||||||
|
|
||||||
mk_spend(NetworkId, Recipient, Amount, Payload) ->
|
mkdd(NetworkId, Recipient, Amount, Payload) ->
|
||||||
gen_server:call(?MODULE, {mk_spend, NetworkId, Recipient, Amount, Payload}).
|
gen_server:call(?MODULE, {mkdd, NetworkId, Recipient, Amount, Payload}).
|
||||||
|
|
||||||
|
|
||||||
%% gen_server callbacks
|
%% gen_server callbacks
|
||||||
@@ -73,12 +74,10 @@ init(none) ->
|
|||||||
{ok, InitState}.
|
{ok, InitState}.
|
||||||
|
|
||||||
|
|
||||||
handle_call({mk_spend, NetworkId, Recipient, Amount, Payload}, From, State) ->
|
handle_call({mkdd, NetworkId, Recipient, Amount, Payload}, From, State) ->
|
||||||
case i_mk_spend(NetworkId, Recipient, Amount, Payload, From, State) of
|
case do_mkdd(NetworkId, Recipient, Amount, Payload, State) of
|
||||||
{ok, URL, PNG, NewState} ->
|
{ok, URL, PNG, NewState} -> {reply, {ok, URL, PNG}, NewState};
|
||||||
{reply, {ok, URL, PNG}, NewState};
|
Error -> {reply, Error, State}
|
||||||
Error ->
|
|
||||||
{reply, Error, State}
|
|
||||||
end;
|
end;
|
||||||
handle_call(Unexpected, From, State) ->
|
handle_call(Unexpected, From, State) ->
|
||||||
tell("~tp: unexpected call from ~tp: ~tp", [?MODULE, Unexpected, From]),
|
tell("~tp: unexpected call from ~tp: ~tp", [?MODULE, Unexpected, From]),
|
||||||
@@ -106,67 +105,46 @@ terminate(_, _) ->
|
|||||||
%% internals
|
%% internals
|
||||||
%%-----------------------------------------------------------------------------
|
%%-----------------------------------------------------------------------------
|
||||||
|
|
||||||
-spec i_mk_spend(NetworkId, Recipient, Amount, Payload, From, State) -> Result
|
-spec do_mkdd(NetworkId, Recipient, Amount, Payload, State) -> Result
|
||||||
when NetworkId :: string(),
|
when NetworkId :: string(),
|
||||||
Recipient :: string(),
|
Recipient :: string(),
|
||||||
Amount :: non_neg_integer(),
|
Amount :: pos_integer(),
|
||||||
Payload :: binary(),
|
Payload :: binary(),
|
||||||
From :: {pid(), reference()},
|
|
||||||
State :: state(),
|
State :: state(),
|
||||||
Result :: {ok, URL, QR_PNG, NewState}
|
Result :: {ok, URL, QR_PNG, NewState}
|
||||||
| {error, string()},
|
| {error, Reason},
|
||||||
URL :: string(),
|
URL :: string(),
|
||||||
QR_PNG :: binary(),
|
QR_PNG :: binary(),
|
||||||
NewState :: state().
|
NewState :: state(),
|
||||||
|
Reason :: any().
|
||||||
|
|
||||||
i_mk_spend(NetworkId, Recipient, Amount, Payload, {FromPID, _}, State)
|
do_mkdd(NetId, Recipient, Amount, Payload, State = #s{drops = Drops}) ->
|
||||||
when is_integer(Amount), Amount >= 0,
|
HexStr = rand_hex(),
|
||||||
is_binary(Payload) ->
|
CreatedAt = now_sec(),
|
||||||
URL = gmgrids:encode({spend, NetworkId, Recipient},
|
TxStr = form_txstr(NetId, Recipient, Amount, Payload),
|
||||||
[{amount, Amount},
|
DD = #dd{created_at = CreatedAt, payload = TxStr},
|
||||||
{payload, Payload}]),
|
URL = dd_url(HexStr),
|
||||||
URLBin = unicode:characters_to_binary(URL),
|
PNG = qr:encode_png(unicode:characters_to_binary(URL)),
|
||||||
PNG = qr:encode_png(URLBin),
|
NewDrops = maps:put(HexStr, DD, Drops),
|
||||||
case i_register(Recipient, Amount, Payload, FromPID, State) of
|
NewState = State#s{drops = NewDrops},
|
||||||
{ok, NewState} -> {ok, URL, PNG, NewState};
|
{ok, URL, PNG, NewState}.
|
||||||
Error -> Error
|
|
||||||
end;
|
now_sec() ->
|
||||||
i_mk_spend(_, _, Amount, _, _, _) when (not is_integer(Amount)) ->
|
calendar:datetime_to_gregorian_seconds(calendar:universal_time()).
|
||||||
{error, "non_integer_amount"};
|
|
||||||
i_mk_spend(_, _, Amount, _, _, _) when Amount < 0 ->
|
|
||||||
{error, "negative_amount"};
|
|
||||||
i_mk_spend(_, _, _, _, _, _) ->
|
|
||||||
{error, "bad_payload"}.
|
|
||||||
|
|
||||||
|
|
||||||
i_register(Recipient, Amount, Payload, FromPID, State = #s{looking_for = Patterns}) ->
|
-spec rand_hex() -> hex().
|
||||||
SP = i_sp(Recipient, Amount, Payload),
|
rand_hex() ->
|
||||||
case i_lookup(SP, State) of
|
unicode:characters_to_binary(hexify(rand:bytes(10))).
|
||||||
not_found ->
|
|
||||||
NewPattern = {SP, FromPID},
|
|
||||||
NewPatterns = [NewPattern | Patterns],
|
|
||||||
NewState = State#s{looking_for = NewPatterns},
|
|
||||||
{ok, NewState};
|
|
||||||
{found, _} ->
|
|
||||||
{error, already_registered}
|
|
||||||
end.
|
|
||||||
|
|
||||||
%% future proofing
|
hexify(<<B:8, Rest/binary>>) when B < 16#10 -> ["0", integer_to_list(B, 16), hexify(Rest)];
|
||||||
i_sp(Recipient, Amount, Payload) ->
|
hexify(<<B:8, Rest/binary>>) -> [integer_to_list(B, 16), hexify(Rest)];
|
||||||
{sp, Recipient, Amount, Payload}.
|
hexify(<<>>) -> [].
|
||||||
|
|
||||||
|
dd_url(HexStr) ->
|
||||||
|
unicode:characters_to_list(["grids://", fewd:host(), "/1/d/", HexStr]).
|
||||||
|
|
||||||
|
|
||||||
-spec i_lookup(SearchPattern, State) -> Result
|
% ref
|
||||||
when SearchPattern :: sp(),
|
form_txstr(_NetId, _Recipient, _Amount, _Payload) ->
|
||||||
State :: state(),
|
"foobar".
|
||||||
Result :: {found, NotifyPID :: pid()}
|
|
||||||
| not_found.
|
|
||||||
|
|
||||||
% @private look up search pattern and see if we're looking for it
|
|
||||||
|
|
||||||
i_lookup(SearchPattern, State) ->
|
|
||||||
#s{looking_for = Patterns} = State,
|
|
||||||
case lists:keyfind(SearchPattern, 1, Patterns) of
|
|
||||||
false -> not_found;
|
|
||||||
{_, Notify} -> {found, Notify}
|
|
||||||
end.
|
|
||||||
|
|||||||
@@ -238,7 +238,7 @@ route(Sock, get, Route, Request, Received) ->
|
|||||||
end;
|
end;
|
||||||
route(Sock, post, Route, Request, Received) ->
|
route(Sock, post, Route, Request, Received) ->
|
||||||
case Route of
|
case Route of
|
||||||
<<"/grids-spend">> -> grids_spend(Sock, Request) , Received;
|
<<"/grids-mkdd">> -> grids_mkdd(Sock, Request) , Received;
|
||||||
<<"/wfcin">> -> wfcin(Sock, Request) , Received;
|
<<"/wfcin">> -> wfcin(Sock, Request) , Received;
|
||||||
_ -> fd_httpd_utils:http_err(Sock, 404) , Received
|
_ -> fd_httpd_utils:http_err(Sock, 404) , Received
|
||||||
end;
|
end;
|
||||||
@@ -324,14 +324,14 @@ ws_echo_loop(Sock, Frames, Received) ->
|
|||||||
%% grids
|
%% grids
|
||||||
%% ------------------------------
|
%% ------------------------------
|
||||||
|
|
||||||
grids_spend(Sock, #request{enctype = json,
|
grids_mkdd(Sock, #request{enctype = json,
|
||||||
body = B = #{"network_id" := NetId,
|
body = B = #{"network_id" := NetId,
|
||||||
"recipient" := Recipient,
|
"recipient" := Recipient,
|
||||||
"amount" := Amount,
|
"amount" := Amount,
|
||||||
"payload" := Payload}}) ->
|
"payload" := Payload}}) ->
|
||||||
tell("grids_spend good request: ~tp", [B]),
|
tell("grids_mkdd good request: ~tp", [B]),
|
||||||
RespObj =
|
RespObj =
|
||||||
case fd_gridsd:mk_spend(NetId, Recipient, Amount, unicode:characters_to_binary(Payload)) of
|
case fd_gridsd:mkdd(NetId, Recipient, Amount, unicode:characters_to_binary(Payload)) of
|
||||||
{ok, URL, PNG} ->
|
{ok, URL, PNG} ->
|
||||||
#{"ok" => true,
|
#{"ok" => true,
|
||||||
"result" => #{"url" => URL,
|
"result" => #{"url" => URL,
|
||||||
@@ -345,8 +345,8 @@ grids_spend(Sock, #request{enctype = json,
|
|||||||
Response = #response{headers = [{"content-type", "application/json"}],
|
Response = #response{headers = [{"content-type", "application/json"}],
|
||||||
body = Body},
|
body = Body},
|
||||||
fd_httpd_utils:respond(Sock, Response);
|
fd_httpd_utils:respond(Sock, Response);
|
||||||
grids_spend(Sock, Request) ->
|
grids_mkdd(Sock, Request) ->
|
||||||
tell("grids_spend: bad request: ~tp", [Request]),
|
tell("grids_mkdd: bad request: ~tp", [Request]),
|
||||||
fd_httpd_utils:http_err(Sock, 400).
|
fd_httpd_utils:http_err(Sock, 400).
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,84 @@
|
|||||||
|
% @doc hz helper functions
|
||||||
|
-module(fd_hz).
|
||||||
|
|
||||||
|
-export_type([
|
||||||
|
]).
|
||||||
|
|
||||||
|
-export([
|
||||||
|
txs_current/0,
|
||||||
|
txs_since_height/1,
|
||||||
|
txs_minus/1,
|
||||||
|
txs_from_to/2,
|
||||||
|
current_height/0,
|
||||||
|
txs_of_height/1,
|
||||||
|
mhs_of_height/1,
|
||||||
|
txs_of_mh/1,
|
||||||
|
filter_spends/1,
|
||||||
|
filter_spend/1,
|
||||||
|
spend_info/1,
|
||||||
|
test/0
|
||||||
|
]).
|
||||||
|
|
||||||
|
|
||||||
|
-spec test() -> no_return().
|
||||||
|
|
||||||
|
test() ->
|
||||||
|
io:format("~tp~n", [hz:gen_current()]),
|
||||||
|
io:format("~tp~n", [hz:kb_current()]),
|
||||||
|
ok.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
txs_current() ->
|
||||||
|
H = current_height(),
|
||||||
|
txs_of_height(H).
|
||||||
|
|
||||||
|
|
||||||
|
txs_since_height(H) ->
|
||||||
|
txs_from_to(H, current_height()).
|
||||||
|
|
||||||
|
|
||||||
|
txs_minus(N) ->
|
||||||
|
H = current_height(),
|
||||||
|
L = H - N,
|
||||||
|
txs_from_to(L, H).
|
||||||
|
|
||||||
|
|
||||||
|
txs_from_to(Min, Max) when Min =< Max ->
|
||||||
|
lists:append([txs_of_height(H) || H <- lists:seq(Min, Max)]);
|
||||||
|
txs_from_to(Min, Max) when Min > Max ->
|
||||||
|
[].
|
||||||
|
|
||||||
|
|
||||||
|
current_height() ->
|
||||||
|
{ok, H} = hz:kb_current_height(),
|
||||||
|
H.
|
||||||
|
|
||||||
|
|
||||||
|
txs_of_height(Height) ->
|
||||||
|
lists:append([txs_of_mh(MH) || MH <- mhs_of_height(Height)]).
|
||||||
|
|
||||||
|
|
||||||
|
-spec mhs_of_height(Height :: pos_integer()) -> term().
|
||||||
|
mhs_of_height(Height) ->
|
||||||
|
{ok, #{"micro_blocks" := MHs}} = hz:gen_by_height(Height),
|
||||||
|
MHs.
|
||||||
|
|
||||||
|
|
||||||
|
txs_of_mh(MH) ->
|
||||||
|
{ok, TXs} = hz:mb_txs(MH),
|
||||||
|
TXs.
|
||||||
|
|
||||||
|
|
||||||
|
filter_spends(TXs) ->
|
||||||
|
lists:filtermap(fun filter_spend/1, TXs).
|
||||||
|
|
||||||
|
filter_spend(#{"tx" := TX = #{"type" := "SpendTx"}}) -> {true, spend_info(TX)};
|
||||||
|
filter_spend(_) -> false.
|
||||||
|
|
||||||
|
|
||||||
|
spend_info(#{"type" := "SpendTx",
|
||||||
|
"recipient_id" := Recipient,
|
||||||
|
"amount" := Amount,
|
||||||
|
"payload" := Payload}) ->
|
||||||
|
{sp, Recipient, Amount, Payload}.
|
||||||
+213
@@ -0,0 +1,213 @@
|
|||||||
|
% @doc spy: knows constraints {recipient, amount, payload}
|
||||||
|
%
|
||||||
|
% spies the chain for transactions that satisfy that constraint
|
||||||
|
%
|
||||||
|
-module(fd_spy).
|
||||||
|
-vsn("0.2.0").
|
||||||
|
|
||||||
|
% MVP: register search patterns
|
||||||
|
% simply print to console when one of them is found
|
||||||
|
|
||||||
|
-behavior(gen_server).
|
||||||
|
|
||||||
|
-export_type([
|
||||||
|
]).
|
||||||
|
|
||||||
|
-export([
|
||||||
|
%% caller context
|
||||||
|
reg/3,
|
||||||
|
|
||||||
|
%% api
|
||||||
|
start_link/0,
|
||||||
|
|
||||||
|
%% process context
|
||||||
|
init/1, handle_call/3, handle_cast/2, handle_info/2,
|
||||||
|
code_change/3, terminate/2
|
||||||
|
]).
|
||||||
|
|
||||||
|
% recipient is a string
|
||||||
|
-type pubkey32() :: <<_:256>>.
|
||||||
|
|
||||||
|
-record(sp,
|
||||||
|
{recipient :: pubkey32(),
|
||||||
|
amount :: pos_integer(),
|
||||||
|
payload :: binary()}).
|
||||||
|
-type search_pattern() :: #sp{}.
|
||||||
|
|
||||||
|
-record(s,
|
||||||
|
{last_height_seen = none :: none | integer(),
|
||||||
|
searching_for = [] :: [search_pattern()]}).
|
||||||
|
|
||||||
|
-type state() :: #s{}.
|
||||||
|
|
||||||
|
-include("$zx_include/zx_logger.hrl").
|
||||||
|
|
||||||
|
%%-----------------------------------------------------------------------------
|
||||||
|
%% caller context
|
||||||
|
%%-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
-spec reg(Recipient, Amount, Payload) -> ok | {error, Reason}
|
||||||
|
when Recipient :: pubkey32(),
|
||||||
|
Amount :: pos_integer(),
|
||||||
|
Payload :: binary(),
|
||||||
|
Reason :: any().
|
||||||
|
|
||||||
|
reg(R, A, P) when is_binary(R), byte_size(R) =:= 32,
|
||||||
|
is_integer(A), A >= 0,
|
||||||
|
is_binary(P) ->
|
||||||
|
gen_server:call(?MODULE, {reg, R, A, P}).
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
%% gen_server callbacks
|
||||||
|
start_link() ->
|
||||||
|
gen_server:start_link({local, ?MODULE}, ?MODULE, none, []).
|
||||||
|
|
||||||
|
|
||||||
|
%%-----------------------------------------------------------------------------
|
||||||
|
%% process context below this line
|
||||||
|
%%-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
%% gen_server callbacks
|
||||||
|
|
||||||
|
-spec init(none) -> {ok, state()}.
|
||||||
|
|
||||||
|
init(none) ->
|
||||||
|
tell("starting fd_spy"),
|
||||||
|
hz:chain_nodes(fewd:chain_nodes()),
|
||||||
|
erlang:send_after(1000, self(), check_chain),
|
||||||
|
InitState = #s{},
|
||||||
|
{ok, InitState}.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-spec handle_call(Msg, From, State) -> Result
|
||||||
|
when Msg :: any(),
|
||||||
|
From :: {pid(), reference()},
|
||||||
|
State :: state(),
|
||||||
|
Result :: {reply, Reply, NewState}
|
||||||
|
| {noreply, NewState},
|
||||||
|
Reply :: any(),
|
||||||
|
NewState :: state().
|
||||||
|
|
||||||
|
handle_call({reg, Recipient, Amount, Payload}, _From, State) ->
|
||||||
|
{Reply, NewState} = do_reg(Recipient, Amount, Payload, State),
|
||||||
|
{reply, Reply, NewState};
|
||||||
|
handle_call(Unexpected, From, State) ->
|
||||||
|
tell("~tp: unexpected call from ~tp: ~tp", [?MODULE, Unexpected, From]),
|
||||||
|
{noreply, State}.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
handle_cast(Unexpected, State) ->
|
||||||
|
tell("~tp: unexpected cast: ~tp", [?MODULE, Unexpected]),
|
||||||
|
{noreply, State}.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
handle_info(check_chain, State) ->
|
||||||
|
NewState = do_check_chain(State),
|
||||||
|
erlang:send_after(1000, self(), check_chain),
|
||||||
|
{noreply, NewState};
|
||||||
|
handle_info(Unexpected, State) ->
|
||||||
|
tell("~tp: unexpected info: ~tp", [?MODULE, Unexpected]),
|
||||||
|
{noreply, State}.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
code_change(_, State, _) ->
|
||||||
|
{ok, State}.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
terminate(_, _) ->
|
||||||
|
ok.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
%%-----------------------------------------------------------------------------
|
||||||
|
%% internals
|
||||||
|
%%-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
do_check_chain(State = #s{last_height_seen = none}) ->
|
||||||
|
case hz:kb_current_height() of
|
||||||
|
{ok, Max} ->
|
||||||
|
hh(Max-1, Max, State);
|
||||||
|
Error ->
|
||||||
|
tell("~tp hz error: ~tp", [?MODULE, Error]),
|
||||||
|
State
|
||||||
|
end;
|
||||||
|
do_check_chain(State = #s{last_height_seen = Min}) ->
|
||||||
|
case hz:kb_current_height() of
|
||||||
|
{ok, Max} ->
|
||||||
|
hh(Min, Max, State);
|
||||||
|
Error ->
|
||||||
|
tell("~tp hz error: ~tp", [?MODULE, Error]),
|
||||||
|
State
|
||||||
|
end.
|
||||||
|
|
||||||
|
% handle height
|
||||||
|
hh(PrevHeight, NewHeight, State) when PrevHeight < NewHeight ->
|
||||||
|
tell("~tp cool: PrevHeight=~tp, NewHeight=~tp", [?MODULE, PrevHeight, NewHeight]),
|
||||||
|
Spends = fd_hz:filter_spends(fd_hz:txs_from_to(PrevHeight + 1, NewHeight)),
|
||||||
|
tell("~tp spends: ~tp", [?MODULE, Spends]),
|
||||||
|
NewState = State#s{last_height_seen = NewHeight},
|
||||||
|
NewState;
|
||||||
|
hh(PrevHeight, NewHeight, State) when PrevHeight >= NewHeight ->
|
||||||
|
log(info, "~tp lame: PrevHeight=~tp, NewHeight=~tp", [?MODULE, PrevHeight, NewHeight]),
|
||||||
|
State.
|
||||||
|
|
||||||
|
|
||||||
|
-spec do_reg(Recipient, Amount, Payload, State) -> {Reply, NewState}
|
||||||
|
when Recipient :: pubkey32(),
|
||||||
|
Amount :: pos_integer(),
|
||||||
|
Payload :: binary(),
|
||||||
|
State :: state(),
|
||||||
|
Reply :: ok
|
||||||
|
| {error, Reason},
|
||||||
|
Reason :: any(),
|
||||||
|
NewState :: state().
|
||||||
|
|
||||||
|
do_reg(Recipient, Amount, Payload, State) ->
|
||||||
|
case already_registered(Recipient, Payload, State) of
|
||||||
|
true -> {error, already_registered};
|
||||||
|
false -> really_register(Recipient, Amount, Payload, State)
|
||||||
|
end.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-spec already_registered(Recipient, Payload, State) -> boolean()
|
||||||
|
when Recipient :: pubkey32(),
|
||||||
|
Payload :: binary(),
|
||||||
|
State :: state().
|
||||||
|
|
||||||
|
already_registered(Recipient, Payload, _State = #s{searching_for = SPs}) ->
|
||||||
|
ar(Recipient, Payload, SPs).
|
||||||
|
|
||||||
|
ar(Recipient, Payload, [#sp{recipient=Recipient, payload=Payload} | _]) ->
|
||||||
|
true;
|
||||||
|
ar(Recipient, Payload, [_ | Rest]) ->
|
||||||
|
ar(Recipient, Payload, Rest);
|
||||||
|
ar(_, _, []) ->
|
||||||
|
false.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
-spec really_register(Recipient, Amount, Payload, State) -> {Reply, NewState}
|
||||||
|
when Recipient :: pubkey32(),
|
||||||
|
Amount :: pos_integer(),
|
||||||
|
Payload :: binary(),
|
||||||
|
State :: state(),
|
||||||
|
Reply :: ok
|
||||||
|
| {error, Reason},
|
||||||
|
Reason :: any(),
|
||||||
|
NewState :: state().
|
||||||
|
|
||||||
|
really_register(R, A, P, State = #s{searching_for = SPs}) ->
|
||||||
|
NewSearchPattern = #sp{recipient = R,
|
||||||
|
amount = A,
|
||||||
|
payload = P},
|
||||||
|
tell("~tp: really_register(~tp,~tp,~tp)", [?MODULE, R, A, P]),
|
||||||
|
NewSearchPatterns = [NewSearchPattern | SPs],
|
||||||
|
NewState = State#s{searching_for = NewSearchPatterns},
|
||||||
|
{reply, ok, NewState}.
|
||||||
+7
-1
@@ -36,6 +36,12 @@ start_link() ->
|
|||||||
|
|
||||||
init([]) ->
|
init([]) ->
|
||||||
RestartStrategy = {one_for_one, 1, 60},
|
RestartStrategy = {one_for_one, 1, 60},
|
||||||
|
Spy = {fd_spy,
|
||||||
|
{fd_spy, start_link, []},
|
||||||
|
permanent,
|
||||||
|
5000,
|
||||||
|
worker,
|
||||||
|
[fd_spy]},
|
||||||
GridsD = {fd_gridsd,
|
GridsD = {fd_gridsd,
|
||||||
{fd_gridsd, start_link, []},
|
{fd_gridsd, start_link, []},
|
||||||
permanent,
|
permanent,
|
||||||
@@ -54,5 +60,5 @@ init([]) ->
|
|||||||
5000,
|
5000,
|
||||||
supervisor,
|
supervisor,
|
||||||
[fd_httpd]},
|
[fd_httpd]},
|
||||||
Children = [GridsD, WFCd, Httpd],
|
Children = [Spy, GridsD, WFCd, Httpd],
|
||||||
{ok, {RestartStrategy, Children}}.
|
{ok, {RestartStrategy, Children}}.
|
||||||
|
|||||||
+9
-1
@@ -9,13 +9,21 @@
|
|||||||
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
-copyright("Peter Harpending <peterharpending@qpq.swiss>").
|
||||||
-license("BSD-2-Clause-FreeBSD").
|
-license("BSD-2-Clause-FreeBSD").
|
||||||
|
|
||||||
-export([network_id/0, pubkey/0, akstr/0]).
|
-export([chain_nodes/0, url/0, host/0, network_id/0, pubkey/0, akstr/0]).
|
||||||
-export([listen/1, ignore/0]).
|
-export([listen/1, ignore/0]).
|
||||||
-export([start/2, stop/1]).
|
-export([start/2, stop/1]).
|
||||||
|
|
||||||
-include("$zx_include/zx_logger.hrl").
|
-include("$zx_include/zx_logger.hrl").
|
||||||
|
|
||||||
|
|
||||||
|
%% for testing: use mainnet
|
||||||
|
%chain_nodes() ->
|
||||||
|
% [{"tsuriai.jp", 3013}].
|
||||||
|
chain_nodes() ->
|
||||||
|
[{"tsuriai.jp", 4013}].
|
||||||
|
|
||||||
|
url() -> "http://" ++ host().
|
||||||
|
host() -> "localhost:8000".
|
||||||
network_id() -> "groot.testnet".
|
network_id() -> "groot.testnet".
|
||||||
pubkey() -> pad32(<<"fewd demo">>).
|
pubkey() -> pad32(<<"fewd demo">>).
|
||||||
akstr() -> gmgrids:akstr(pubkey()).
|
akstr() -> gmgrids:akstr(pubkey()).
|
||||||
|
|||||||
@@ -5,12 +5,18 @@
|
|||||||
{prefix,"fd"}.
|
{prefix,"fd"}.
|
||||||
{desc,"Front End Web Dev in Erlang stuff"}.
|
{desc,"Front End Web Dev in Erlang stuff"}.
|
||||||
{package_id,{"otpr","fewd",{0,2,0}}}.
|
{package_id,{"otpr","fewd",{0,2,0}}}.
|
||||||
{deps,[{"otpr","hakuzaru",{0,7,0}},
|
{deps,[{"otpr","hakuzaru",{0,8,3}},
|
||||||
{"otpr","qr",{0,1,0}},
|
{"otpr","sophia",{9,0,0}},
|
||||||
{"otpr","gmserialization",{0,1,3}},
|
{"otpr","gmserialization",{0,1,3}},
|
||||||
{"otpr","eblake2",{1,0,1}},
|
{"otpr","eblake2",{1,0,1}},
|
||||||
{"otpr","base58",{0,1,1}},
|
{"otpr","base58",{0,1,1}},
|
||||||
{"otpr","zj",{1,1,2}}]}.
|
{"otpr","gmbytecode",{3,4,1}},
|
||||||
|
{"otpr","base58",{0,1,1}},
|
||||||
|
{"otpr","eblake2",{1,0,1}},
|
||||||
|
{"otpr","ec_utils",{1,0,0}},
|
||||||
|
{"otpr","zj",{1,1,2}},
|
||||||
|
{"otpr","getopt",{1,0,2}},
|
||||||
|
{"otpr","qr",{0,1,0}}]}.
|
||||||
{key_name,none}.
|
{key_name,none}.
|
||||||
{a_email,"peterharpending@qpq.swiss"}.
|
{a_email,"peterharpending@qpq.swiss"}.
|
||||||
{c_email,"peterharpending@qpq.swiss"}.
|
{c_email,"peterharpending@qpq.swiss"}.
|
||||||
|
|||||||
Reference in New Issue
Block a user