Merge pull request 'Fix mac path' (#9) from mac-path into master

Reviewed-on: #9

ebin/gajumine.app

@@ -3,6 +3,6 @@
               {registered,[]},
               {included_applications,[]},
               {applications,[stdlib,kernel]},
-              {vsn,"0.2.5"},
+              {vsn,"0.2.8"},
               {modules,[gajumine,gmc_con,gmc_conf,gmc_gui,gmc_sup]},
               {mod,{gajumine,[]}}]}.

src/gajumine.erl

@@ -3,7 +3,7 @@
 %%% @end
 
 -module(gajumine).
--vsn("0.2.5").
+-vsn("0.2.8").
 -behavior(application).
 -author("Craig Everett <craigeverett@qpq.swiss>").
 -copyright("QPQ AG <craigeverett@qpq.swiss>").

src/gmc_con.erl

@@ -3,7 +3,7 @@
 %%% @end
 
 -module(gmc_con).
--vsn("0.2.5").
+-vsn("0.2.8").
 -author("Craig Everett <craigeverett@qpq.swiss>").
 -copyright("QPQ AG <craigeverett@qpq.swiss>").
 -license("GPL-3.0-or-later").
@@ -101,16 +101,28 @@ start_link() ->
 
 init(none) ->
     ok = log(info, "Starting"),
+    {AProcs, AMem} = proc_mem(),
+    TwoMaps = default_spec(mem) * 2,
+    RProcs =
+        case AProcs >= 2 of
+            true  -> 2;
+            false -> 1
+        end,
+    RMem =
+        case AMem >= TwoMaps of
+            true  -> TwoMaps;
+            false -> default_spec(mem)
+        end,
     {Acc, Keys, Network, MaxCores, MaxMem} =
         case read_conf() of
             {ok, C} ->
                 {maps:get(account,   C, none),
                  maps:get(keys,      C, []),
                  maps:get(network,   C, <<"mainnet">>),
-                 maps:get(max_cores, C, 2),
-                 maps:get(max_mem,   C, 3550722201)};
+                 maps:get(max_cores, C, RProcs),
+                 maps:get(max_mem,   C, RMem)};
             none ->
-                {none, [], <<"mainnet">>, 2, 3550722201}
+                {none, [], <<"mainnet">>, RProcs, RMem}
         end,
     State = #s{network = Network, acc = Acc, keys = Keys, max_cores = MaxCores, max_mem = MaxMem},
     {ok, start_gui(State)}.
@@ -217,7 +229,8 @@ do_start_stop(#s{acc = PubKey, keys = Keys, network = Network, max_cores = MaxCo
                 % Check avx2.
                 % Both should be provided by the F# start program
                 case Network of
-                    <<"mainnet">> -> {"mean", "avx2.exe"};
+%                   <<"mainnet">> -> {"mean", "avx2.exe"};
+                    <<"mainnet">> -> {"mean", "generic.exe"};
                     <<"testnet">> -> {"mean", "generic.exe"}
                 end
         end,
@@ -252,7 +265,7 @@ optimize_count(MaxC, MaxM) ->
     MaxMem = max(MapSize, MaxM),
     {Procs, Memory} = proc_mem(),
     MeanMaps = min(MaxMem, Memory) div MapSize,
-    Recommended = min(MaxCores, max(min(Procs, MeanMaps) - 1, 1)),
+    Recommended = min(MaxCores, min(Procs, MeanMaps)),
     Notice = fun(F, A) -> gmc_gui:message({notice, io_lib:format(F, A)}) end,
     ok = Notice("Physical Processors: ~p", [Procs]),
     ok = Notice("Physical Memory: ~p", [Memory]),
@@ -270,8 +283,13 @@ platform_dir() ->
             {unix, linux} ->
                 "linux_x86_64";
             {unix, darwin} ->
-                % TODO: Check M2 vs x86
-                "mac_m2";
+                case erlang:system_info(system_architecture) of
+                    "aarch64-" ++ _ ->
+                        "mac_arm64";
+                    Other ->
+                        ok = log(info, "system_architecture: ~p", [Other]),
+                        "mac_x86_64"
+                end;
             {win32, nt} ->
                 "win_x86_64"
         end,

src/gmc_conf.erl

@@ -3,7 +3,7 @@
 %%% @end
 
 -module(gmc_conf).
--vsn("0.2.5").
+-vsn("0.2.8").
 -author("Craig Everett <craigeverett@qpq.swiss>").
 -copyright("QPQ AG <craigeverett@qpq.swiss>").
 -license("GPL-3.0-or-later").
@@ -25,8 +25,8 @@
          net     = none       :: none | wx:wx_object(),
          acc     = none       :: none | wx:wx_object(),
          keys    = none       :: none | wx:wx_object(),
-         cores   = none :: none | wx:wx_object(),
-         memory  = none :: none | wx:wx_object()}).
+         cores   = 2          :: pos_integer(),
+         memory  = 3550722201 :: pos_integer()}).
 
 
 
