gui_mod::entropy update

arrayio · Mar 12, 2019 · d61a6fe · d61a6fe
1 parent 4979246
commit d61a6fe
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/keychain_cmd_app/cmd_parser.cpp b/keychain_cmd_app/cmd_parser.cpp
@@ -118,8 +118,8 @@ int cmd_parser::run(int argc, const char* const argv[])
   auto it = keyfiles.begin();
   if ( it==keyfiles.end() )
   {
-    auto user_entropy = keychain_ref.entropy();
-    std::string keyname = "master_key";
+    auto res = keychain_ref.entropy();
+    /*std::string keyname = "master_key";
     std::string pass = "blank";
     keyfiles.create(std::bind(create_new_keyfile,
             keyname, keyname, true, keyfile_format::cipher_etype::aes256,
@@ -129,7 +129,7 @@ int cmd_parser::run(int argc, const char* const argv[])
       std::copy(pass.begin(), pass.end(), std::back_inserter(res));
       return res;
       })
-      );
+      );*/
   }
 
   keychain_invoke_f f = std::bind(&keychain_base::operator(), &keychain_ref, std::placeholders::_1);

diff --git a/keychain_cmd_app/gui_mod.cpp b/keychain_cmd_app/gui_mod.cpp
@@ -21,8 +21,7 @@ dev::Public gui_mod_dummy::select_key() const
   return it->keyinfo.public_key;
 }
 
-dev::bytes gui_mod_dummy::entropy() const
+bool gui_mod_dummy::entropy() const
 {
-  dev::bytes value;
-  return value;
+  return true;
 }
diff --git a/keychain_cmd_app/gui_mod.hpp b/keychain_cmd_app/gui_mod.hpp
@@ -15,7 +15,7 @@ class gui_mod_dummy: public gui_mod_base
   gui_mod_dummy();
   virtual ~gui_mod_dummy();
   virtual dev::Public select_key() const override;
-  virtual dev::bytes entropy() const override;
+  virtual bool entropy() const override;
 };
 
 }
diff --git a/keychain_lib/include/keychain_lib/keychain.hpp b/keychain_lib/include/keychain_lib/keychain.hpp
@@ -39,7 +39,7 @@ class gui_mod_base
   virtual ~gui_mod_base(){}
 
   virtual dev::Public select_key() const = 0;
-  virtual dev::bytes entropy() const = 0;
+  virtual bool entropy() const = 0;
   virtual void connect(keychain_base& keychain_) const;
 };
 

diff --git a/keychain_lib/include/keychain_lib/keychain_commands.hpp b/keychain_lib/include/keychain_lib/keychain_commands.hpp
@@ -161,7 +161,7 @@ class keychain_base
   virtual std::string operator()(const fc_light::variant& command) = 0;
   boost::signals2::signal<std::string(const std::string&)> run_secmod_cmd;
   boost::signals2::signal<dev::Public(void)> select_key;
-  boost::signals2::signal<dev::bytes(void)> entropy;
+  boost::signals2::signal<bool(void)> entropy;
 
   dev::Secret get_private_key(const dev::Public& public_key, int unlock_time, create_secmod_cmd_f&& f, std::string& cmd);
   void lock_all_priv_keys();

diff --git a/keychain_lib/include/keychain_lib/keyfile_singleton.hpp b/keychain_lib/include/keychain_lib/keyfile_singleton.hpp
@@ -186,6 +186,7 @@ class keyfile_singleton
   void flush_keyfile(const second_key_type& key) const;
 //  void flush_logrecords(const prim_key_type& key) const;
   void flush_all() const;
+  std::string seed_phrase(dev::bytes&);
 };
 
 using get_password_create_f = std::function<byte_seq_t(const std::string&)>; //NOTE: may incapsulate call to sec module or just return password string

diff --git a/keychain_lib/src/keyfile_singleton.cpp b/keychain_lib/src/keyfile_singleton.cpp
@@ -454,6 +454,13 @@ keyfile_format::keyfile_t keychain_app::create_new_keyfile(
   return keyfile;
 }
 
+std::string keyfile_singleton::seed_phrase(dev::bytes& entropy)
+{
+    std::string phrase  = "witch collapse practice feed shame open despair creek road again ice least";
+
+    return seed_phrase;
+}
+
 bool keychain_app::remove_unlock(const keyfile_format::keyfile_t& keyfile, get_password_f&& get_passwd)
 {
   try {