Merge branch 'master' into mainnet

freenetcoder · Jun 11, 2020 · fb24bfc · fb24bfc
2 parents ba1e4a2 + 8b45a30
commit fb24bfc
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/docs/media/XGM_for_black_background.png b/docs/media/XGM_for_black_background.png
diff --git a/docs/media/XGM_for_white_background.png b/docs/media/XGM_for_white_background.png
diff --git a/docs/media/XGM_logo.png b/docs/media/XGM_logo.png
diff --git a/docs/media/main.jpg b/docs/media/main.jpg
diff --git a/docs/media/readme.md b/docs/media/readme.md
@@ -0,0 +1 @@
+
diff --git a/explorer/explorer_node.cpp b/explorer/explorer_node.cpp
@@ -181,7 +181,7 @@ bool parse_cmdline(int argc, char* argv[], Options& o) {
             }
         }
 
-        getRulesOptions(vm);
+        getRulesOptions(vm); //todo for assetchains
 
         return true;
     }

diff --git a/utility/cli/options.cpp b/utility/cli/options.cpp
@@ -409,16 +409,6 @@ namespace grimm
             }
         }
 
-        getRulesOptions(vm);
-
-        return vm;
-    }
-
-    void getRulesOptions(po::variables_map& vm)
-    {
-        #define THE_MACRO(type, name, comment) Rules::get().name = vm[#name].as<type>();
-        RulesParams(THE_MACRO);
-        #undef THE_MACRO
         Rules::get().Emission.Value0 = vm[cli::CAC_EMISSION_BLOCK].as<Amount>();
         Rules::get().Emission.Premine = vm[cli::CAC_PREMINE].as<Amount>();
         Rules::get().Emission.Drop0 = vm[cli::CAC_EMISSION_DROP0].as<Amount>();
@@ -440,9 +430,16 @@ namespace grimm
         Rules::get().CA.Enabled = vm[cli::ASSET_ENABLE].as<bool>();
         Rules::get().CA.Deposit = vm[cli::ASSET_EXCHANGE].as<bool>();
 
-      //  Rules::get().isGrimmPOW = vm[cli::CAC_GRIMMPOW].as<bool>();
-      //  add other params
+        getRulesOptions(vm);
 
+        return vm;
+    }
+
+    void getRulesOptions(po::variables_map& vm)
+    {
+        #define THE_MACRO(type, name, comment) Rules::get().name = vm[#name].as<type>();
+        RulesParams(THE_MACRO);
+        #undef THE_MACRO
     }
 
     int getLogLevel(const std::string &dstLog, const po::variables_map& vm, int defaultValue)

diff --git a/wallet/api_cli.cpp b/wallet/api_cli.cpp
@@ -1058,7 +1058,7 @@ int main(int argc, char* argv[])
 
             vm.notify();
 
-            getRulesOptions(vm);
+            getRulesOptions(vm); //todo for assetchain
 
             Rules::get().UpdateChecksum();
             LOG_INFO() << "Grimm Wallet API " << PROJECT_VERSION << " (" << BRANCH_NAME << ")";