Merge pull request #18 from Divinil001/dev

Add extra_names label support

Author: nikitunkun

src/tonpy/abi/instance.py

@@ -86,8 +86,10 @@ def parse_getters(self, tvm: TVM, getters: List[int] = None) -> dict:
 
             for parser in parsers:
                 data = parser.parse_getters(tvm, self.tlb_sources)
-                if data:
+                if isinstance(data, dict):
                     result['abi_interfaces'].append(parser.name)
+                    if 'extra_names' in parser.instance['labels']:
+                        result['abi_interfaces'].extend(parser.instance['labels']['extra_names'])
                     result.update(data)
 
         return result
@@ -104,8 +106,10 @@ async def aparse_getters(self, tvm: TVM, getters: List[int] = None) -> dict:
 
             for parser in parsers:
                 data = await parser.aparse_getters(tvm, self.tlb_sources)
-                if data:
+                if isinstance(data, dict):
                     result['abi_interfaces'].append(parser.name)
+                    if 'extra_names' in parser.instance['labels']:
+                        result['abi_interfaces'].extend(parser.instance['labels']['extra_names'])
                     result.update(data)
 
         return result
@@ -121,8 +125,10 @@ def parse_getter_lazy(self, code_hash, get_tvm: Callable, getters: List[int] = N
 
             for parser in parsers:
                 data = parser.parse_getters(tvm, self.tlb_sources)
-                if data:
+                if isinstance(data, dict):
                     result['abi_interfaces'].append(parser.name)
+                    if 'extra_names' in parser.instance['labels']:
+                        result['abi_interfaces'].extend(parser.instance['labels']['extra_names'])
                     for key, value in data.items():
                         if key not in result:
                             result[key] = value
@@ -145,16 +151,20 @@ async def aparse_getter_lazy(self, code_hash, get_tvm: Callable, getters: List[i
             tvm = await get_tvm()
 
             for parser in parsers:
-                result['abi_interfaces'].append(parser.name)
-                for key, value in (await parser.aparse_getters(tvm, self.tlb_sources)).items():
-                    if key not in result:
-                        result[key] = value
-                    else:
-                        if result[key] is not None:
+                data = await parser.aparse_getters(tvm, self.tlb_sources)
+                if isinstance(data, dict):
+                    result['abi_interfaces'].append(parser.name)
+                    if 'extra_names' in parser.instance['labels']:
+                        result['abi_interfaces'].extend(parser.instance['labels']['extra_names'])
+                    for key, value in data.items():
+                        if key not in result:
                             result[key] = value
                         else:
-                            logger.warning(f"Got multiple not null answers for getter {key} in {parser.name}")
-                result.update()
+                            if result[key] is not None:
+                                result[key] = value
+                            else:
+                                logger.warning(f"Got multiple not null answers for getter {key} in {parser.name}")
+                    result.update()
 
         return result
 

src/tonpy/abi/interface.py

@@ -61,14 +61,14 @@ def parse_getters(self, tvm: TVM, tlb_sources):
                 tmp = getter.parse_getters(tvm, tlb_sources)
 
                 if tmp is None:
-                    return {}
+                    return None
 
                 for i in tmp:
                     result[f"{self.dton_parse_prefix}{i}"] = tmp[i]
 
             except Exception as e:
                 logger.warning(f"Can't parse {self.name}, (getter: {getter.method_name}): {e} {traceback.format_exc()}")
-                return {} # abi should work completely, with a result in each getter
+                return None # abi should work completely, with a result in each getter
 
         # parse storage too
         storage_parsed = self.parse_storage(tvm, tlb_sources)
@@ -86,14 +86,14 @@ async def aparse_getters(self, tvm: TVM, tlb_sources):
                 tmp = await getter.aparse_getters(tvm, tlb_sources)
 
                 if tmp is None:
-                    return {}
+                    return None
 
                 for i in tmp:
                     result[f"{self.dton_parse_prefix}{i}"] = tmp[i]
 
             except Exception as e:
                 logger.warning(f"Can't parse {self.name}, (getter: {getter.method_name}): {e} {traceback.format_exc()}")
-                return {} # abi should work completely, with a result in each getter
+                return None # abi should work completely, with a result in each getter
 
         # parse storage too
         storage_parsed = self.parse_storage(tvm, tlb_sources)