Merge pull request #3574 from LefterisJP/bump_version

Bump version to v1.21.1

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.21.0
+current_version = 1.21.1
 commit = True
 tag = False
 

docs/changelog.rst

@@ -2,6 +2,7 @@
 Changelog
 =========
 
+* :release:`1.21.1 <2021-10-07>`
 * :feature:`3554` Gemini users will now have their earn balances tracked in rotki.
 * :bug:`3555` Users should now be able to see the total value in the table of NFTs in the dashboard
 * :bug:`3579` Asset type selector will now be properly disabled when editing an asset.
@@ -34,7 +35,6 @@ Changelog
 * :bug:`3266` Users will now be able to properly access most of the top bar content using a mobile device.
 * :bug:`3268` Users will now be able to properly scroll to the hidden tabs when using a mobile device.
 * :bug:`3267` Frontend will now occupy all the available screen when accessed from a mobile device.
-* :bug:`3208` Rotki is now able to accept and track the same account for different blockchain types.
 * :bug:`3463` Users using Turkish localization will now be able to use the application.
 * :bug:`3448` Improve Kucoin api rate limit handling. Recognize CFG asset in Kucoin as WCFG.
 * :bug:`3452` Trades from externally imported exchanges (blockfi, crypto.com etc.) should now be properly taken into accounting in the PnL report again.

docs/conf.py

@@ -24,9 +24,9 @@
 author = 'The rotki team'
 
 # The short X.Y version
-version = '1.21.0'
+version = '1.21.1'
 # The full version, including alpha/beta/rc tags
-release = '1.21.0'
+release = '1.21.1'
 
 
 # -- General configuration ---------------------------------------------------

frontend/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rotki",
-  "version": "1.21.0",
+  "version": "1.21.1",
   "description": "A portfolio tracking, asset analytics and tax reporting application specializing in Cryptoassets that protects your privacy",
   "author": "Rotki Solutions GmbH <info@rotki.com>",
   "scripts": {

rotkehlchen/exchanges/gemini.py

@@ -3,9 +3,21 @@
 import json
 import logging
 from base64 import b64encode
+from collections import defaultdict
 from http import HTTPStatus
 from json.decoder import JSONDecodeError
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Tuple, Union, overload
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    DefaultDict,
+    Dict,
+    List,
+    Optional,
+    Tuple,
+    Union,
+    overload,
+)
 
 import gevent
 import requests
@@ -311,7 +323,7 @@ def query_balances(self) -> ExchangeQueryBalances:
             log.error(msg)
             return None, msg
 
-        returned_balances: Dict[Asset, Balance] = {}
+        returned_balances: DefaultDict[Asset, Balance] = defaultdict(Balance)
         for entry in balances:
             try:
                 balance_type = entry['type']
@@ -333,7 +345,7 @@ def query_balances(self) -> ExchangeQueryBalances:
                     )
                     continue
 
-                returned_balances[asset] = Balance(
+                returned_balances[asset] += Balance(
                     amount=amount,
                     usd_value=amount * usd_price,
                 )

setup.py

@@ -13,7 +13,7 @@
 requirements = directory.joinpath('requirements.txt').read_text()
 requirements = [str(r) for r in parse_requirements(requirements)]
 
-version = '1.21.0'  # Do not edit: this is maintained by bumpversion (see .bumpversion.cfg)
+version = '1.21.1'  # Do not edit: this is maintained by bumpversion (see .bumpversion.cfg)
 
 setup(
     name='rotkehlchen',