Merge pull request 'binarysign' (#29) from binarysign into master

Reviewed-on: #29

src/gd_con.erl

@@ -330,25 +330,21 @@ start_link() ->
 init(none) ->
     ok = log(info, "Starting"),
     process_flag(sensitive, true),
-    {FirstRun, Prefs} = read_prefs(),
+    Prefs = read_prefs(),
     GUI_Prefs = maps:get(gd_gui, Prefs, #{}),
     Window = gd_gui:start_link(GUI_Prefs),
     Wallets = get_prefs(wallets, Prefs, []),
     T = erlang:send_after(tic(), self(), tic),
     State = #s{window = Window, timer = T, wallets = Wallets, prefs = Prefs},
     NewState = do_show_ui(gd_v_wallman, State),
-    ok =
-        case FirstRun of
-            false -> gd_v_wallman:to_front();
-            true  -> gd_v_wallman:first_run()
-        end,
+    ok = gd_v_wallman:first_run(),
     {ok, NewState}.
 
 
 read_prefs() ->
     case file:consult(prefs_path()) of
-        {ok, Prefs} -> {false, proplists:to_map(Prefs)};
-        _           -> {true, #{}}
+        {ok, Prefs} -> proplists:to_map(Prefs);
+        _           -> #{}
     end.
 
 
@@ -528,7 +524,13 @@ code_change(_, State, _) ->
 
 terminate(Reason, _) ->
     ok = log(info, "Reason: ~p,", [Reason]),
-    zx:stop().
+    case whereis(gmc_con) of
+        undefined ->
+            zx:stop();
+        PID ->
+            ok = log(info, "gd_con found at: ~p", [PID]),
+            application:stop(gajumine)
+    end.
 
 
 

src/gd_gui.erl

@@ -92,24 +92,21 @@ init(Prefs) ->
     VSN = proplists:get_value(vsn, ?MODULE:module_info(attributes)),
     Wx = wx:new(),
     Frame = wxFrame:new(Wx, ?wxID_ANY, AppName ++ " v" ++ VSN),
-    Panel = wxWindow:new(Frame, ?wxID_ANY),
-    TopSz = wxBoxSizer:new(?wxVERTICAL),
-    _ = wxBoxSizer:add(TopSz, Panel, zxw:flags(wide)),
     MainSz = wxBoxSizer:new(?wxVERTICAL),
-    Picker = wxListBox:new(Panel, ?wxID_ANY, [{style, ?wxLC_SINGLE_SEL}]),
+    Picker = wxListBox:new(Frame, ?wxID_ANY, [{style, ?wxLC_SINGLE_SEL}]),
 
-    WallB  = wxButton:new(Panel, ?wxID_ANY, [{label, "[none]"}, {style, ?wxBORDER_NONE}]),
+    WallB  = wxButton:new(Frame, ?wxID_ANY, [{label, "[none]"}, {style, ?wxBORDER_NONE}]),
     WallW  = #w{name = wallet, id = wxButton:getId(WallB),  wx = WallB},
-    ChainB = wxButton:new(Panel, ?wxID_ANY, [{label, "[ChainID]"}, {style, ?wxBORDER_NONE}]),
+    ChainB = wxButton:new(Frame, ?wxID_ANY, [{label, "[ChainID]"}, {style, ?wxBORDER_NONE}]),
     _ = wxButton:disable(ChainB),
     ChainW = #w{name = chain,  id = wxButton:getId(ChainB), wx = ChainB},
-    NodeB  = wxButton:new(Panel, ?wxID_ANY, [{label, "[Node]"}, {style, ?wxBORDER_NONE}]),
+    NodeB  = wxButton:new(Frame, ?wxID_ANY, [{label, "[Node]"}, {style, ?wxBORDER_NONE}]),
     NodeW  = #w{name = node,   id = wxButton:getId(NodeB),  wx = NodeB},
-    DevB   = wxButton:new(Panel, ?wxID_ANY, [{label, "𝑓 () →"}]),
+    DevB   = wxButton:new(Frame, ?wxID_ANY, [{label, "𝑓 () →"}]),
     DevW   = #w{name = dev,    id = wxButton:getId(DevB),   wx = DevB},
 
-    ID_L = wxStaticText:new(Panel, ?wxID_ANY, J("Account ID: ")),
-    ID_T = wxStaticText:new(Panel, ?wxID_ANY, ""),
+    ID_L = wxStaticText:new(Frame, ?wxID_ANY, J("Account ID: ")),
+    ID_T = wxStaticText:new(Frame, ?wxID_ANY, ""),
     ID_W =
         {#w{id = wxStaticText:getId(ID_L), wx = ID_L},
          #w{id = wxStaticText:getId(ID_T), wx = ID_T}},
@@ -117,8 +114,8 @@ init(Prefs) ->
     _ = wxSizer:add(ID_Sz, ID_L, zxw:flags(base)),
     _ = wxSizer:add(ID_Sz, ID_T, zxw:flags(wide)),
 
-    BalanceL = wxStaticText:new(Panel, ?wxID_ANY, "木"),
-    BalanceT = wxStaticText:new(Panel, ?wxID_ANY, price_to_string(0)),
+    BalanceL = wxStaticText:new(Frame, ?wxID_ANY, "木"),
+    BalanceT = wxStaticText:new(Frame, ?wxID_ANY, price_to_string(0)),
     Balance =
         {#w{id = wxStaticText:getId(BalanceL), wx = BalanceL},
          #w{id = wxStaticText:getId(BalanceT), wx = BalanceT}},
@@ -145,7 +142,7 @@ init(Prefs) ->
 
     MakeButton =
         fun({Name, Label}) ->
-            B = wxButton:new(Panel, ?wxID_ANY, [{label, Label}]),
+            B = wxButton:new(Frame, ?wxID_ANY, [{label, Label}]),
             #w{name = Name, id = wxButton:getId(B), wx = B}
         end,
 
@@ -193,7 +190,7 @@ init(Prefs) ->
 
     #w{wx = Refresh} = lists:keyfind(refresh, #w.name, Buttons),
 
-%   HistoryWin = wxScrolledWindow:new(Panel),
+%   HistoryWin = wxScrolledWindow:new(Frame),
 %   HistorySz = wxBoxSizer:new(?wxVERTICAL),
 %   ok = wxScrolledWindow:setSizerAndFit(HistoryWin, HistorySz),
 %   ok = wxScrolledWindow:setScrollRate(HistoryWin, 5, 5),
@@ -205,8 +202,7 @@ init(Prefs) ->
     _ = wxSizer:add(MainSz, ActionsSz, zxw:flags(base)),
     _ = wxSizer:add(MainSz, Refresh, zxw:flags(base)),
 %   _ = wxSizer:add(MainSz, HistoryWin, zxw:flags(wide)),
-    ok = wxWindow:setSizer(Panel, MainSz),
-    ok = wxFrame:setSizer(Frame, TopSz),
+    ok = wxFrame:setSizer(Frame, MainSz),
     ok = wxSizer:layout(MainSz),
 
     ok = gd_v:safe_size(Frame, Prefs),
@@ -582,8 +578,8 @@ show_mnemonic(Selected, State = #s{frame = Frame, j = J, accounts = Accounts}) -
     MnemTx = wxTextCtrl:new(Dialog, ?wxID_ANY, Options),
     _ = wxStaticBoxSizer:add(MnemSz, MnemTx, zxw:flags(wide)),
     ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
-    CloseB = wxButton:new(Dialog, ?wxID_CANCEL, [{label, J("Close")}]),
-    CopyB  = wxButton:new(Dialog, ?wxID_OK, [{label, J("Copy to Clipboard")}]),
+    CloseB  = wxButton:new(Dialog, ?wxID_CANCEL, [{label, J("Close")}]),
+    CopyB   = wxButton:new(Dialog, ?wxID_OK, [{label, J("Copy to Clipboard")}]),
     _ = wxBoxSizer:add(ButtSz, CloseB, zxw:flags(wide)),
     _ = wxBoxSizer:add(ButtSz, CopyB, zxw:flags(wide)),
     _ = wxBoxSizer:add(Sizer, MnemSz, zxw:flags(wide)),
@@ -611,15 +607,33 @@ rename_key(State = #s{picker = Picker}) ->
 
 rename_key(Selected, State = #s{frame = Frame, j = J, accounts = Accounts}) ->
     #poa{id = ID, name = Name} = lists:nth(Selected, Accounts),
-    Title = J("Rename Key"),
-    Label = J("New Name"),
-    Options = [{label, Label}, {init, Name}, selected, empty],
+    Dialog = wxDialog:new(Frame, ?wxID_ANY, J("New Key")),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+    NameSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Name (Optional)")}]),
+    NameTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
+    ok = wxTextCtrl:setValue(NameTx, Name),
+    _ = wxStaticBoxSizer:add(NameSz, NameTx, zxw:flags(base)),
+    ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
+    Affirm = wxButton:new(Dialog, ?wxID_OK),
+    Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
+    _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
+    _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
+    _ = wxBoxSizer:add(Sizer, NameSz, zxw:flags(base)),
+    _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(wide)),
+    ok = wxDialog:setSizer(Dialog, Sizer),
+    ok = wxBoxSizer:layout(Sizer),
+    ok = wxDialog:setSize(Dialog, {500, 130}),
+    ok = wxDialog:center(Dialog),
+    ok = wxStyledTextCtrl:setFocus(NameTx),
     ok =
-        case zxw_modal_text:show(Frame, Title, Options) of
-            {ok, ""}      -> gd_con:rename_key(ID, binary_to_list(ID));
-            {ok, NewName} -> gd_con:rename_key(ID, NewName);
-            cancel        -> ok
+        case wxDialog:showModal(Dialog) of
+            ?wxID_OK ->
+                NewName = wxTextCtrl:getValue(NameTx),
+                gd_con:rename_key(ID, NewName);
+            ?wxID_CANCEL ->
+                ok
         end,
+    ok = wxDialog:destroy(Dialog),
     State.
 
 
@@ -729,35 +743,133 @@ spend(Selected, State = #s{accounts = Accounts}) ->
     end.
 
 spend2(#poa{id = ID, name = Name}, Nonce, Height, State = #s{frame = Frame, j = J}) ->
-    Title   = J("Transfer Gajus"),
+    Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Transfer"), [{size, {500, 400}}]),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+
     Account = [Name, " (", ID, ")"],
-    Args    = {Account, Nonce, Height},
-    Labels  = {J("From"), J("To"), J("Amount"), J("Message (optional)"), J("TTL"), J("Gas Price")},
+    FromTx = wxStaticText:new(Dialog, ?wxID_ANY, Account),
+    FromSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("From")}]),
+    _ = wxStaticBoxSizer:add(FromSz, FromTx, zxw:flags(wide)),
+
+    ToTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
+    ToSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("To")}]),
+    _ = wxStaticBoxSizer:add(ToSz, ToTx, zxw:flags(wide)),
+
+    AmtTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
+    AmtSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Amount")}]),
+    AmtInSz = wxBoxSizer:new(?wxHORIZONTAL),
+    AmtLabel = wxStaticText:new(Dialog, ?wxID_ANY, "木"),
+    _ = wxStaticBoxSizer:add(AmtInSz, AmtLabel, zxw:flags(base)),
+    _ = wxStaticBoxSizer:add(AmtInSz, AmtTx, zxw:flags(wide)),
+    _ = wxStaticBoxSizer:add(AmtSz, AmtInSz, zxw:flags(wide)),
+
+    DataTx = wxTextCtrl:new(Dialog, ?wxID_ANY, [{style, ?wxTE_MULTILINE}]),
+    DataSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Message (optional)")}]),
+    _ = wxStaticBoxSizer:add(DataSz, DataTx, zxw:flags(wide)),
+
+    Style = [{style, ?wxSL_HORIZONTAL bor ?wxSL_LABELS}],
+
+    TTL_Sl = wxSlider:new(Dialog, ?wxID_ANY, 100, 10, 1000, Style),
+    TTL_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("TTL")}]),
+    _ = wxStaticBoxSizer:add(TTL_Sz, TTL_Sl, zxw:flags(wide)),
+
+    Min = hz:min_gas_price(),
+    Max = Min * 2,
+    GasSl = wxSlider:new(Dialog, ?wxID_ANY, Min, Min, Max, Style),
+    GasSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Gas Price")}]),
+    _ = wxStaticBoxSizer:add(GasSz, GasSl, zxw:flags(wide)),
+
+    ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
+    Affirm = wxButton:new(Dialog, ?wxID_OK),
+    Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
+    _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
+    _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
+
+    _ = wxBoxSizer:add(Sizer, FromSz, zxw:flags(base)),
+    _ = wxBoxSizer:add(Sizer, ToSz, zxw:flags(base)),
+    _ = wxBoxSizer:add(Sizer, AmtSz, zxw:flags(base)),
+    _ = wxBoxSizer:add(Sizer, DataSz, zxw:flags(wide)),
+    _ = wxBoxSizer:add(Sizer, TTL_Sz, zxw:flags(wide)),
+    _ = wxBoxSizer:add(Sizer, GasSz, zxw:flags(base)),
+    _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)),
+    ok = wxDialog:setSizer(Dialog, Sizer),
+    ok = wxBoxSizer:layout(Sizer),
+    ok = wxFrame:setSize(Dialog, {500, 450}),
+    ok = wxFrame:center(Dialog),
     ok =
