Fix lost instance in PriceFeed

Author: bitphage

bitshares/aio/price.py

@@ -325,8 +325,14 @@ async def __init__(self, feed, **kwargs):
                     "maximum_short_squeeze_ratio": feed[1][1][
                         "maximum_short_squeeze_ratio"
                     ],
-                    "settlement_price": await Price(feed[1][1]["settlement_price"]),
-                    "core_exchange_rate": await Price(feed[1][1]["core_exchange_rate"]),
+                    "settlement_price": await Price(
+                        feed[1][1]["settlement_price"],
+                        blockchain_instance=self.blockchain,
+                    ),
+                    "core_exchange_rate": await Price(
+                        feed[1][1]["core_exchange_rate"],
+                        blockchain_instance=self.blockchain,
+                    ),
                 },
             )
         else:
@@ -337,7 +343,11 @@ async def __init__(self, feed, **kwargs):
                         "maintenance_collateral_ratio"
                     ],
                     "maximum_short_squeeze_ratio": feed["maximum_short_squeeze_ratio"],
-                    "settlement_price": await Price(feed["settlement_price"]),
-                    "core_exchange_rate": await Price(feed["core_exchange_rate"]),
+                    "settlement_price": await Price(
+                        feed["settlement_price"], blockchain_instance=self.blockchain
+                    ),
+                    "core_exchange_rate": await Price(
+                        feed["core_exchange_rate"], blockchain_instance=self.blockchain
+                    ),
                 },
             )

bitshares/price.py

@@ -373,8 +373,14 @@ def __init__(self, feed, **kwargs):
                     "maximum_short_squeeze_ratio": feed[1][1][
                         "maximum_short_squeeze_ratio"
                     ],
-                    "settlement_price": Price(feed[1][1]["settlement_price"]),
-                    "core_exchange_rate": Price(feed[1][1]["core_exchange_rate"]),
+                    "settlement_price": Price(
+                        feed[1][1]["settlement_price"],
+                        blockchain_instance=self.blockchain,
+                    ),
+                    "core_exchange_rate": Price(
+                        feed[1][1]["core_exchange_rate"],
+                        blockchain_instance=self.blockchain,
+                    ),
                 },
             )
         else:
@@ -385,7 +391,11 @@ def __init__(self, feed, **kwargs):
                         "maintenance_collateral_ratio"
                     ],
                     "maximum_short_squeeze_ratio": feed["maximum_short_squeeze_ratio"],
-                    "settlement_price": Price(feed["settlement_price"]),
-                    "core_exchange_rate": Price(feed["core_exchange_rate"]),
+                    "settlement_price": Price(
+                        feed["settlement_price"], blockchain_instance=self.blockchain
+                    ),
+                    "core_exchange_rate": Price(
+                        feed["core_exchange_rate"], blockchain_instance=self.blockchain
+                    ),
                 },
             )

tests/testnet/aio/test_price.py

@@ -6,7 +6,7 @@
 from bitshares.aio.asset import Asset
 from bitshares.aio.amount import Amount
 from bitshares.aio.account import Account
-from bitshares.aio.price import Price, Order, FilledOrder
+from bitshares.aio.price import Price, PriceFeed, Order, FilledOrder
 from bitshares.aio.market import Market
 
 log = logging.getLogger("grapheneapi")
@@ -111,3 +111,23 @@ async def test_filled_order(default_account, do_trade):
     log.info("Order from history: {}".format(order))
     # Test copy()
     await order.copy()
+
+
+@pytest.mark.asyncio
+async def test_pricefeed_init_no_shared_instance(not_shared_instance, bitasset):
+    bitshares = not_shared_instance
+    asset = await Asset(bitasset, blockchain_instance=bitshares)
+    await asset.ensure_full()
+
+    # Prevent using instantiated objects loaded to cache
+    Asset.clear_cache()
+    feed = await PriceFeed(
+        asset["bitasset_data"]["feeds"][0], blockchain_instance=bitshares
+    )
+    assert feed["settlement_price"] > 0
+
+    Asset.clear_cache()
+    feed = await PriceFeed(
+        asset["bitasset_data"]["current_feed"], blockchain_instance=bitshares
+    )
+    assert feed["settlement_price"] > 0