Merge pull request 'Add Mac arch detection (relatively naive)' (#7) from naive-arch2 into master

Reviewed-on: #7
Reviewed-by: Jarvis Carroll <jarviscarrol@qpq.swiss>

ebin/gajumine.app

@@ -3,6 +3,6 @@
               {registered,[]},
               {included_applications,[]},
               {applications,[stdlib,kernel]},
-              {vsn,"0.2.5"},
+              {vsn,"0.2.6"},
               {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.6").
 -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.6").
 -author("Craig Everett <craigeverett@qpq.swiss>").
 -copyright("QPQ AG <craigeverett@qpq.swiss>").
 -license("GPL-3.0-or-later").
@@ -205,7 +205,10 @@ do_start_stop(#s{acc = PubKey, keys = Keys, network = Network, max_cores = MaxCo
     {Fatness, Type} =
         case os:type() of
             {unix, linux} ->
-                {"mean", "generic"};
+                case Network of
+                    <<"mainnet">> -> {"mean", "avx2"};
+                    <<"testnet">> -> {"mean", "generic"}
+                end;
             {unix, darwin} ->
                 % Check memory. >7gb gets mean, <7gb gets lean
                 {"mean", "generic"};
@@ -213,7 +216,10 @@ do_start_stop(#s{acc = PubKey, keys = Keys, network = Network, max_cores = MaxCo
                 % Check memory. >7gb gets mean, <7gb gets lean
                 % Check avx2.
                 % Both should be provided by the F# start program
-                {"mean", "generic"}
+                case Network of
+                    <<"mainnet">> -> {"mean", "avx2.exe"};
+                    <<"testnet">> -> {"mean", "generic.exe"}
+                end
         end,
     Miner = filename:join(platform_dir(), unicode:characters_to_binary([Fatness, Bits, "-", Type])),
     Count = optimize_count(MaxCores, MaxMem),
@@ -264,8 +270,13 @@ platform_dir() ->
             {unix, linux} ->
                 "linux_x86_64";
             {unix, darwin} ->
-                % TODO: Check M2 vs x86
+                case erlang:system_info(system_architecture) of
-                "mac_m2";
+                    "aarch64-" ++ _ ->
+                        "mac_m2";
+                    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.6").
 -author("Craig Everett <craigeverett@qpq.swiss>").
 -copyright("QPQ AG <craigeverett@qpq.swiss>").
 -license("GPL-3.0-or-later").
@@ -18,15 +18,15 @@
 
 
 -record(s,
-        {wx      = none :: none | wx:wx_object(),
+        {wx      = none       :: none | wx:wx_object(),
-         frame   = none :: none | wx:wx_object(),
+         frame   = none       :: none | wx:wx_object(),
-         lang    = en   :: en | jp,
+         lang    = en         :: en | jp,
-         j       = none :: none | fun(),
+         j       = none       :: none | fun(),
-         net     = none :: none | wx:wx_object(),
+         net     = none       :: none | wx:wx_object(),
-         acc     = none :: none | wx:wx_object(),
+         acc     = none       :: none | wx:wx_object(),
-         keys    = none :: none | wx:wx_object(),
+         keys    = none       :: none | wx:wx_object(),
-         cores   = none :: none | wx:wx_object(),
+         cores   = 2          :: pos_integer(),
-         memory  = none :: none | wx:wx_object()}).
+         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.6").
 -author("Craig Everett <craigeverett@qpq.swiss>").
 -copyright("QPQ AG <craigeverett@qpq.swiss>").
 -license("GPL-3.0-or-later").

src/gmc_sup.erl

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

zomp.meta

@@ -2,9 +2,9 @@
 {type,gui}.
 {modules,[]}.
 {prefix,"gmc"}.
-{author,"Craig Everett"}.
 {desc,"Mining client for the Gajumaru Root"}.
-{package_id,{"qpq","gajumine",{0,2,5}}}.
+{author,"Craig Everett"}.
+{package_id,{"qpq","gajumine",{0,2,6}}}.
 {deps,[{"uwiger","gmhive_client",{0,4,4}},
        {"uwiger","gmcuckoo",{1,2,3}},
        {"qpq","cuckoo_cpu",{0,3,0}},