@@ -213,16 +213,16 @@ done(State = #s{net = Network, acc = AccTx, keys = KeysTx, cores = CoresTx, memo
     buh_bye(State).
 
 cores("") ->
-    none;
+    2;
 cores(CoreS) ->
     try
         list_to_integer(CoreS)
     catch
-        _:_ -> none
+        _:_ -> 2
     end.
 
 bytes("") ->
-    none;
+    3550722201;
 bytes(GigsS) ->
     try
         list_to_integer(GigsS) * gig()
@@ -231,7 +231,7 @@ bytes(GigsS) ->
             try
                 trunc(list_to_float(GigsS) * gig())
             catch
-                _:_ -> none
+                _:_ -> 3550722201
             end
     end.
 

src/gmc_gui.erl

@@ -3,7 +3,7 @@
 %%% @end
 
 -module(gmc_gui).
--vsn("0.2.5").
+-vsn("0.2.8").
 -author("Craig Everett <craigeverett@qpq.swiss>").
 -copyright("QPQ AG <craigeverett@qpq.swiss>").
 -license("GPL-3.0-or-later").
@@ -277,7 +277,7 @@ do_message({pool_notification, #{info := #{msg := MSG}}}, State = #s{height = He
             ok = wxStaticText:setLabel(CandT, Candidate),
             State;
         #{solution_accepted := #{seq := Seq}} ->
-            Entry = io_lib:format("~nSolution Accepted! You solved one! Sequence: ~w", [Seq]),
+            Entry = io_lib:format("~nThe hive has produced a solution! Sequence: ~w", [Seq]),
             do_message2(Entry, State);
         Other ->
             Entry = io_lib:format("~nUnexpected 'pool_notification': ~tp", [Other]),

src/gmc_sup.erl

@@ -12,7 +12,7 @@
 %%% @end
 
 -module(gmc_sup).
--vsn("0.2.5").
+-vsn("0.2.8").
 -behaviour(supervisor).
 -author("Craig Everett <craigeverett@qpq.swiss>").
 -copyright("QPQ AG <craigeverett@qpq.swiss>").

zomp.meta

@@ -4,11 +4,11 @@
 {prefix,"gmc"}.
 {author,"Craig Everett"}.
 {desc,"Mining client for the Gajumaru Root"}.
-{package_id,{"qpq","gajumine",{0,2,5}}}.
-{deps,[{"uwiger","gmhive_client",{0,4,4}},
+{package_id,{"qpq","gajumine",{0,2,8}}}.
+{deps,[{"uwiger","gmhive_worker",{0,4,0}},
+       {"qpq","cuckoo_cpu",{0,3,1}},
+       {"uwiger","gmhive_client",{0,4,4}},
        {"uwiger","gmcuckoo",{1,2,3}},
-       {"qpq","cuckoo_cpu",{0,3,0}},
-       {"uwiger","gmhive_worker",{0,3,0}},
        {"uwiger","gmconfig",{0,1,2}},
        {"uwiger","gproc",{1,0,1}},
        {"uwiger","gmhive_protocol",{0,1,1}},