new staking refactor

Author: latentvector

commune/__init__.py

@@ -2,6 +2,11 @@
 from .module import Module
 c = Block = Lego = M = Module  # alias c.Module as c.Block, c.Lego, c.M
 from .cli import cli
+from .vali.vali import Vali
+from .tree.tree import Tree
+from .client.client import Client
+from .server.server import Server
+from .namespace import Namespace
 # import sys
 # sys.path += [c.pwd()]
 

commune/client/client.py

@@ -389,7 +389,7 @@ def test(self, module='module::test_client'):
 
         info = c.call(module+'/info')
         key  = c.get_key(module)
-        assert info['ss58_address'] == key.ss58_address
+        assert info['key'] == key.ss58_address
         return {'info': info, 'key': str(key)}
 
     def __del__(self):

commune/key/key.md

@@ -17,7 +17,7 @@ key already exists at alice
 '943fb89150a67192919a43004f87685faba470e754fe4ff0af6a93e7fc54dc0a6cceb6fbc29d610d5486ba78969f609ea83753fb9e32d58df0c67f13
 dfcbbd68',
     'mnemonic': 'quantum belt rival casual benefit obscure sight wool pupil jaguar guide mango',
-    'ss58_address': '5EtMr6n6APFay8FFdhhP9sMPwvv1Nfcm5yxiRTxviHH4WVZg'
+    'key': '5EtMr6n6APFay8FFdhhP9sMPwvv1Nfcm5yxiRTxviHH4WVZg'
 }
 Now this generates a random key and if you want to save it to a file you can do so like this.
 
@@ -43,7 +43,7 @@ c add_key alice
 c29d610d5486ba78969f609ea83753fb9e32d58df0c67f13dfcbbd68',
     'mnemonic': 'quantum belt rival casual benefit obscure sight wool 
 pupil jaguar guide mango',
-    'ss58_address': '5EtMr6n6APFay8FFdhhP9sMPwvv1Nfcm5yxiRTxviHH4WVZg'
+    'key': '5EtMr6n6APFay8FFdhhP9sMPwvv1Nfcm5yxiRTxviHH4WVZg'
 }
 
 

commune/key/key.py