-        case gd_m_spend:show(Frame, Title, Args, Labels) of
-            {ok, RecipientID, Amount, GasPrice, TTL, Payload} ->
+        case wxDialog:showModal(Dialog) of
+            ?wxID_OK ->
                 TX =
                     #spend_tx{sender_id    = ID,
-                              recipient_id = RecipientID,
-                              amount       = Amount,
-                              gas_price    = GasPrice,
+                              recipient_id = wxTextCtrl:getValue(ToTx),
+                              amount       = wxTextCtrl:getValue(AmtTx),
+                              gas_price    = wxSlider:getValue(GasSl),
                               gas          = 20000,
-                              ttl          = Height + TTL,
+                              ttl          = Height + wxSlider:getValue(TTL_Sl),
                               nonce        = Nonce,
-                              payload      = Payload},
-                gd_con:spend(TX);
-            cancel ->
+                              payload      = wxTextCtrl:getValue(DataTx)},
+                clean_spend(TX);
+            ?wxID_CANCEL ->
                 ok
         end,
+    ok = wxDialog:destroy(Dialog),
     State.
 
+clean_spend(#spend_tx{recipient_id = ""}) ->
+    ok;
+clean_spend( TX = #spend_tx{amount = S}) when is_list(S) ->
+    case string_to_price(S) of
+        {ok, Amount} -> clean_spend(TX#spend_tx{amount = Amount});
+        {error, _}   -> ok
+    end;
+clean_spend(TX = #spend_tx{gas_price = S}) when is_list(S) ->
+    case is_int(S) of
+        true  -> clean_spend(TX#spend_tx{gas_price = list_to_integer(S)});
+        false -> ok
+    end;
+clean_spend(TX = #spend_tx{gas = S}) when is_list(S) ->
+    case is_int(S) of
+        true  -> clean_spend(TX#spend_tx{gas = list_to_integer(S)});
+        false -> ok
+    end;
+clean_spend(TX = #spend_tx{payload = S}) when is_list(S) ->
+    clean_spend(TX#spend_tx{payload = list_to_binary(S)});
+clean_spend(TX) ->
+    gd_con:spend(TX).
+
+
+is_int(S) ->
+    lists:all(fun(C) -> $0 =< C andalso C =< $9 end, S).
+
 
 grids_dialogue(State = #s{frame = Frame, j = J}) ->
-    Title = J("GRIDS URL"),
+    Dialog = wxDialog:new(Frame, ?wxID_ANY, J("GRIDS URL")),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+    Label = J("GRIDS URL"),
+    URL_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J(Label)}]),
+    URL_Tx = wxTextCtrl:new(Dialog, ?wxID_ANY),
+    _ = wxStaticBoxSizer:add(URL_Sz, URL_Tx, zxw:flags(wide)),
+    ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
+    Affirm = wxButton:new(Dialog, ?wxID_OK),
+    Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
+    _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
+    _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
+    _ = wxBoxSizer:add(Sizer, URL_Sz, zxw:flags(base)),
+    _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(wide)),
+    ok = wxDialog:setSizer(Dialog, Sizer),
+    ok = wxBoxSizer:layout(Sizer),
+    ok = wxDialog:setSize(Dialog, {500, 130}),
+    ok = wxDialog:center(Dialog),
+    ok = wxStyledTextCtrl:setFocus(URL_Tx),
     ok =
-        case zxw_modal_text:show(Frame, Title) of
-            {ok, String} -> gd_con:grids(String);
-            cancel       -> ok
+        case wxDialog:showModal(Dialog) of
+            ?wxID_OK ->
+                case wxTextCtrl:getValue(URL_Tx) of
+                    ""     -> ok;
+                    String -> gd_con:grids(String)
+                end;
+            ?wxID_CANCEL ->
+                ok
         end,
     State.
 

src/gd_m_spend.erl

@@ -1,274 +0,0 @@
-%%% @doc
-%%% A live modal for importing a wallet.
-%%%
-%%% Interprets [ENTER] as an "OK" button click and [ESC] as a "Cancel" button click.
-%%% @end
-
--module(gd_m_wallet_importer).
--vsn("0.8.0").
--author("Craig Everett <zxq9@zxq9.com>").
--copyright("Craig Everett <zxq9@zxq9.com>").
--license("GPL-3.0-or-later").
-
--behavior(zxw_modal).
-
--export([show/6]).
--export([init/1, handle_info/2, handle_event/2]).
-
--include_lib("wx/include/wx.hrl").
--include("$zx_include/zx_logger.hrl").
-
--record(s,
-        {frame      = none :: none | wx:wx_object(),
-         parent     = none :: none | wx:wx_object(),
-         caller     = none :: none | pid(),
-         to_tx      = none :: none | wx:wx_object(),
-         amount_tx  = none :: none | wx:wx_object(),
-         payload_tx = none :: none | wx:wx_object(),
-         ttl_sl     = none :: none | wx:wx_object(),
-         gas_sl     = none :: none | wx:wx_object(),
-         ok         = none :: none | wx:wx_object(),
-         cancel     = none :: none | wx:wx_object()}).
-
-
-%%% Interface
-
--spec show(Parent, Title, Args, Labels) -> {ok, ReceipientID, Amount, GasPrice, TTL, Payload} | cancel
-    when Parent     :: wxFrame:wxFrame(),
-         Title      :: string(),
-         Args       :: {Account :: iolist(),
-                        Nonce   :: pos_integer(),
-                        Height  :: pos_integer()},
-         Labels     :: {FromL    :: string(),
-                        ToL      :: string(),
-                        AmountL  :: string(),
-                        MessageL :: string(),
-                        TTL_L    :: string(),
-                        GasL     :: string(),
-                        AffirmL  :: string(),
-                        CancelL  :: string()},
-         RecipientID :: binary(),          % <<"ak_...">> | <<"ct_...">>
-         Amount      :: non_neg_integer(), % Pucks
-         GasPrice    :: pos_integer(),     % Pucks
-         TTL         :: non_neg_integer(), % Generations
-         Payload     :: binary().
-
-show(Parent, Title, Args, Labels) ->
-    zxw_modal:show(Parent, ?MODULE, {Title, Args, Labels}).
-
-
-
-%% Init
-
-init({Parent, Caller, {Title, Args, Labels}}) ->
-    {Account, Nonce, Height} = Args,
-    {FromL, ToL, AmountL, MessageL, TTL_L, GasL, AffirmL, CancelL} = Labels,
-    Frame = wxFrame:new(Parent, ?wxID_ANY, Title),
-    Panel = wxWindow:new(Frame, ?wxID_ANY),
-    TopSz = wxBoxSizer:new(?wxVERTICAL),
-    _ = wxBoxSizer:add(TopSz, Panel, zxw:flags(wide)),
-    MainSz = wxBoxSizer:new(?wxVERTICAL),
-
-    FromTx = wxStaticText:new(Panel, ?wxID_ANY, Account),
-    FromSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, FromL}]),
-    _ = wxStaticBoxSizer:add(FromSz, FromTx, zxw:flags({wide, 5})),
-    ToTx = wxTextCtrl:new(Panel, ?wxID_ANY),
-    ToSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, ToL}]),
-    _ = wxStaticBoxSizer:add(ToSz, ToTx, zxw:flags({wide, 5})),
-    AmtTx = wxTextCtrl:new(Panel, ?wxID_ANY),
-    AmtSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, AmountL}]),
-    AmtInSz = wxBoxSizer:new(?wxHORIZONTAL),
-    AmtLabel = wxStaticText:new(Panel, ?wxID_ANY, "木"),
-    _ = wxStaticBoxSizer:add(AmtInSz, AmtLabel, zxw:flags(base)),
-    _ = wxStaticBoxSizer:add(AmtInSz, AmtTx, zxw:flags({wide, 5})),
-    _ = wxStaticBoxSizer:add(AmtSz, AmtInSz, zxw:flags({wide, 5})),
-    PayloadTx = wxTextCtrl:new(Panel, ?wxID_ANY, [{style, ?wxTE_MULTILINE}]),
-    PayloadSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, MessageL}]),
-    _ = wxStaticBoxSizer:add(PayloadSz, PayloadTx, zxw:flags({wide, 5})),
-    Style = [{style, ?wxSL_HORIZONTAL bor ?wxSL_LABELS}],
-    TTL_Sl = wxSlider:new(Panel, ?wxID_ANY, 100, 10, 1000, Style),
-    TTL_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, TTL_L}]),
-    _ = wxStaticBoxSizer:add(TTL_Sz, TTL_Sl, zxw:flags({wide, 5})),
-    Min = hz:min_gas_price(),
-    Max = Min * 2,
-    GasSl = wxSlider:new(Panel, ?wxID_ANY, Min, Min, Max, Style),
-    GasSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, GasL}]),
-    _ = wxStaticBoxSizer:add(GasSz, GasSl, zxw:flags({wide, 5})),
-    ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
-    Affirm = wxButton:new(Panel, ?wxID_ANY, [{label, AffirmL}]),
-    Cancel = wxButton:new(Panel, ?wxID_ANY, [{label, CancelL}]),
-    _ = wxBoxSizer:add(ButtSz, Affirm,    zxw:flags({wide, 5})),
-    _ = wxBoxSizer:add(ButtSz, Cancel,    zxw:flags({wide, 5})),
-    _ = wxBoxSizer:add(MainSz, FromSz,    zxw:flags({base, 5})),
-    _ = wxBoxSizer:add(MainSz, ToSz,      zxw:flags({base, 5})),
-    _ = wxBoxSizer:add(MainSz, AmtSz,     zxw:flags({base, 5})),
-    _ = wxBoxSizer:add(MainSz, PayloadSz, zxw:flags({wide, 5})),
-    _ = wxBoxSizer:add(MainSz, TTL_Sz,    zxw:flags({wide, 5})),
-    _ = wxBoxSizer:add(MainSz, GasSz,     zxw:flags({base, 5})),
-    _ = wxBoxSizer:add(MainSz, ButtSz,    zxw:flags({base, 5})),
-    HandleKey = key_handler(ToTx, AmtTx, PayloadTx, TTL_Sl, GasSl, OK, Cancel),
-    ok = wxFrame:connect(Frame,        key_down, [{callback, HandleKey}]),
-    ok = wxTextCtrl:connect(ToTx,      key_down, [{callback, HandleKey}]),
-    ok = wxTextCtrl:connect(AmtTx,     key_down, [{callback, HandleKey}]),
-    ok = wxTextCtrl:connect(PayloadTx, key_down, [{callback, HandleKey}]),
-    ok = wxTextCtrl:connect(TTL_Sl,    key_down, [{callback, HandleKey}]),
-    ok = wxTextCtrl:connect(GasSl,     key_down, [{callback, HandleKey}]),
-    ok = wxTextCtrl:connect(OK,        key_down, [{callback, HandleKey}]),
-    ok = wxTextCtrl:connect(Cancel,    key_down, [{callback, HandleKey}]),
-    ok = wxFrame:connect(Frame, command_button_clicked),
-    ok = wxFrame:connect(Frame, close_window),
-    ok = wxFrame:setSize(Frame, {500, 450}),
-    ok = wxFrame:center(Frame),
-    ok = wxWindow:setSizer(Panel, MainSz),
-    ok = wxFrame:setSizer(Frame, TopSz),
-    ok = wxBoxSizer:layout(MainSz),
-    ok = wxFrame:centerOnParent(Frame),
-    ok = wxTextCtrl:setFocus(NameTx),
-    true = wxFrame:show(Frame),
-    State =
-        #s{frame  = Frame,  parent    = Parent, caller     = Caller,
-           to_tx  = ToTx,   amount_tx = AmtTx,  payload_tx = PayloadTx,
-           ttl_sl = TTL_Sl, gas_sl    = GasSl,
-           ok     = OK,     cancel    = Cancel},
-    {Frame, State}.
-
-
-key_handler(ToTx, AmtTx, PayloadTx, TTL_Sl, GasSl, OK, Cancel) ->
-    Me = self(),
-    ToID     = wxTextCtrl:getId(ToTx),
-    AmtID    = wxTextCtrl:getId(AmtTx),
-    PL_ID    = wxTextCtrl:getId(PayloadTx),
-    TTL_ID   = wxSlider:getId(TTL_Sl),
-    GasID    = wxSlider:getId(GasSl),
-    OK_ID    = wxButton:getId(OK),
-    CancelID = wxButton:getId(Cancel),
-    fun(#wx{id = ID, event = #wxKey{type = key_down, keyCode = Code}}, KeyPress) ->
-        case Code of
-%            9 ->
-%               case ID of
-%                   ToID     -> Me ! {tab, to_tx};
-%                   AmtID    -> Me ! {tab, amount_tx};
-%                   PL_ID    -> Me ! {tab, payload_tx};
-%                   TTL_ID   -> Me ! {tab, ttl_sl};
-%                   GasID    -> Me ! {tab, gas_sl};
-%                   OK_ID    -> Me ! {tab, ok};
-%                   CancelID -> Me ! {tab, cancel};
-%                   _        -> wxEvent:skip(KeyPress)
-%               end;
-%           13 ->
-%               case ID of
-%                   NameID -> Me ! {enter, name};
-%                   PassID -> Me ! {enter, pass};
-%                   _      -> wxEvent:skip(KeyPress)
-%               end;
-            27 ->
-                Me ! esc;
-            _ ->
-                wxEvent:skip(KeyPress)
-        end
-    end.
-
-
-
-handle_info({tab, Element}, State) ->
-    ok = tab_traverse(Element, State),
-    {noreply, State};
-handle_info({enter, name}, State = #s{pass_tx = PassTx}) ->
-    ok = wxTextCtrl:setFocus(PassTx),
-    {noreply, State};
-handle_info({enter, pass}, State) ->
-    done(State);
-handle_info(esc, State) ->
-    ok = cancel(State),
-    {noreply, State};
-handle_info(Message, State) ->
-    ok = log(warning, "Message: ~p~nState: ~p~n", [Message, State]),
-    {noreply, State}.
-
-
-handle_event(#wx{event = #wxCommand{type = command_button_clicked}, id = ID},
-             State = #s{ok = OK, cancel = Cancel}) ->
-    OK_ID    = wxButton:getId(OK),
-    CancelID = wxButton:getId(Cancel),
-    case ID of
-        OK_ID    -> done(State);
-        CancelID -> cancel(State)
-    end;
-handle_event(#wx{event = #wxClose{}}, State) ->
-    NewState = cancel(State),
-    {noreply, NewState};
-handle_event(Event, State) ->
-    ok = log(warning, "Unexpected event ~tp State: ~tp~n", [Event, State]),
-    {noreply, State}.
-
-
-%%% Doers
-
-%tab_traverse(name, #s{pass_tx = PassTx}) ->
-%    wxTextCtrl:setFocus(PassTx);
-%tab_traverse(pass, #s{ok = OK}) ->
-%    wxButton:setFocus(OK);
-%tab_traverse(ok, #s{cancel = Cancel}) ->
-%    wxButton:setFocus(Cancel);
-%tab_traverse(cancel, #s{name_tx = NameTx}) ->
-%    wxTextCtrl:setFocus(NameTx).
-
-
-cancel(#s{frame = Frame, caller = Caller}) ->
-    ok = wxFrame:destroy(Frame),
-    zxw_modal:done(Caller, cancel).
-
-
-done(#s{frame  = Frame,  caller    = Caller,
-        to_tx  = ToTx,   amount_tx = AmountTx, payload_tx = PayloadTx,
-        ttl_sl = TTL_Sl, gas_sl    = GasSl}) ->
-    DirtyTX =
-        #spend_tx{recipient_id = wxTextCtrl:getValue(ToTx),
-                  amount       = wxTextCtrl:getValue(AmountTx),
-                  gas_price    = wxSlider:getValue(GasSl),
-                  ttl          = wxSlider:getValue(TTL_Sl),
-                  payload      = wxTextCtrl:getValue(PayloadTX)},
-    Result =
-        case clean_spend(TX) of
-            {ok, CleanTX} ->
-
-    
-    Result =
-        case wxTextCtrl:getValue(NameTx) of
-            "" ->
-                cancel;
-            Name ->
-                case wxTextCtrl:getValue(PassTx) of
-                    ""   -> {ok, Name, none};
-                    Pass -> {ok, Name, Pass}
-                end
-        end,
-    ok = wxFrame:destroy(Frame),
-    zxw_modal:done(Caller, Result).
-
-
-clean_spend(#spend_tx{recipient_id = ""}) ->
-    ok;
-clean_spend( TX = #spend_tx{amount = S}) when is_list(S) ->
-    case string_to_price(S) of
-        {ok, Amount} -> clean_spend(TX#spend_tx{amount = Amount});
-        {error, _}   -> ok
-    end;
-clean_spend(TX = #spend_tx{gas_price = S}) when is_list(S) ->
-    case is_int(S) of
-        true  -> clean_spend(TX#spend_tx{gas_price = list_to_integer(S)});
-        false -> ok
-    end;
-clean_spend(TX = #spend_tx{gas = S}) when is_list(S) ->
-    case is_int(S) of
-        true  -> clean_spend(TX#spend_tx{gas = list_to_integer(S)});
-        false -> ok
-    end;
-clean_spend(TX = #spend_tx{payload = S}) when is_list(S) ->
-    clean_spend(TX#spend_tx{payload = list_to_binary(S)});
-clean_spend(TX) ->
-    {ok, CleanTX}.
-
-
-is_int(S) ->
-    lists:all(fun(C) -> $0 =< C andalso C =< $9 end, S).

src/gd_m_wallet_importer.erl

@@ -1,184 +0,0 @@
-%%% @doc
-%%% A live modal for importing a wallet.
-%%%
-%%% Interprets [ENTER] as an "OK" button click and [ESC] as a "Cancel" button click.
-%%% @end
-
--module(gd_m_wallet_importer).
--vsn("0.8.0").
--author("Craig Everett <zxq9@zxq9.com>").
--copyright("Craig Everett <zxq9@zxq9.com>").
--license("GPL-3.0-or-later").
-
--behavior(zxw_modal).
-
--export([show/6]).
--export([init/1, handle_info/2, handle_event/2]).
-
--include_lib("wx/include/wx.hrl").
--include("$zx_include/zx_logger.hrl").
-
--record(s,
-        {frame   = none :: none | wx:wx_object(),
-         parent  = none :: none | wx:wx_object(),
-         caller  = none :: none | pid(),
-         name_tx = none :: none | wx:wx_object(),
-         pass_tx = none :: none | wx:wx_object(),
-         ok      = none :: none | wx:wx_object(),
-         cancel  = none :: none | wx:wx_object()}).
-
-
-%%% Interface
-
--spec show(Parent, Title, NameLabel, PassLabel, OK_L, Cancel_L) -> {ok, Name, Pass} | cancel
-    when Parent    :: wxFrame:wxFrame(),
-         Title     :: string(),
-         NameLabel :: string(),
-         PassLabel :: string(),
-         OK_L      :: string(),
-         Cancel_L  :: string(),
-         Name      :: string(),
-         Pass      :: string() | none.
-
-show(Parent, Title, NameLabel, PassLabel, OK_L, Cancel_L) ->
-    zxw_modal:show(Parent, ?MODULE, {Title, NameLabel, PassLabel, OK_L, Cancel_L}).
-
-
-
-%% Init
-
-init({Parent, Caller, {Title, NameLabel, PassLabel, OK_L, Cancel_L}}) ->
-    Frame = wxFrame:new(Parent, ?wxID_ANY, Title),
-    Panel = wxWindow:new(Frame, ?wxID_ANY),
-    TopSz = wxBoxSizer:new(?wxVERTICAL),
-    _ = wxBoxSizer:add(TopSz, Panel, zxw:flags(wide)),
-    MainSz = wxBoxSizer:new(?wxVERTICAL),
-    NameSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, NameLabel}]),
-    NameTx = wxTextCtrl:new(Panel, ?wxID_ANY, [{style, ?wxTE_PROCESS_TAB}]),
-    _ = wxSizer:add(NameSz, NameTx, zxw:flags({wide, 5})),
-    PassSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, PassLabel}]),
-    PassTx = wxTextCtrl:new(Panel, ?wxID_ANY, [{style, ?wxTE_PROCESS_TAB bor ?wxTE_PASSWORD}]),
-    _ = wxSizer:add(PassSz, PassTx, zxw:flags({wide, 5})),
-    OK = wxButton:new(Panel, ?wxID_ANY, [{label, OK_L}]),
-    Cancel = wxButton:new(Panel, ?wxID_ANY, [{label, Cancel_L}]),
-    ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
-    _ = wxBoxSizer:add(ButtSz, OK, zxw:flags({wide, 5})),
-    _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})),
-    _ = wxBoxSizer:add(MainSz, NameSz, zxw:flags({wide, 5})),
-    _ = wxBoxSizer:add(MainSz, PassSz, zxw:flags({wide, 5})),
-    _ = wxBoxSizer:add(MainSz, ButtSz, zxw:flags({wide, 5})),
-    HandleKey = key_handler(NameTx, PassTx, OK, Cancel),
-    ok = wxFrame:connect(Frame,     key_down, [{callback, HandleKey}]),
-    ok = wxTextCtrl:connect(NameTx, key_down, [{callback, HandleKey}]),
-    ok = wxTextCtrl:connect(PassTx, key_down, [{callback, HandleKey}]),
-    ok = wxTextCtrl:connect(OK,     key_down, [{callback, HandleKey}]),
-    ok = wxTextCtrl:connect(Cancel, key_down, [{callback, HandleKey}]),
-    ok = wxFrame:connect(Frame, command_button_clicked),
-    ok = wxFrame:connect(Frame, close_window),
-    ok = wxFrame:setSize(Frame, {500, 220}),
-    ok = wxWindow:setSizer(Panel, MainSz),
-    ok = wxFrame:setSizer(Frame, TopSz),
-    ok = wxBoxSizer:layout(MainSz),
-    ok = wxFrame:centerOnParent(Frame),
-    ok = wxTextCtrl:setFocus(NameTx),
-    true = wxFrame:show(Frame),
-    State =
-        #s{frame    = Frame,  parent    = Parent, caller = Caller,
-           name_tx  = NameTx, pass_tx   = PassTx,
-           ok       = OK,     cancel    = Cancel},
-    {Frame, State}.
-
-
-key_handler(NameTx, PassTx, OK, Cancel) ->
-    Me = self(),
-    NameID   = wxTextCtrl:getId(NameTx),
-    PassID   = wxTextCtrl:getId(PassTx),
-    OK_ID    = wxButton:getId(OK),
-    CancelID = wxButton:getId(Cancel),
-    fun(#wx{id = ID, event = #wxKey{type = key_down, keyCode = Code}}, KeyPress) ->
-        case Code of
-             9 ->
-                case ID of
-                    NameID   -> Me ! {tab, name};
-                    PassID   -> Me ! {tab, pass};
-                    OK_ID    -> Me ! {tab, ok};
-                    CancelID -> Me ! {tab, cancel};
-                    _        -> wxEvent:skip(KeyPress)
-                end;
-            13 ->
-                case ID of
-                    NameID -> Me ! {enter, name};
-                    PassID -> Me ! {enter, pass};
-                    _      -> wxEvent:skip(KeyPress)
-                end;
-            27 ->
-                Me ! esc;
-            _ ->
-                wxEvent:skip(KeyPress)
-        end
-    end.
-
-
-
-handle_info({tab, Element}, State) ->
-    ok = tab_traverse(Element, State),
-    {noreply, State};
-handle_info({enter, name}, State = #s{pass_tx = PassTx}) ->
-    ok = wxTextCtrl:setFocus(PassTx),
-    {noreply, State};
-handle_info({enter, pass}, State) ->
-    done(State);
-handle_info(esc, State) ->
-    ok = cancel(State),
-    {noreply, State};
-handle_info(Message, State) ->
-    ok = log(warning, "Message: ~p~nState: ~p~n", [Message, State]),
-    {noreply, State}.
-
-
-handle_event(#wx{event = #wxCommand{type = command_button_clicked}, id = ID},
-             State = #s{ok = OK, cancel = Cancel}) ->
-    OK_ID    = wxButton:getId(OK),
-    CancelID = wxButton:getId(Cancel),
-    case ID of
-        OK_ID    -> done(State);
-        CancelID -> cancel(State)
-    end;
-handle_event(#wx{event = #wxClose{}}, State) ->
-    NewState = cancel(State),
-    {noreply, NewState};
-handle_event(Event, State) ->
-    ok = log(warning, "Unexpected event ~tp State: ~tp~n", [Event, State]),
-    {noreply, State}.
-
-
-%%% Doers
-
-tab_traverse(name, #s{pass_tx = PassTx}) ->
-    wxTextCtrl:setFocus(PassTx);
-tab_traverse(pass, #s{ok = OK}) ->
-    wxButton:setFocus(OK);
-tab_traverse(ok, #s{cancel = Cancel}) ->
-    wxButton:setFocus(Cancel);
-tab_traverse(cancel, #s{name_tx = NameTx}) ->
-    wxTextCtrl:setFocus(NameTx).
-
-
-cancel(#s{frame = Frame, caller = Caller}) ->
-    ok = wxFrame:destroy(Frame),
-    zxw_modal:done(Caller, cancel).
-
-
-done(#s{frame = Frame, caller = Caller, name_tx = NameTx, pass_tx = PassTx}) ->
-    Result =
-        case wxTextCtrl:getValue(NameTx) of
-            "" ->
-                cancel;
-            Name ->
-                case wxTextCtrl:getValue(PassTx) of
-                    ""   -> {ok, Name, none};
-                    Pass -> {ok, Name, Pass}
-                end
-        end,
-    ok = wxFrame:destroy(Frame),
-    zxw_modal:done(Caller, Result).

src/gd_sophia_editor.erl

@@ -1,6 +1,6 @@
 -module(gd_sophia_editor).
 -vsn("0.8.0").
--export([new/1, update/1, update/2,
+-export([new/1, update/2,
          get_text/1, set_text/2]).
 
 -include("$zx_include/zx_logger.hrl").
@@ -124,9 +124,6 @@ set_colors(STC) ->
 
 
 update(_Event, STC) ->
-    update(STC).
-
-update(STC) ->
     Text = wxStyledTextCtrl:getText(STC),
     case so_scan:scan(Text) of
         {ok, Tokens} ->

src/gd_v_devman.erl

@@ -15,6 +15,7 @@
 -include("$zx_include/zx_logger.hrl").
 -include("gd.hrl").
 
+-define(editorMode, sophia).
 
 % Widgets
 -record(w,
@@ -27,7 +28,7 @@
         {name   = <<"">> :: binary(),
          call   = #w{}   :: #w{},
          dryrun = #w{}   :: none | #w{},
-         args   = []     :: [argt()]}).
+         args   = []     :: [{wx:wx_object(), wx:wx_object(), argt()}]}).
 
 % Code book pages
 -record(p,
@@ -56,9 +57,7 @@
          code    = {none, []} :: {Codebook :: none | wx:wx_object(), Pages :: [#p{}]},
          cons    = {none, []} :: {Consbook :: none | wx:wx_object(), Pages :: [#c{}]}}).
 
-% TODO: Spec HZ AACIs.
--type argt() :: term(). % FIXME: Whatever HZ returns in the AACI as an arg type.
-
+-type argt() :: int | string | address | list(argt()).
 
 %%% Interface
 
@@ -428,9 +427,10 @@ call_params([{L, C} | T], A) ->
     end.
 
 clicked4(State,
-         #c{id = ConID, build = #{aaci := AACI}, funs = {_, Funs}},
+         #c{id = ConID, build = #{aci := ACI}, funs = {_, Funs}},
          {Name, Type},
          {PK, Nonce, TTL, GasP, Gas, Amt}) ->
+    AACI = hz:prepare_aaci(ACI),
     #f{args = ArgFields} = maps:get(Name, Funs),
     Args = lists:map(fun get_arg/1, ArgFields),
     case hz:contract_call(PK, Nonce, Gas, GasP, Amt, TTL, AACI, ConID, Name, Args) of
@@ -590,34 +590,39 @@ deploy(State = #s{code = {Codebook, Pages}}) ->
             State;
         Index ->
             #p{code = CodeTx} = lists:nth(Index + 1, Pages),
-            Source = gd_sophia_editor:get_text(CodeTx),
+            Source = wxStyledTextCtrl:getText(CodeTx),
             deploy2(State, Source)
     end.
 
 deploy2(State, Source) ->
     case compile(Source) of
+%   Options = sophia_options(),
+%   case so_compiler:from_string(Source, Options) of
 % TODO: Make hz accept either the aaci or the aci, preferring the aaci if present
         {ok, Build} ->
-            {aaci, ContractName, Funs, _} = maps:get(aaci, Build),
+            ACI = maps:get(aci, Build),
+            RawAACI = {aaci, ContractName, Funs, NS} = hz:prepare_aaci(ACI),
+            {InitSpec, Callable} = maps:take("init", Funs),
+            AACI = setelement(3, RawAACI, Callable),
+            Complete = maps:put(aaci, AACI, Build),
             ok = tell(info, "Deploying Contract: ~p", [ContractName]),
-            InitSpec = maps:get("init", Funs),
-            deploy3(State, InitSpec, Build);
+            deploy3(State, InitSpec, Complete, NS);
         Other ->
             ok = tell(info, "Compilation Failed!~n~tp", [Other]),
             State
     end.
 
-deploy3(State, InitSpec, Build) ->
+deploy3(State, InitSpec, Build, NS) ->
     case gd_con:list_keys() of
         {ok, 0, []} ->
             handle_troubling(State, "No keys exist in the current wallet.");
         {ok, Selected, Keys} ->
-            deploy4(State, InitSpec, Build, Selected, Keys);
+            deploy4(State, InitSpec, Build, NS, Selected, Keys);
         error ->
             handle_troubling(State, "No wallet is selected!")
     end.
 
-deploy4(State = #s{frame = Frame, j = J}, InitSpec, Build, Selected, Keys) ->
+deploy4(State = #s{frame = Frame, j = J}, InitSpec, Build, NS, Selected, Keys) ->
     InitArgs = element(1, InitSpec),
     Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Deploy Contract")),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
@@ -640,7 +645,7 @@ deploy4(State = #s{frame = Frame, j = J}, InitSpec, Build, Selected, Keys) ->
     GridSz = wxFlexGridSizer:new(2, 4, 4),
     ok = wxFlexGridSizer:setFlexibleDirection(GridSz, ?wxHORIZONTAL),
     ok = wxFlexGridSizer:addGrowableCol(GridSz, 1),
-    ArgFields = make_arg_fields(ScrollWin, GridSz, InitArgs),
+    ArgFields = make_arg_fields(ScrollWin, GridSz, InitArgs, NS, J),
     _ = wxStaticBoxSizer:add(FunSz, GridSz, zxw:flags(wide)),
     _ = wxStaticBoxSizer:add(ScrollSz, FunSz,   [{proportion, 1}, {flag, ?wxEXPAND}]),
     _ = wxStaticBoxSizer:add(ScrollSz, KeySz,   [{proportion, 0}, {flag, ?wxEXPAND}]),
@@ -686,19 +691,6 @@ deploy5(State, Build, Params, Args) ->
     State.
 
 
-make_arg_fields(ScrollWin, GridSz, Args) ->
-    MakeArgField =
-        fun({AN, T}) ->
-            tell(info, "~p: Arg: ~p, Type: ~p", [?LINE, AN, T]),
-            ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
-            TCT = wxTextCtrl:new(ScrollWin, ?wxID_ANY),
-            _ = wxFlexGridSizer:add(GridSz, ANT, [{proportion, 0}, {flag, ?wxEXPAND}]),
-            _ = wxFlexGridSizer:add(GridSz, TCT, [{proportion, 0}, {flag, ?wxEXPAND}]),
-            {T, TCT}
-        end,
-    lists:map(MakeArgField, Args).
-
-
 open(State = #s{frame = Frame, j = J}) ->
     Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Open Contract Source")),
     Sizer = wxBoxSizer:new(?wxVERTICAL),
@@ -843,9 +835,12 @@ open_hash2(State, Address) ->
 
 open_hash3(State, Address, Source) ->
     % TODO: Compile on load and verify the deployed hash for validity.
-    case compile(Source) of
-        {ok, Build} ->
-            {aaci, _, FunDefs, _} = maps:get(aaci, Build),
+    Options = sophia_options(),
+    case so_compiler:from_string(Source, Options) of
+        {ok, Build = #{aaci := AACI}} ->
+            {Defs = #{functions := Funs}, ConIfaces} = find_main(AACI),
+            Callable = maps:remove("init", Funs),
+            FunDefs = {maps:put(functions, Callable, Defs), ConIfaces},
             ok = tell(info, "Compilation Succeeded!~n~tp~n~n~tp", [Build, FunDefs]),
             add_code_page(State, {hash, Address}, Source);
         Other ->
@@ -908,7 +903,7 @@ save(State = #s{frame = Frame, j = J, prefs = Prefs, code = {Codebook, Pages}})
                                                 _      -> Name ++ ".aes"
                                             end,
                                         Path = filename:join(Dir, File),
-                                        Source = gd_sophia_editor:get_text(Widget),
+                                        Source = get_source(Widget),
                                         case filelib:ensure_dir(Path) of
                                             ok ->
                                                 case file:write_file(Path, Source) of
@@ -936,6 +931,18 @@ save(State = #s{frame = Frame, j = J, prefs = Prefs, code = {Codebook, Pages}})
             end
     end.
 
+get_source(Widget) ->
+    case ?editorMode of
+        plain  -> wxTextCtrl:getValue(Widget);
+        sophia -> gd_sophia_editor:get_text(Widget)
+    end.
+
+set_source(Widget, Src) ->
+    case ?editorMode of
+        plain  -> wxTextCtrl:setValue(Widget, Src);
+        sophia -> gd_sophia_editor:set_text(Widget, Src)
+    end.
+     
 
 % TODO: Break this down -- tons of things in here recur.
 rename(State = #s{frame = Frame, j = J, prefs = Prefs, code = {Codebook, Pages}}) ->
@@ -967,7 +974,7 @@ rename(State = #s{frame = Frame, j = J, prefs = Prefs, code = {Codebook, Pages}}
                                                 _      -> Name ++ ".aes"
                                             end,
                                         NewPath = filename:join(Dir, File),
-                                        Source = gd_sophia_editor:get_text(Widget),
+                                        Source = get_source(Widget),
                                         case filelib:ensure_dir(NewPath) of
                                             ok ->
                                                 case file:write_file(NewPath, Source) of
@@ -1013,16 +1020,41 @@ load(State = #s{frame = Frame, j = J}) ->
     % TODO: Extract the exact compiler version, load it, and use only that or fail if
     %       the specific version is unavailable.
     % TODO: Compile on load and verify the deployed hash for validity.
-    Title = J("Retrieve Contract Source"),
-    Label = J("Address Hash"),
-    case zxw_modal_text:show(Frame, Title, [{label, Label}]) of
+    Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Retrieve Contract Source")),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+    AddressSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Address Hash")}]),
+    AddressTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
+    _ = wxSizer:add(AddressSz, AddressTx, zxw:flags(wide)),
+    ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
+    Affirm = wxButton:new(Dialog, ?wxID_OK),
+    Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
+    _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
+    _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
+    _ = wxSizer:add(Sizer, AddressSz, zxw:flags(wide)),
+    _ = wxSizer:add(Sizer, ButtSz, zxw:flags(wide)),
+    ok = wxDialog:setSizer(Dialog, Sizer),
+    ok = wxBoxSizer:layout(Sizer),
+    ok = wxDialog:setSize(Dialog, {500, 200}),
+    ok = wxDialog:center(Dialog),
+    ok = wxTextCtrl:setFocus(AddressTx),
+    Choice =
+        case wxDialog:showModal(Dialog) of
+            ?wxID_OK ->
+                case wxTextCtrl:getValue(AddressTx) of
+                    "" -> cancel;
+                    A  -> {ok, A}
+                end;
+            ?wxID_CANCEL ->
+                cancel
+        end,
+    ok = wxDialog:destroy(Dialog),
+    case Choice of
         {ok, Address = "ct_" ++ _} -> load2(State, Address);
         {ok, Address = "th_" ++ _} -> load_from_tx(State, Address);
         {ok, Turd}                 -> handle_troubling(State, {bad_address, Turd});
         cancel                     -> State
     end.
 
-
 load_from_tx(State, Address) ->
     case hz:tx_info(Address) of
         {ok, #{"call_info" := #{"contract_id" := Contract}}} ->
@@ -1049,9 +1081,16 @@ load3(State = #s{tabs = TopBook, cons = {Consbook, Pages}, buttons = Buttons, j
     PageSz = wxBoxSizer:new(?wxVERTICAL),
     ProgSz = wxBoxSizer:new(?wxHORIZONTAL),
     CodeSz = wxStaticBoxSizer:new(?wxVERTICAL, Window, [{label, J("Contract Source")}]),
-    CodeTx = gd_sophia_editor:new(Window),
-    ok = gd_sophia_editor:set_text(CodeTx, Source),
-    ok = gd_sophia_editor:update(CodeTx),
+    CodeTxStyle = {style,     ?wxTE_MULTILINE
+                          bor ?wxTE_PROCESS_TAB
+                          bor ?wxTE_DONTWRAP
+                          bor ?wxTE_READONLY},
+    CodeTx = wxTextCtrl:new(Window, ?wxID_ANY, [CodeTxStyle]),
+    Mono = wxFont:new(10, ?wxMODERN, ?wxNORMAL, ?wxNORMAL, [{face, "Monospace"}]),
+    TextAt = wxTextAttr:new(),
+    ok = wxTextAttr:setFont(TextAt, Mono),
+    true = wxTextCtrl:setDefaultStyle(CodeTx, TextAt),
+    ok = set_source(CodeTx, Source),
     _ = wxSizer:add(CodeSz, CodeTx, zxw:flags(wide)),
     ScrollWin = wxScrolledWindow:new(Window),
     FunSz = wxStaticBoxSizer:new(?wxVERTICAL, ScrollWin, [{label, J("Function Interfaces")}]),
@@ -1061,19 +1100,22 @@ load3(State = #s{tabs = TopBook, cons = {Consbook, Pages}, buttons = Buttons, j
     ConsTxStyle = {style, ?wxTE_MULTILINE bor ?wxTE_READONLY},
     ConsTx = wxTextCtrl:new(Window, ?wxID_ANY, [ConsTxStyle]),
     _ = wxSizer:add(ConsSz, ConsTx, zxw:flags(wide)),
-    _ = wxSizer:add(ProgSz, CodeSz,    [{proportion, 3}, {flag, ?wxEXPAND}]),
+    _ = wxSizer:add(ProgSz, CodeSz,    [{proportion, 2}, {flag, ?wxEXPAND}]),
     _ = wxSizer:add(ProgSz, ScrollWin, [{proportion, 1}, {flag, ?wxEXPAND}]),
     _ = wxSizer:add(PageSz, ProgSz, [{proportion, 3}, {flag, ?wxEXPAND}]),
     _ = wxSizer:add(PageSz, ConsSz, [{proportion, 1}, {flag, ?wxEXPAND}]),
     {Out, IFaces, Build, NewButtons} =
         case compile(Source) of
             {ok, Output} ->
-                {aaci, _, Funs, _} = maps:get(aaci, Output),
+                ACI = maps:get(aci, Output),
+                AACI = {aaci, ContractName, Funs, NS} = hz:prepare_aaci(ACI),
+                Complete = maps:put(aaci, AACI, Output),
+                ok = tell(info, "Loading Contract: ~p", [ContractName]),
                 Callable = maps:remove("init", Funs),
                 tell(info, "Callable: ~p", [Callable]),
-                {NB, IFs} = fun_interfaces(ScrollWin, FunSz, Buttons, Callable, J),
-                O = io_lib:format("Compilation Succeeded!~n~tp~n~nDone!~n", [Output]),
-                {O, IFs, Output, NB};
+                {NB, IFs} = fun_interfaces(ScrollWin, FunSz, Buttons, Callable, NS, J),
+                O = io_lib:format("Compilation Succeeded!~n~tp~n~nDone!~n", [Complete]),
+                {O, IFs, Complete, NB};
             Other ->
                 O = io_lib:format("Compilation Failed!~n~tp~n", [Other]),
                 {O, [], none, Buttons}
@@ -1097,37 +1139,183 @@ get_arg({record, AFs}) ->
     get_record(AFs);
 get_arg({tuple, AFs}) ->
     list_to_tuple(lists:map(fun get_arg/1, AFs));
-get_arg({map, [Key, Value]}) ->
-    #{get_arg(Key) => get_arg(Value)};
-get_arg({variant, AFs, [VariantOne | _]}) ->
-    Elems = lists:map(fun get_arg/1, AFs),
-    list_to_tuple([VariantOne | Elems]);
 get_arg({_, TextCtrl}) ->
     wxTextCtrl:getValue(TextCtrl).
 
 get_record([{L, A} | T]) ->
     [{L, get_arg(A)} | get_record(T)].
 
-fun_interfaces(ScrollWin, FunSz, Buttons, Funs, J) ->
+find_main(ACI) ->
+    find_main(ACI, none, []).
+
+find_main([#{contract := I = #{kind := contract_interface}} | T], M, Is) ->
+    find_main(T, M, [I | Is]);
+find_main([#{contract := M = #{kind := contract_main}}      | T], _, Is) ->
+    find_main(T, M, Is);
+find_main([#{namespace := _} | T], M, Is) ->
+    find_main(T, M, Is);
+find_main([C | T], M, Is) ->
+    ok = tell("Surprising ACI element: ~p", [C]),
+    find_main(T, M, Is);
+find_main([], M, Is) ->
+    {M, Is}.
+
+fun_interfaces(ScrollWin, FunSz, Buttons, Funs, NS, J) ->
     MakeIface =
         fun(Name, {Args, _}) ->
+            tell(info, "Fun: ~p, Args: ~p", [Name, Args]),
             FunName = unicode:characters_to_list([Name, "/", integer_to_list(length(Args))]), 
-            FS = wxBoxSizer:new(?wxHORIZONTAL),
-            FLabel = wxStaticText:new(ScrollWin, ?wxID_ANY, FunName),
+            FN = wxStaticBoxSizer:new(?wxVERTICAL, ScrollWin, [{label, FunName}]),
+            GridSz = wxFlexGridSizer:new(2, 4, 4),
+            ok = wxFlexGridSizer:setFlexibleDirection(GridSz, ?wxHORIZONTAL),
+            ok = wxFlexGridSizer:addGrowableCol(GridSz, 1),
+            ArgFields = make_arg_fields(ScrollWin, GridSz, Args, NS, J),
+            ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
             CallBn = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Call")}]),
             DryRBn = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Dry Run")}]),
-            _ = wxBoxSizer:add(FS, FLabel, [{proportion, 1}, {flag, ?wxEXPAND}]),
-            _ = wxBoxSizer:add(FS, CallBn, [{proportion, 0}, {flag, ?wxEXPAND}]),
-            _ = wxBoxSizer:add(FS, DryRBn, [{proportion, 0}, {flag, ?wxEXPAND}]),
+            _ = wxBoxSizer:add(ButtSz, CallBn, zxw:flags(wide)),
+            _ = wxBoxSizer:add(ButtSz, DryRBn, zxw:flags(wide)),
             CallButton = #w{name = {Name, call}, id = wxButton:getId(CallBn), wx = CallBn},
             DryRButton = #w{name = {Name, dryr}, id = wxButton:getId(DryRBn), wx = DryRBn},
-            _ = wxSizer:add(FunSz, FS, zxw:flags(base)),
-            #f{name = Name, call = CallButton, dryrun = DryRButton, args = Args}
+            _ = wxStaticBoxSizer:add(FN, GridSz, zxw:flags(wide)),
+            _ = wxStaticBoxSizer:add(FN, ButtSz, zxw:flags(base)),
+            _ = wxSizer:add(FunSz, FN, zxw:flags(base)),
+            #f{name = Name, call = CallButton, dryrun = DryRButton, args = ArgFields}
         end,
     IFaces = maps:map(MakeIface, Funs),
+    tell(info, "IFaces: ~p", [IFaces]),
     NewButtons = maps:fold(fun map_iface_buttons/3, Buttons, IFaces),
     {NewButtons, IFaces}.
 
+% FIXME: This can be simplified and needs to provide better widgets for types.
+%    "variant" types should be wxChoice
+%    Booleans should either be wxChoice or check boxes
+%    The sizer expansion direction for vertical elements is stupid
+make_arg_fields(ScrollWin, GridSz, Args, NS, J) ->
+    MakeArgField =
+        fun
+            ({AN, {T, already_normalized, T}}) ->
+%               tell(info, "~p Arg: ~p, Type: ~p", [?LINE, AN, T]),
+                ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
+                TCT = wxTextCtrl:new(ScrollWin, ?wxID_ANY),
+                _ = wxFlexGridSizer:add(GridSz, ANT, fill()),
+                _ = wxFlexGridSizer:add(GridSz, TCT, fill()),
+                {T, TCT};
+            ({T, already_normalized, T}) ->
+%               tell(info, "~p Type: ~p", [?LINE, T]),
+                ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, atom_to_list(T)),
+                TCT = wxTextCtrl:new(ScrollWin, ?wxID_ANY),
+                _ = wxFlexGridSizer:add(GridSz, ANT, fill()),
+                _ = wxFlexGridSizer:add(GridSz, TCT, fill()),
+                {T, TCT};
+            ({AN, {_TypeName, T, T}}) ->
+%               tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, T]),
+                ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
+                TCT = wxTextCtrl:new(ScrollWin, ?wxID_ANY),
+                _ = wxFlexGridSizer:add(GridSz, ANT, fill()),
+                _ = wxFlexGridSizer:add(GridSz, TCT, fill()),
+                {T, TCT};
+            ({AN, {_TypeName, already_normalized, {record, InnerArgs}}}) ->
+%               tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, InnerArgs]),
+                ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
+                InnerSz = wxFlexGridSizer:new(2, 4, 4),
+                ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL),
+                ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1),
+                AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J),
+                _ = wxFlexGridSizer:add(GridSz, ANT, fill()),
+                _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()),
+                {record, AFs};
+            ({AN, {_TypeName, already_normalized, {tuple, InnerArgs}}}) ->
+%               tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, InnerArgs]),
+                ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
+                InnerSz = wxFlexGridSizer:new(2, 4, 4),
+                ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL),
+                ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1),
+                AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J),
+                _ = wxFlexGridSizer:add(GridSz, ANT, fill()),
+                _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()),
+                {tuple, AFs};
+            ({AN, {_TypeName, already_normalized, {list, InnerArgs}}}) ->
+%               tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, InnerArgs]),
+                ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
+                ArgSz = wxBoxSizer:new(?wxVERTICAL),
+                InnerSz = wxFlexGridSizer:new(2, 4, 4),
+                ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL),
+                ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1),
+                AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J),
+                B = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Add")}]),
+                AB = #w{name = {AN, add}, id = wxButton:getId(B), wx = B},
+                _ = wxBoxSizer:add(ArgSz, InnerSz, fill()),
+                _ = wxBoxSizer:add(ArgSz, B, fill()),
+                _ = wxFlexGridSizer:add(GridSz, ANT, fill()),
+                _ = wxFlexGridSizer:add(GridSz, ArgSz, fill()),
+                {list, AFs, AB};
+            ({AN, {_TypeName, already_normalized, T}}) ->
+%               tell(info, "~p Arg: ~p, ~p: ~p", [?LINE, AN, TypeName, T]),
+                ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
+                InnerSz = wxFlexGridSizer:new(2, 4, 4),
+                ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL),
+                ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1),
+                AFs = make_arg_fields(ScrollWin, InnerSz, T, NS, J),
+                _ = wxFlexGridSizer:add(GridSz, ANT, fill()),
+                _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()),
+                {tuple, AFs};
+            ({AN, {{tuple, _}, already_normalized, {tuple, InnerArgs}}}) ->
+%               tell(info, "~p Arg: ~p, Tuple: ~p", [?LINE, AN, InnerArgs]),
+                ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
+                InnerSz = wxFlexGridSizer:new(2, 4, 4),
+                ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL),
+                ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1),
+                AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J),
+                _ = wxFlexGridSizer:add(GridSz, ANT, fill()),
+                _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()),
+                {tuple, AFs};
+            ({AN, {{list, _}, already_normalized, {list, InnerArgs}}}) ->
+%               tell(info, "~p Arg: ~p, List: ~p", [?LINE, AN, InnerArgs]),
+                ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, AN),
+                ArgSz = wxBoxSizer:new(?wxHORIZONTAL),
+                InnerSz = wxFlexGridSizer:new(2, 4, 4),
+                ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL),
+                ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1),
+                AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J),
+                B = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Add")}]),
+                AB = #w{name = {AN, add}, id = wxButton:getId(B), wx = B},
+                _ = wxBoxSizer:add(ArgSz, InnerSz, fill()),
+                _ = wxBoxSizer:add(ArgSz, B, fill()),
+                _ = wxFlexGridSizer:add(GridSz, ANT, fill()),
+                _ = wxFlexGridSizer:add(GridSz, ArgSz, fill()),
+                {list, AFs, AB};
+            ({{tuple, _}, already_normalized, {tuple, InnerArgs}}) ->
+%               tell(info, "~p Tuple: ~p", [?LINE, InnerArgs]),
+                ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, "tuple"),
+                InnerSz = wxFlexGridSizer:new(2, 4, 4),
+                ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL),
+                ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1),
+                AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J),
+                _ = wxFlexGridSizer:add(GridSz, ANT, fill()),
+                _ = wxFlexGridSizer:add(GridSz, InnerSz, fill()),
+                {tuple, AFs};
+            ({{list, _}, already_normalized, {list, InnerArgs}}) ->
+%               tell(info, "~p List: ~p", [?LINE, InnerArgs]),
+                ANT = wxStaticText:new(ScrollWin, ?wxID_ANY, "list"),
+                ArgSz = wxBoxSizer:new(?wxHORIZONTAL),
+                InnerSz = wxFlexGridSizer:new(2, 4, 4),
+                ok = wxFlexGridSizer:setFlexibleDirection(InnerSz, ?wxHORIZONTAL),
+                ok = wxFlexGridSizer:addGrowableCol(InnerSz, 1),
+                AFs = make_arg_fields(ScrollWin, InnerSz, InnerArgs, NS, J),
+                B = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Add")}]),
+                AB = #w{name = {list, add}, id = wxButton:getId(B), wx = B},
+                _ = wxBoxSizer:add(ArgSz, InnerSz, [{proportion, 1}, {flag, ?wxEXPAND}]),
+                _ = wxBoxSizer:add(ArgSz, B, fill()),
+                _ = wxFlexGridSizer:add(GridSz, ANT, fill()),
+                _ = wxFlexGridSizer:add(GridSz, ArgSz, fill()),
+                {list, AFs, AB}
+        end,
+    lists:map(MakeArgField, Args).
+
+fill() ->
+    [{proportion, 0}, {flag, ?wxEXPAND}].
+
 
 map_iface_buttons(_, #f{call = C = #w{id = CID}, dryrun = D = #w{id = DID}}, A) ->
     maps:merge(#{CID => C, DID => D}, A);
@@ -1142,7 +1330,7 @@ edit(State = #s{cons = {Consbook, Pages}}) ->
         Index ->
             #c{code = CodeTx} = lists:nth(Index + 1, Pages),
             Address = wxNotebook:getPageText(Consbook, Index),
-            Source = gd_sophia_editor:get_text(CodeTx),
+            Source = wxTextCtrl:getValue(CodeTx),
             add_code_page(State, {hash, Address}, Source)
     end.
 
@@ -1171,16 +1359,7 @@ list_iface_buttons(#f{call = #w{id = CID}, dryrun = #w{id = DID}}, A) ->
 
 compile(Source) ->
     Options = sophia_options(),
-    case so_compiler:from_string(Source, Options) of
-        {ok, Build} ->
-            ACI = maps:get(aci, Build),
-            AACI = hz:prepare_aaci(ACI),
-            Complete = maps:put(aaci, AACI, Build),
-            {ok, Complete};
-        Other ->
-            Other
-    end.
-
+    so_compiler:from_string(Source, Options).
 
 sophia_options() ->
     [{aci, json}].

src/gd_v_wallman.erl

@@ -317,15 +317,41 @@ do_open2(Selected, State = #s{wallets = Wallets}) ->
     end.
 
 do_open3(Path, State = #s{frame = Frame, j = J}) ->
-    Title = J("Passphrase"),
-    case zxw_modal_text:show(Frame, Title, [{password, true}]) of
-        {ok, Phrase} ->
-            case gd_con:open_wallet(Path, Phrase) of
-                ok    -> do_close(State);
-                Error -> trouble(Error)
+    Label = J("Password"),
+    Dialog = wxDialog:new(Frame, ?wxID_ANY, Label),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+    PassSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, Label}]),
+    PassTx = wxTextCtrl:new(Dialog, ?wxID_ANY, [{style, ?wxTE_PASSWORD}]),
+    _ = wxStaticBoxSizer:add(PassSz, PassTx, zxw:flags(wide)),
+    ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
+    Affirm = wxButton:new(Dialog, ?wxID_OK),
+    _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
+    _ = wxBoxSizer:add(Sizer, PassSz, zxw:flags(base)),
+    _ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(wide)),
+    ok = wxDialog:setSizer(Dialog, Sizer),
+    ok = wxBoxSizer:layout(Sizer),
+    ok = wxDialog:setSize(Dialog, {500, 130}),
+    ok = wxDialog:center(Dialog),
+    ok = wxStyledTextCtrl:setFocus(PassTx),
+    case wxDialog:showModal(Dialog) of
+        ?wxID_OK ->
+            case wxTextCtrl:getValue(PassTx) of
+                "" ->
+                    ok = wxDialog:destroy(Dialog),
+                    ensure_shown(Frame);
+                Phrase ->
+                    ok = wxDialog:destroy(Dialog),
+                    case gd_con:open_wallet(Path, Phrase) of
+                        ok ->
+                            do_close(State);
+                        Error ->
+                            ok = ensure_shown(Frame),
+                            trouble(Error)
+                    end
             end;
-        cancel ->
-            ok
+        ?wxID_CANCEL ->
+            ok = wxDialog:destroy(Dialog),
+            ensure_shown(Frame)
     end.
 
 
@@ -512,15 +538,51 @@ do_import2(_, "", _, _) ->
     abort;
 do_import2(Dir, File, J, Frame) ->
     Path = filename:join(Dir, File),
-    Title   = J("Import Wallet"),
-    NameL   = J("Wallet Name"),
-    PassL   = J("Passphrase (leave blank if none)"),
-    OK_L    = J("OK"),
-    CancelL = J("Cancel"),
-    case gd_m_wallet_importer:show(Frame, Title, NameL, PassL, OK_L, CancelL) of
-        {ok, Name, Pass} -> gd_con:import_wallet(Name, Path, Pass);
-        cancel           -> abort
-    end.
+    Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Import Wallet")),
+    Sizer = wxBoxSizer:new(?wxVERTICAL),
+
+    NameSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Name")}]),
+    NameTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
+    _ = wxSizer:add(NameSz, NameTx, zxw:flags(wide)),
+    PassSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Passphrase")}]),
+    PassTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
+    _ = wxSizer:add(PassSz, PassTx, zxw:flags(wide)),
+
+    ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
+    Affirm = wxButton:new(Dialog, ?wxID_OK),
+    Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
+    _ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
+    _ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
+
+    _ = wxSizer:add(Sizer, NameSz, zxw:flags(base)),
+    _ = wxSizer:add(Sizer, PassSz, zxw:flags(base)),
+    _ = wxSizer:add(Sizer, ButtSz, zxw:flags(wide)),
+
+    ok = wxDialog:setSizer(Dialog, Sizer),
+    ok = wxBoxSizer:layout(Sizer),
+    ok = wxFrame:setSize(Dialog, {500, 200}),
+    ok = wxFrame:center(Dialog),
+    ok = wxStyledTextCtrl:setFocus(NameTx),
+
+    Result =
+        case wxDialog:showModal(Dialog) of
+            ?wxID_OK ->
+                Name =
+                    case wxTextCtrl:getValue(NameTx) of
+                        "" -> Path;
+                        N  -> N
+                    end,
+                Pass =
+                    case wxTextCtrl:getValue(PassTx) of
+                        "" -> none;
+                        P   -> P
+                    end,
+                gd_con:import_wallet(Name, Path, Pass);
+            ?wxID_CANCEL ->
+                abort
+        end,
+    ok = wxDialog:destroy(Dialog),
+    Result.
 
 
 do_drop(State = #s{picker = Picker}) ->

zomp.meta

@@ -2,11 +2,10 @@
 {type,gui}.
 {modules,[]}.
 {prefix,"gd"}.
-{author,"Craig Everett"}.
 {desc,"A desktop client for the Gajumaru network of blockchain networks"}.
+{author,"Craig Everett"}.
 {package_id,{"otpr","gajudesk",{0,8,0}}}.
-{deps,[{"otpr","zxwidgets",{1,1,0}},
-       {"otpr","hakuzaru",{0,7,0}},
+{deps,[{"otpr","hakuzaru",{0,7,0}},
        {"otpr","eblake2",{1,0,1}},
        {"otpr","base58",{0,1,1}},
        {"otpr","gmserialization",{0,1,3}},
@@ -14,7 +13,8 @@
        {"otpr","gmbytecode",{3,4,1}},
        {"otpr","lom",{1,0,0}},
        {"otpr","zj",{1,1,0}},
-       {"otpr","ec_utils",{1,0,0}}]}.
+       {"otpr","ec_utils",{1,0,0}},
+       {"otpr","zxwidgets",{1,0,1}}]}.
 {key_name,none}.
 {a_email,"craigeverett@qpq.swiss"}.
 {c_email,"info@qpq.swiss"}.