finally! abolishing private key property

komrade/backend/keymaker.py

@@ -590,24 +590,7 @@ class Keymaker(Logger):
         if passphrase: self.passphrase=passphrase
 
         self._keychain = _keychain = {**extra_keys}
-        # self.log('_keychain at start of keychain() =',_keychain)
-        
-        # # am I a builtin one?
-        # # self.log('hello///',self.name,self.name in BUILTIN_KEYCHAIN)
-        # if hasattr(self,'allow_builtin'):
-        #     allow_builtin = allow_builtin and self.allow_builtin
-
-        # if self.name in BUILTIN_KEYCHAIN and allow_builtin:
-        #     self.log('??',_keychain)
-            
-        #     # if self.name!=OPERATOR_NAME:
-        #     for k,v in BUILTIN_KEYCHAIN[self.name].items():
-        #         _keychain[k]=v
-        #     self.log('??',_keychain)
-        #     # stop
-        
-        # self.log('_keychain',_keychain)
-        # stop
+        self.log('_keychain at start of keychain() =',_keychain)
         
         for keyname in keys_to_gen:
             # self.log('??',keyname,'...')

komrade/backend/the_operator.py

@@ -63,8 +63,8 @@ class TheOperator(Operator):
                 self.log('phone_pubkey_decr',phone_pubkey_decr)
 
                 # get phone pubkey
-                new_phone_keychain = self.phone.keychain(extra_keys={'pubkey_decr':phone_pubkey_decr})
-                new_op_keychain = self.keychain(extra_keys={'privkey_decr':my_privkey_decr})
+                new_phone_keychain = self.phone.keychain(extra_keys={'pubkey_decr':phone_pubkey_decr},force=True)
+                new_op_keychain = self.keychain(extra_keys={'privkey_decr':my_privkey_decr},force=True)
 
                 PHONE_PUBKEY = new_phone_keychain.get('pubkey')
                 MY_PRIVKEY = new_op_keychain.get('privkey')