Merge branch 'release/1.4.3'

.changes/1.4.3.json

@@ -0,0 +1,6 @@
+[
+  {
+    "description": "Improve caching significantly",
+    "type": "patch"
+  }
+]

AUTHORS

@@ -1,4 +1,4 @@
-   798	Fabian Schuh <[email protected]>
+   806	Fabian Schuh <[email protected]>
    167	Fabian Schuh <[email protected]>
    104	Vladimir Kamarzin <[email protected]>
    100	Fabian Schuh <[email protected]>

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 Note: version releases in the 0.x.y range may introduce breaking changes.
 
+## 1.4.3
+
+- patch: Improve caching significantly
+
 ## 1.4.2
 
 - patch: Do not break backwards compatibility on ObjectCache

grapheneapi/api.py

@@ -39,15 +39,19 @@ def __init__(self, urls, user=None, password=None, connect=True, **kwargs):
         # Let's also be able to deal with infinite connection
         self.urls = cycle(urls)
         self._cnt_retries = 0
+        self._network = None
 
         # Connect!
         if connect:
             self.connect()
+            self._network = self.get_network()
 
     # Get chain parameters
     @property
     def chain_params(self):
-        return self.get_network()
+        if self._network is None:
+            self._network = self.get_network()
+        return self._network
 
     def get_network(self):
         return self.get_chain_properties()

graphenecommon/account.py

@@ -60,6 +60,7 @@ def refresh(self):
         if not account:
             raise AccountDoesNotExistsException(self.identifier)
         self.store(account, "name")
+        self.store(account, "id")
 
         if self.full:  # pragma: no cover
             accounts = self.blockchain.rpc.get_full_accounts([account["id"]], False)

graphenecommon/blockchainobject.py

@@ -222,7 +222,7 @@ def store(self, data, key="id"):
             :param list data: List of objects to cache
         """
         dict.__init__(self, data)
-        self._store_item(key)
+        self._store_item(data[key])
 
     @classmethod
     def cache_object(cls, data, key=None):

graphenecommon/chain.py

@@ -228,7 +228,7 @@ def finalizeOp(self, ops, account, permission, **kwargs):
         elif self.bundle:
             # In case we want to add more ops to the tx (bundle)
             self.txbuffer.appendSigner(account, permission)
-            return self.txbuffer.json()
+            return self.txbuffer
         else:
             # default behavior: sign + broadcast
             self.txbuffer.appendSigner(account, permission)

graphenecommon/transactionbuilder.py

@@ -36,7 +36,7 @@ def __init__(
         proposal_review=None,
         parent=None,
         *args,
-        **kwargs
+        **kwargs,
     ):
         self.define_classes()
         assert self.operation_class

setup.py

@@ -3,7 +3,7 @@
 
 from setuptools import setup
 
-__version__ = "1.4.2"
+__version__ = "1.4.3"
 URL = "https://github.com/xeroc/python-graphenelib"
 
 setup(

tests/test_api.py

@@ -2,7 +2,7 @@
 import unittest
 from .fixtures import Api, Websocket, Http, exceptions
 
-urls = ["wss://node.bitshares.eu", "https://eu.nodes.bitshares.ws"]
+urls = ["wss://eu.nodes.bitshares.ws", "https://eu.nodes.bitshares.ws"]
 
 
 class Testcases(unittest.TestCase):
@@ -49,7 +49,7 @@ def test_raise_rpc_error_wss(self):
         api.connection.disconnect()
         api.connection.disconnect()
 
-    #def test_raise_rpc_error_https(self):
+    # def test_raise_rpc_error_https(self):
     #    api = Api(urls[1], num_retries=1)
     #    with self.assertRaises(exceptions.RPCError):
     #        api.get_SOMETHING(["2.8.0"])
@@ -59,5 +59,5 @@ def test_login(self):
         Api(urls[0], None, None, num_retries=1)
 
     def test_rollover(self):
-        api = Api(["http://error.example.com", "wss://node.bitshares.eu"])
+        api = Api(["http://error.example.com", urls[0]])
         api.get_objects(["2.8.0"])