Display contract balance correctly

bitcart · May 13, 2022 · d435a05 · d435a05
1 parent 19191d2
commit d435a05
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 16 deletions.
diff --git a/api/ext/shopify.py b/api/ext/shopify.py
@@ -76,7 +76,6 @@ async def shopify_invoice_update(event, event_data):
     client = get_shopify_client(store)
     if not await client.order_exists(order_id):
         return
-    print("UPD", invoice.status)
     if invoice.status in invoices.FAILED_STATUSES or invoice.status in invoices.PAID_STATUSES:
         success = invoice.status in invoices.PAID_STATUSES
         await update_shopify_status(client, order_id, invoice.id, invoice.currency, invoice.price, success)

diff --git a/api/models.py b/api/models.py
@@ -195,9 +195,15 @@ async def add_fields(self):
         await super().add_fields()
         from api import utils
 
-        success, self.balance = await utils.wallets.get_confirmed_wallet_balance(self)
+        success, self.divisibility, self.balance = await utils.wallets.get_confirmed_wallet_balance(self)
         self.error = not success
 
+    @classmethod
+    def process_kwargs(cls, kwargs):
+        kwargs = super().process_kwargs(kwargs)
+        kwargs.pop("divisibility", None)
+        return kwargs
+
     async def validate(self, kwargs):
         await super().validate(kwargs)
         if "xpub" in kwargs or "contract" in kwargs:

diff --git a/api/schemes.py b/api/schemes.py
@@ -130,7 +130,9 @@ class Wallet(CreateWallet):
     @root_validator(pre=True)
     def set_balance(cls, values):
         if "balance" in values:
-            values["balance"] = currency_table.format_decimal(values.get("currency"), values["balance"])
+            values["balance"] = currency_table.format_decimal(
+                values.get("currency"), values["balance"], divisibility=values.get("divisibility")
+            )
         return values
 
 

diff --git a/api/utils/wallets.py b/api/utils/wallets.py
@@ -42,17 +42,18 @@ async def get_wallet_history(model, response):
 async def get_wallet_balance(wallet) -> Union[bool, Decimal]:
     try:
         coin = settings.settings.get_coin(wallet.currency, {"xpub": wallet.xpub, "contract": wallet.contract})
-        return True, await coin.balance()
+        divisibility = None if not wallet.contract else await coin.server.readcontract(wallet.contract, "decimals")
+        return True, divisibility, await coin.balance()
     except (BitcartBaseError, HTTPException) as e:
         logger.error(
             f"Error getting wallet balance for wallet {wallet.id} with currency {wallet.currency}:\n{get_exception_message(e)}"
         )
-        return False, {attr: Decimal(0) for attr in BTC.BALANCE_ATTRS}
+        return False, 8, {attr: Decimal(0) for attr in BTC.BALANCE_ATTRS}
 
 
 async def get_confirmed_wallet_balance(wallet) -> Union[bool, Decimal]:
-    success, balance = await get_wallet_balance(wallet)
-    return success, balance["confirmed"]
+    success, divisibility, balance = await get_wallet_balance(wallet)
+    return success, divisibility, balance["confirmed"]
 
 
 async def get_wallet_balances(user):
@@ -61,10 +62,11 @@ async def get_wallet_balances(user):
     rates = {}
     async with utils.database.iterate_helper():
         async for wallet in models.Wallet.query.where(models.Wallet.user_id == user.id).gino.iterate():
-            _, crypto_balance = await get_confirmed_wallet_balance(wallet)
-            if wallet.currency in rates:  # pragma: no cover
-                rate = rates[wallet.currency]
+            _, _, crypto_balance = await get_confirmed_wallet_balance(wallet)
+            cache_key = (wallet.currency, wallet.contract)
+            if cache_key in rates:  # pragma: no cover
+                rate = rates[cache_key]
             else:
-                rate = rates[wallet.currency] = await get_rate(wallet, show_currency)
+                rate = rates[cache_key] = await get_rate(wallet, show_currency)
             balances += crypto_balance * rate
     return currency_table.format_decimal(show_currency, currency_table.normalize(show_currency, balances))
diff --git a/api/views/wallets.py b/api/views/wallets.py
@@ -41,9 +41,11 @@ async def get_wallet_balance(
     model_id: str, user: models.User = Security(utils.authorization.AuthDependency(), scopes=["wallet_management"])
 ):
     wallet = await utils.database.get_object(models.Wallet, model_id, user)
-    response = (await utils.wallets.get_wallet_balance(wallet))[1]
+    got = await utils.wallets.get_wallet_balance(wallet)
+    response = got[2]
+    divisibility = got[1]
     for key in response:
-        response[key] = currency_table.format_decimal(wallet.currency, response[key])
+        response[key] = currency_table.format_decimal(wallet.currency, response[key], divisibility=divisibility)
     return response
 
 

diff --git a/daemons/eth.py b/daemons/eth.py
@@ -335,7 +335,9 @@ def address(self):
         return self.keystore.address
 
     async def balance(self):
-        return to_dict(await get_balance(self.web3, self.address))
+        if self.contract:
+            return from_wei(await daemon.readcontract(self.contract, "balanceOf", self.address), self.divisibility)
+        return await get_balance(self.web3, self.address)
 
     def stop(self, block_number):
         self.running = False
@@ -905,7 +907,7 @@ def getaddresshistory(self, *args, **kwargs):
 
     @rpc(requires_wallet=True, requires_network=True)
     async def getbalance(self, wallet):
-        return {"confirmed": await self.wallets[wallet].balance()}
+        return {"confirmed": decimal_to_string(await self.wallets[wallet].balance(), self.wallets[wallet].divisibility)}
 
     @rpc
     def getconfig(self, key, wallet=None):

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -219,8 +219,9 @@ async def test_no_exchange_rates_available(mocker, caplog, wallet):
 @pytest.mark.anyio
 async def test_broken_coin(mocker, caplog, wallet):
     mocker.patch("bitcart.BTC.balance", side_effect=BitcartBaseError("Coin broken"))
-    success, balance = await utils.wallets.get_confirmed_wallet_balance(schemes.Wallet(**wallet))
+    success, divisibility, balance = await utils.wallets.get_confirmed_wallet_balance(schemes.Wallet(**wallet))
     assert not success
+    assert divisibility == 8
     assert balance == Decimal(0)
     assert "Error getting wallet balance" in caplog.text