@@ -106,7 +106,7 @@ def __init__(self,
             private_key = key.__dict__.get('private_key', private_key)
             crypto_type = key.__dict__.get('crypto_type', crypto_type)
             derive_path = key.__dict__.get('derive_path', derive_path)
-            ss58_address = key.__dict__.get('ss58_address', ss58_address)
+            ss58_address = key.__dict__.get('key', ss58_address)
             path = key.__dict__.get('path', path)
             public_key = key.__dict__.get('public_key', public_key)
             ss58_format = key.__dict__.get('ss58_format', ss58_format)
@@ -316,7 +316,7 @@ def get_key(cls,
         if not cls.key_exists(path):
             if create_if_not_exists:
                 key = cls.add_key(path, **kwargs)
-                c.print(f'key does not exist, generating new key -> {key["ss58_address"]}')
+                c.print(f'key does not exist, generating new key -> {key["key"]}')
             else:
                 raise ValueError(f'key does not exist at --> {path}')
 
@@ -547,7 +547,7 @@ def to_json(self, password: str = None ) -> dict:
                 if password != None:
                     state_dict[k] = self.encrypt(data=state_dict[k], password=password)
         if '_ss58_address' in state_dict:
-            state_dict['ss58_address'] = state_dict.pop('_ss58_address')
+            state_dict['key'] = state_dict.pop('_ss58_address')
         state_dict = json.dumps(state_dict)
 
         return state_dict
@@ -562,8 +562,8 @@ def from_json(cls, obj: Union[str, dict], password: str = None) -> dict:
         for k,v in obj.items():
             if cls.is_encrypted(obj[k]) and password != None:
                 obj[k] = cls.decrypt(data=obj[k], password=password)
-        if 'ss58_address' in obj:
-            obj['_ss58_address'] = obj.pop('ss58_address')
+        if 'key' in obj:
+            obj['_ss58_address'] = obj.pop('key')
         return  cls(**obj)
 
     @classmethod

commune/module/module.py

@@ -122,16 +122,12 @@ def key(self):
     def key(self, key: 'Key'):
         self._key = c.get_key(key, create_if_not_exists=True)
         return self._key
-    
     @classmethod
     def call(cls, *args, **kwargs) -> None:
         return c.module('client').call( *args, **kwargs)
-
     @classmethod
     async def async_call(cls, *args,**kwargs):
         return c.call(*args, **kwargs)
-
-
     @classmethod
     def call_search(cls,*args, **kwargs) -> None:
         return c.m('client').call_search(*args, **kwargs)
@@ -1407,10 +1403,15 @@ def search_dict(self, d:dict = 'k,d', search:str = {'k.d': 1}) -> dict:
 
 
 
+    @classmethod
+    def tree(cls, *args, **kwargs) -> List[str]:
+        return c.module('tree').tree(*args,  **kwargs) 
+    
     @classmethod
     def tree(cls, *args, **kwargs) -> List[str]:
         return c.module('tree').tree(*args,  **kwargs) 
 
+
     @classmethod
     def tree2path(cls, *args, **kwargs) -> List[str]:
         return c.module('tree').tree2path( *args, **kwargs)
@@ -1466,10 +1467,13 @@ def simple2path(cls, path:str, **kwargs) -> str:
 
     @classmethod
     def simple2objectpath(cls, path:str,path2objectpath = {'tree': 'commune.tree.tree.Tree'}, **kwargs) -> str:
+        
+        
         if path in path2objectpath:
             object_path =  path2objectpath[path]
         else:
             object_path =  c.module('tree').simple2objectpath(path, **kwargs)
+
         return object_path
     @classmethod
     def simple2object(cls, path:str, **kwargs) -> str:
@@ -1541,10 +1545,6 @@ def has_config(cls) -> bool:
     @classmethod
     def has_module(cls, module):
         return module in c.modules()
-        
-    @classmethod
-    def Vali(cls, *args, **kwargs):
-        return c.module('vali')
 
     @classmethod
     def tasks(cls, task = None, mode='pm2',**kwargs) -> List[str]:
@@ -2492,7 +2492,9 @@ def serve(cls,
                     'name': name, 
                     'address':address, 
                     'kwargs':kwargs
-                    }        
+                    } 
+
+        c.print(module, name)       
         module_class = c.module(module)
 
         kwargs.update(extra_kwargs)
@@ -2584,7 +2586,7 @@ def dummy_gen(cls):
     def info(self , 
              module = None,
              features = ['schema', 'namespace', 'commit_hash', 'hardware','attributes','functions'], 
-             lite_features = ['name', 'address', 'schema', 'ss58_address', 'description'],
+             lite_features = ['name', 'address', 'schema', 'key', 'description'],
              lite = True,
              cost = False,
              **kwargs
@@ -2619,8 +2621,8 @@ def info(self ,
             info['path'] = self.module_path() # get the path of the module
         if 'address' in features:
             info['address'] = self.address.replace(c.default_ip, c.ip(update=False))
-        if 'ss58_address' in features:    
-            info['ss58_address'] = self.key.ss58_address
+        if 'key' in features:    
+            info['key'] = self.key.ss58_address
         if 'code_hash' in features:
             info['code_hash'] = self.chash() # get the hash of the module (code)
         if 'commit_hash' in features:
@@ -3122,8 +3124,8 @@ def transfer_multiple(cls, *args, **kwargs):
 
 
     @classmethod
-    def transfer_stake(cls, *args, **kwargs):
-        return c.module('subspace')().transfer_stake(*args, **kwargs)   
+    def stake_transfer(cls, *args, **kwargs):
+        return c.module('subspace')().stake_transfer(*args, **kwargs)   
 
 
     @classmethod
@@ -7012,7 +7014,7 @@ def load_ticket(self, key=None, **kwargs):
     @classmethod
     def verify_ticket(cls, *args, **kwargs):
 
-        return c.get_key().verify_ticket(*args, **kwargs)
+        return c.module('ticket').verify_ticket(*args, **kwargs)
 
     @classmethod
     def load_style(cls):

commune/namespace.py

@@ -258,7 +258,7 @@ def add_servers(cls, *servers, network:str='local', **kwargs):
         return responses
 
     @classmethod
-    def infos(cls, search=None, network=network, servers=None, features=['ss58_address', 'address', 'name'],   update:str=True, batch_size = 10, timeout=20, hardware=True, namespace=True, schema=True) -> List[str]:
+    def infos(cls, search=None, network=network, servers=None, features=['key', 'address', 'name'],   update:str=True, batch_size = 10, timeout=20, hardware=True, namespace=True, schema=True) -> List[str]:
         path = f'infos/{network}'
         if not update:
             infos = cls.get(path, [])

commune/remote/peer.py

@@ -191,12 +191,12 @@ def n_servers(self):
     @classmethod
     def peer2key(cls, search=None, network:str='remote', update=False):
         infos = c.infos(search=search, network=network, update=update)
-        return {v['name']:v['ss58_address'] for v in infos if 'name' in v and 'address' in v}
+        return {v['name']:v['key'] for v in infos if 'name' in v and 'address' in v}
 
     @classmethod
     def peer_addresses(cls, network:str='remote'):
         infos = c.infos(network=network)
-        return {info['ss58_address'] for info in infos if 'ss58_address' in info}
+        return {info['key'] for info in infos if 'key' in info}
 
     def check_peers(self, timeout=10):
         futures = []
@@ -266,7 +266,7 @@ def addresses(self, search=None, network='remote'):
         return c.addresses(search=search, network=network)
 
     def keys(self):
-        return [info.get('ss58_address', None)for info in self.infos()]
+        return [info.get('key', None)for info in self.infos()]
 
     @classmethod
     def infos(self, search='module',  network='remote', update=False):

commune/server/test.py

@@ -43,7 +43,7 @@ def test_serving_with_different_key(cls, module_name = 'storage::test', key_name
         module = c.connect(module_name)
         info = module.info()
 
-        assert info['ss58_address'] == key.ss58_address, f"key failed {key.ss58_address} != {info['ss58_address']}"
+        assert info['key'] == key.ss58_address, f"key failed {key.ss58_address} != {info['key']}"
         c.kill(module_name)
 
         c.rm_key(key_name)

commune/subspace/app.py

@@ -382,7 +382,7 @@ def get_state():
         # st.write(self.state['stake_to'][self.netuid])
         stake_to = self.state['stake_to'][self.netuid].get(self.key.ss58_address)
         self.key_info = {
-            'ss58_address': self.key.ss58_address,
+            'key': self.key.ss58_address,
             'balance': self.state['balances'].get(self.key.ss58_address,0),
             'stake_to': self.state['stake_to'][self.netuid].get(self.key.ss58_address,{}),
             'stake': sum([v[1] for v in stake_to]) if stake_to != None else {},