Fix erroneous deposit notifications

Author: bbedward

cogs/favorites.py

@@ -125,7 +125,7 @@ async def addfavorite_cmd(self, ctx: Context):
             return
 
         fav_count = await Favorite.filter(user=ctx.user).count()
-        if (fav_count + len(to_add)) >= 25:
+        if (fav_count + len(to_add)) > 25:
             await Messages.add_x_reaction(msg)
             await Messages.send_error_dm(msg.author, f"You can only have up to **25 favorites**. With this, you would have **{fav_count + len(to_add)}**.")
             return

cogs/rain.py

@@ -132,6 +132,7 @@ async def rain_cmd(self, ctx: Context):
             return
 
         individual_send_amount = NumberUtil.truncate_digits(send_amount / len(active_users), max_digits=Env.precision_digits())
+        individual_send_amount_str = f"{individual_send_amount:.2f}" if Env.banano() else f"{individual_send_amount:.6f}"
         if individual_send_amount < Constants.TIP_MINIMUM:
             await Messages.add_x_reaction(msg)
             await Messages.send_error_dm(msg.author, f"Amount is too small to divide across {len(active_users)} users")
@@ -160,15 +161,15 @@ async def rain_cmd(self, ctx: Context):
                     task_list.append(
                         Messages.send_basic_dm(
                             member=msg.guild.get_member(u.id),
-                            message=f"You were tipped **{individual_send_amount} {Env.currency_symbol()}** by {msg.author.name.replace('`', '')}.\nUse `{config.Config.instance().command_prefix}mute {msg.author.id}` to disable notifications for this user.",
+                            message=f"You were tipped **{individual_send_amount_str} {Env.currency_symbol()}** by {msg.author.name.replace('`', '')}.\nUse `{config.Config.instance().command_prefix}mute {msg.author.id}` to disable notifications for this user.",
                             skip_dnd=True
                         )
                     )
                 else:
                     task_list.append(
                         Messages.send_basic_dm(
                             member=msg.guild.get_member(u.id),
-                            message=f"You were tipped **{individual_send_amount} {Env.currency_symbol()}** anonymously!",
+                            message=f"You were tipped **{individual_send_amount_str} {Env.currency_symbol()}** anonymously!",
                             skip_dnd=True
                         )
                     )
@@ -186,7 +187,7 @@ async def rain_cmd(self, ctx: Context):
         if msg.channel.id not in config.Config.instance().get_no_stats_channels():
             await stats.update_tip_stats(amount_needed)
         # DM creator
-        await Messages.send_success_dm(msg.author, f"You rained **{amount_needed} {Env.currency_symbol()}** to **{len(tx_list)} users**, they received **{NumberUtil.truncate_digits(individual_send_amount, max_digits=Env.precision_digits())} {Env.currency_symbol()}** each.", header="Make it Rain")
+        await Messages.send_success_dm(msg.author, f"You rained **{amount_needed} {Env.currency_symbol()}** to **{len(tx_list)} users**, they received **{individual_send_amount_str} {Env.currency_symbol()}** each.", header="Make it Rain")
         # Make the rainer auto-rain eligible
         await self.auto_rain_eligible(msg)
 

db/models/transaction.py

@@ -5,7 +5,6 @@
 
 import db.models.giveaway as gway
 import db.models.user as usr
-from db.redis import RedisDB
 
 from rpc.client import RPCClient
 from util.env import Env
@@ -113,9 +112,6 @@ async def send(self) -> str:
             amount=self.amount
         )
         if resp is not None:
-            # Cache the hash in redis to indicate this is an internal transaction
-            # We hope that this process is faster than NANO confirms blocks, because we use this to differentiate internal and external transactions from callback
-            await RedisDB.instance().set(f"hash:{resp}", "value", expires=60) # expire after 1 minute
             async with in_transaction() as conn:
                 self.block_hash = resp
                 await self.save(using_db=conn)

server.py

@@ -11,6 +11,7 @@
 import datetime
 import logging
 import rapidjson as json
+from db.models.transaction import Transaction
 
 class GrahamServer(object):
     """An AIOHTTP server that listens for callbacks and provides various APIs"""
@@ -144,8 +145,8 @@ async def callback(self, request: web.Request):
                     if account is None:
                         return web.HTTPOk()
                     # See if this is an internal TX
-                    internal = await RedisDB.instance().exists(f"hash:{hash}")
-                    if internal:
+                    transaction = await Transaction.filter(block_hash=hash).prefetch_related('receiving_user').first()
+                    if transaction is not None and transaction.receiving_user is not None:
                         return web.HTTPOk()
                     self.logger.debug(f'Deposit received: {request_json["amount"]} for {account.user.id}')
                     amount_string = f"{Env.raw_to_amount(int(request_json['amount']))} {Env.currency_symbol()}"