diff --git a/src/gd_con.erl b/src/gd_con.erl index e00c5e7..710d25c 100644 --- a/src/gd_con.erl +++ b/src/gd_con.erl @@ -16,7 +16,7 @@ refresh/0, nonce/1, spend/1, chain/1, grids/1, sign_mess/1, sign_binary/1, sign_tx/1, sign_call/3, dry_run/2, - deploy/3, + deploy/3, make_call/3, make_key/6, recover_key/1, mnemonic/1, rename_key/2, drop_key/1, list_keys/0, add_node/1, set_sole_node/1]). -export([tic/1, update_balance/2]). diff --git a/src/gd_v_call.erl b/src/gd_v_call.erl index a051678..a9f2060 100644 --- a/src/gd_v_call.erl +++ b/src/gd_v_call.erl @@ -8,7 +8,6 @@ %-behavior(gd_v). -include_lib("wx/include/wx.hrl"). -export([to_front/1]). -% -export([]). -export([start_link/1]). -export([init/1, terminate/2, code_change/3, handle_call/3, handle_cast/2, handle_info/2, handle_event/2]). @@ -45,7 +44,7 @@ start_link(Args) -> wx_object:start_link({local, ?MODULE}, ?MODULE, Args, []). -init({Prefs, {FunName, FunType}, ConID, AACI}) -> +init({{FunName, FunType}, ConID, AACI}) -> {aaci, ConName, FunSpecs, _} = AACI, FunSpec = maps:get(FunName, FunSpecs), CallType = @@ -53,8 +52,9 @@ init({Prefs, {FunName, FunType}, ConID, AACI}) -> call -> J("Contract Call"); dryr -> J("Dry Run") end, - Title = [CallType, ": ", ConName, ".", FunName, "/", integer_to_list(length(element(1, FunSpec)))], - Lang = maps:get(lang, Prefs, en_us), + Arity = integer_to_list(length(element(1, FunSpec))), + Title = [CallType, ": ", ConName, ".", FunName, "/", Arity], + Lang = maps:get(lang, Prefs, en), Trans = gd_jt:read_translations(?MODULE), J = gd_jt:j(Lang, Trans), Wx = wx:new(), @@ -62,7 +62,7 @@ init({Prefs, {FunName, FunType}, ConID, AACI}) -> {ArgSz, Args} = call_arg_sizer(Frame, J, FunSpec), {ParamSz, TTL_T, GasPriceT, GasT, AmountT} = call_param_sizer(Frame, J), - + _ = wxFrame:setSizer(Frame, MainSz), _ = wxSizer:layout(MainSz), ok = gd_v:safe_size(Frame, Prefs), @@ -101,6 +101,8 @@ call_sizer(Frame, J, CallArgs) -> GridSz = wxFlexGridSizer:new(2, [{gap, {4, 4}}]), ok = wxFlexGridSizer:setFlexibleDirection(GridSz, ?wxHORIZONTAL), ok = wxFlexGridSizer:addGrowableCol(GridSz, 1), + _ = wxStaticBoxSizer:add(ScrollSz, GridSz, zxw:flags(wide)), + _ = wxStaticBoxSizer:add(CallSz, ScrollWin, zxw:flags(wide)), AddArg = fun({Name, Type}) -> L = wxStaticText:new(ScrollWin, ?wxID_ANY, [Name, " : ", textify(Type)]), @@ -109,8 +111,6 @@ call_sizer(Frame, J, CallArgs) -> _ = wxFlexGridSizer:add(GridSz, C, zxw:flags({wide, 5})), {Name, C} end, - _ = wxStaticBoxSizer:add(ScrollSz, GridSz, zxw:flags(wide)), - _ = wxStaticBoxSizer:add(CallSz, ScrollWin, zxw:flags(wide)), Controls = lists:map(AddArg, CallArgs), {CallSz, Controls, {600, 700}}. @@ -143,19 +143,18 @@ call_param_sizer(Frame, J) -> Amount_L = wxStaticText:new(Frame, ?wxID_ANY, J("TX Amount")), Amount_Tx = wxTextCtrl:new(Frame, ?wxID_ANY), ok = wxTextCtrl:setValue(Amount_Tx, integer_to_list(DefAmount)), - _ = wxFlexGridSizer:add(GridSz, TTL_L, zxw:flags({base, 5})), - _ = wxFlexGridSizer:add(GridSz, TTL_Tx, zxw:flags({wide, 5})), - _ = wxFlexGridSizer:add(GridSz, GasP_L, zxw:flags({base, 5})), - _ = wxFlexGridSizer:add(GridSz, GasP_Tx, zxw:flags({wide, 5})), - _ = wxFlexGridSizer:add(GridSz, Gas_L, zxw:flags({base, 5})), - _ = wxFlexGridSizer:add(GridSz, Gas_Tx, zxw:flags({wide, 5})), - _ = wxFlexGridSizer:add(GridSz, Amount_L, zxw:flags({base, 5})), + _ = wxFlexGridSizer:add(GridSz, TTL_L, zxw:flags({base, 5})), + _ = wxFlexGridSizer:add(GridSz, TTL_Tx, zxw:flags({wide, 5})), + _ = wxFlexGridSizer:add(GridSz, GasP_L, zxw:flags({base, 5})), + _ = wxFlexGridSizer:add(GridSz, GasP_Tx, zxw:flags({wide, 5})), + _ = wxFlexGridSizer:add(GridSz, Gas_L, zxw:flags({base, 5})), + _ = wxFlexGridSizer:add(GridSz, Gas_Tx, zxw:flags({wide, 5})), + _ = wxFlexGridSizer:add(GridSz, Amount_L, zxw:flags({base, 5})), _ = wxFlexGridSizer:add(GridSz, Amount_Tx, zxw:flags({wide, 5})), _ = wxSizer:add(ParamSz, GridSz, zxw:flags(wide)), {ParamSz, TTL_Tx, GasP_Tx, Gas_Tx, Amount_Tx}. - textify({integer, _, _}) -> "int"; textify({boolean, _, _}) -> "bool"; textify({{bytes, [I]}, _, _}) -> io_lib:format("bytes(~w)", [I]); diff --git a/src/gd_v_devman.erl b/src/gd_v_devman.erl index 9d08e37..eaa98be 100644 --- a/src/gd_v_devman.erl +++ b/src/gd_v_devman.erl @@ -127,7 +127,7 @@ start_link(Args) -> init({Prefs, Manifest}) -> - Lang = maps:get(lang, Prefs, en_us), + Lang = maps:get(lang, Prefs, en), Trans = gd_jt:read_translations(?MODULE), J = gd_jt:j(Lang, Trans), Wx = wx:new(), @@ -338,21 +338,12 @@ clicked2(State, Contract, Name) -> handle_troubling(State, "No wallet is selected!") end. -clicked3(State = #s{frame = Frame, j = J}, Contract, Name = {FunName, FunType}, Selected, Keys) -> +clicked3(State = #s{frame = Frame, j = J}, Contract, FunDef, Selected, Keys) -> #c{id = ConID, build = #{aaci := AACI}} = Contract, - {FunDef, ConID, AACI} + ok = gd_con:make_call(FunDef, ConID, AACI), + State. - {aaci, ConName, FunSpecs, _} = AACI, - FunSpec = maps:get(FunName, FunSpecs), - tell("FunName: ~tp", [FunName]), - tell("FunSpec: ~tp", [FunSpec]), - CallType = - case FunType of - call -> J("Contract Call"); - dryr -> J("Dry Run") - end, - Label = [CallType, ": ", ConName, ".", FunName, "/", integer_to_list(length(element(1, FunSpec)))], Dialog = wxDialog:new(Frame, ?wxID_ANY, Label), Sizer = wxBoxSizer:new(?wxVERTICAL), KeySz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Signature Key")}]), diff --git a/src/gd_v_netman.erl b/src/gd_v_netman.erl index 2c62efe..deeec13 100644 --- a/src/gd_v_netman.erl +++ b/src/gd_v_netman.erl @@ -60,7 +60,7 @@ start_link(Args) -> init({Prefs, Manifest}) -> - Lang = maps:get(lang, Prefs, en_us), + Lang = maps:get(lang, Prefs, en), Trans = gd_jt:read_translations(?MODULE), J = gd_jt:j(Lang, Trans), Wx = wx:new(), diff --git a/src/gd_v_wallman.erl b/src/gd_v_wallman.erl index 408f67e..40c2d5e 100644 --- a/src/gd_v_wallman.erl +++ b/src/gd_v_wallman.erl @@ -90,7 +90,7 @@ start_link(Args) -> init({Prefs, Manifest}) -> - Lang = maps:get(lang, Prefs, en_us), + Lang = maps:get(lang, Prefs, en), Trans = gd_jt:read_translations(?MODULE), J = gd_jt:j(Lang, Trans), Wx = wx:new(),