eth-portfolio-temp 0.1.8.dev0__cp311-cp311-win32.whl → 0.2.2.dev0__cp311-cp311-win32.whl

eth_portfolio/_shitcoins.py

@@ -170,6 +170,19 @@ shitcoins: Final = {
         "0xc6a76f7ad66d0e6Ccd1AaAd6e7568c9bd55Dce62",
         "0xB4d4334eB5a251cbE5cC7Afb0Ba26119aCE62281",
         "0xE5c5AE39B98eFd9D3c9E0F2a5457D98fFA4b0b46",
+        # Generally looks like shit (symbol ERC20)
+        "0xe37be01D1337E77aCB0b4293DDb4D410D80010a7",
+        "0x7EeAcC32C81e4D78E9705fBf0b977f5A858Bf0F3",
+        "0x90133FF815ade1977EA2f1454dBC1d309EAA33f6",
+        "0x82ff6D346E424025B1F07e4C8D6527806e50fCA5",
+        "0x7C2bc9F685e1f78e42d236Ff819D89DDA864359d",
+        "0x3ea463dD031A384DB68d6fD2f37574248E7ffCfE",
+        "0x241b047e810c70AB2bB5C567391E0888c4791cbe",
+        "0x47D1b57e5B542808eeEd0C509583Fa12d023f05e",
+        "0x8a33B3e6f5C0049Cff6dEca0564F5fbDa0eBe9f9",
+        "0x84b2e82Ef534e8bE05276DBf4F9e5474fBeD5E59",
+        "0x022b5fE59fc45a29d58a7e45a2567b69b649d623",
+        "0x178d20220c22008cc1886d2E689cAeE4A5c3239b",
         # Tagged as well known address scam on Etherscan
         "0x59bed83a385571ffac0FC15A43f0f6f72e66Dccb",
         "0x2Ec109a0ceFEC70661a242a8B54cae8f45630397",
@@ -228,6 +241,7 @@ shitcoins: Final = {
         "0x89D3Ac7C32Aa14bEE6Fa90E041241dc4eEbbDFB3",
         "0x640c6fdAfbDaC9bfCe79943890fdc98f8d39bE3e",
         "0xA04a3a553548090a7b81D2de75B8a08Ee45860e1",
+        "0x1b8F28C0d410456FE04b8f421d00d6654F66AbB6",
         # fake DAI
         "0xf84f908E78f9295b53883AD9ACa38F86d513f03F",
         "0x20Dd160716b0387220Eea7B9951bDb51B3728DC4",

eth_portfolio/_utils.py

@@ -47,10 +47,15 @@ if TYPE_CHECKING:
 
 logger: Final = logging.getLogger(__name__)
 
-NON_STANDARD_ERC721: Final = {
+NON_STANDARD_ERC721: Final[List[ChecksumAddress]] = {
     Network.Mainnet: ["0xb47e3cd837dDF8e4c57F05d70Ab865de6e193BBB"],  # CryptoPunks
 }.get(CHAINID, [])
 
+SUPPRESS_ERROR_LOGS: Final[List[ChecksumAddress]] = {
+    # put tokens here when you don't expect them to price successfully and do not want to see the associated error logs
+}.get(CHAINID, [])
+"""Put tokens here when you don't expect them to price successfully and do not want to see the associated error logs."""
+
 
 async def get_buffered_chain_height() -> int:
     """Returns an int equal to the current height of the chain minus `_config.REORG_BUFFER`."""
@@ -131,7 +136,7 @@ async def _get_price(token: AddressOrContract, block: Optional[int] = None) -> _
             elif isinstance(e.exception, NonStandardERC20):
                 # Can't get symbol for handling like other excs
                 logger.warning(f"NonStandardERC20 while fetching price for {token}")
-            elif isinstance(e.exception, PriceError):
+            elif isinstance(e.exception, PriceError) and token not in SUPPRESS_ERROR_LOGS:
                 logger.warning(
                     f"PriceError while fetching price for {await _describe_err(token, block)}"
                 )

eth_portfolio_scripts/_portfolio.py

@@ -40,8 +40,10 @@ class ExportablePortfolio(Portfolio):
     def __init__(
         self,
         addresses: Addresses,
+        *,
         start_block: int = 0,
         label: str = _DEFAULT_LABEL,
+        concurrency: int = 60,
         load_prices: bool = True,
         get_bucket: Callable[[ChecksumAddress], Awaitable[str]] = get_token_bucket,
         num_workers_transactions: int = 1000,
@@ -51,6 +53,7 @@ class ExportablePortfolio(Portfolio):
             addresses, start_block, label, load_prices, num_workers_transactions, asynchronous
         )
         self.get_bucket = get_bucket
+        self._semaphore = a_sync.Semaphore(concurrency)
 
     @cached_property
     def _data_queries(self) -> Tuple[str, str]:
@@ -88,36 +91,36 @@ class ExportablePortfolio(Portfolio):
         except Exception as e:
             log_error("Error processing %s:", dt, exc_info=True)
 
-    @a_sync.Semaphore(60)
     async def get_data_for_export(self, block: BlockNumber, ts: datetime) -> List[victoria.Metric]:
-        print(f"exporting {ts} for {self.label}")
-        start = datetime.now(tz=timezone.utc)
-
-        metrics_to_export = []
-        data: PortfolioBalances = await self.describe(block, sync=False)
-
-        for wallet, wallet_data in dict.items(data):
-            for section, section_data in wallet_data.items():
-                if isinstance(section_data, TokenBalances):
-                    for token, bals in dict.items(section_data):
-                        metrics_to_export.extend(
-                            await self.__process_token(ts, section, wallet, token, bals)
-                        )
-                elif isinstance(section_data, RemoteTokenBalances):
-                    if section == "external":
-                        section = "assets"
-                    for protocol, token_bals in section_data.items():
-                        for token, bals in dict.items(token_bals):
+        async with self._semaphore:
+            print(f"exporting {ts} for {self.label}")
+            start = datetime.now(tz=timezone.utc)
+
+            metrics_to_export = []
+            data: PortfolioBalances = await self.describe(block, sync=False)
+
+            for wallet, wallet_data in dict.items(data):
+                for section, section_data in wallet_data.items():
+                    if isinstance(section_data, TokenBalances):
+                        for token, bals in dict.items(section_data):
                             metrics_to_export.extend(
-                                await self.__process_token(
-                                    ts, section, wallet, token, bals, protocol=protocol
-                                )
+                                await self.__process_token(ts, section, wallet, token, bals)
                             )
-                else:
-                    raise NotImplementedError()
+                    elif isinstance(section_data, RemoteTokenBalances):
+                        if section == "external":
+                            section = "assets"
+                        for protocol, token_bals in section_data.items():
+                            for token, bals in dict.items(token_bals):
+                                metrics_to_export.extend(
+                                    await self.__process_token(
+                                        ts, section, wallet, token, bals, protocol=protocol
+                                    )
+                                )
+                    else:
+                        raise NotImplementedError()
 
-        print(f"got data for {ts} in {datetime.now(tz=timezone.utc) - start}")
-        return metrics_to_export
+            print(f"got data for {ts} in {datetime.now(tz=timezone.utc) - start}")
+            return metrics_to_export
 
     def __get_data_exists_coros(self, dt: datetime) -> Iterator[str]:
         for query in self._data_queries:

eth_portfolio_scripts/balances.py

@@ -26,7 +26,11 @@ async def export_balances(args: Namespace) -> None:
 
     interval = parse_timedelta(args.interval)
     portfolio = ExportablePortfolio(
-        args.wallet, label=args.label, start_block=args.first_tx_block, load_prices=False
+        args.wallet,
+        label=args.label,
+        start_block=args.first_tx_block,
+        concurrency=args.concurrency,
+        load_prices=False,
     )
 
     if export_start_block := args.export_start_block or args.first_tx_block:

eth_portfolio_scripts/main.py

@@ -54,6 +54,12 @@ export_parser.add_argument(
     help="The time interval between datapoints. default: 6h",
     default="6h",
 )
+export_parser.add_argument(
+    "--concurrency",
+    type=int,
+    help="The max number of historical blocks to export concurrently. default: 60",
+    default=60,
+)
 export_parser.add_argument(
     "--first-tx-block",
     type=int,

{eth_portfolio_temp-0.1.8.dev0.dist-info → eth_portfolio_temp-0.2.2.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.1.8.dev0
+Version: 0.2.2.dev0
 Summary: eth-portfolio makes it easy to analyze your portfolio.
 Home-page: https://github.com/BobTheBuidler/eth-portfolio
 Author: BobTheBuidler

{eth_portfolio_temp-0.1.8.dev0.dist-info → eth_portfolio_temp-0.2.2.dev0.dist-info}/RECORD

@@ -1,22 +1,22 @@
-295eace8438df6ec133b__mypyc.cp311-win32.pyd,sha256=Ivctue6tzwVABbe97syFSz2-nsMEctsE0vRi_9zkTiI,227328
+295eace8438df6ec133b__mypyc.cp311-win32.pyd,sha256=-odm6XLUcskTbonOWbdPkHUJrTIvPRPOCemD2-DYtKI,228864
 eth_portfolio/__init__.py,sha256=5GmHYzhUX2gOC4MScgXnqS8x2MawbpWOuWPmqlvCotA,525
-eth_portfolio/_argspec.cp311-win32.pyd,sha256=59ych9-9-LESwxLWoIaG0h01scvttgdzxbBZuOI04g0,9216
+eth_portfolio/_argspec.cp311-win32.pyd,sha256=grtXJjKdQtSPZUgJmkfVGPvAJePevCUUOHY63TLeZco,9216
 eth_portfolio/_argspec.py,sha256=au8ycJ56-7UzbQVzYUOoMX9sToH0QNi2tS1O820xB3A,1637
 eth_portfolio/_cache.py,sha256=H8n8x0Xo-iHQ8Q-NPuk57mmbIG6qDj4Wal6_-tK9Pfs,4866
-eth_portfolio/_config.cp311-win32.pyd,sha256=GUlddYhlG8RoF4uJ6tpcnjFcwUQ26Hf1tGtWttdc1ro,9216
+eth_portfolio/_config.cp311-win32.pyd,sha256=EAfFj9wft7v72DtZUwEF44LURuvtqcHWlhz944DJ_XI,9216
 eth_portfolio/_config.py,sha256=BSOvFS4D0oqgVTtBbtW2g2kpL8Mk6xiP0PipfXs_91A,102
 eth_portfolio/_decimal.py,sha256=XhuxnVTAhJF6OILJ1MpbdwkAiy1D5NuS9jRmDRpCSYg,4886
 eth_portfolio/_decorators.py,sha256=AvB-q69MvaFe0Ykh1os6hSewcUujURQ9onqobMaONOM,2899
 eth_portfolio/_exceptions.py,sha256=xb5VmCtBtXy9WXu_1ofoG4j9BJsMQXMVydCJNUulrNY,2500
-eth_portfolio/_shitcoins.cp311-win32.pyd,sha256=joHmaz_9CwR-iDRu3h2U1CrGMg6XRTNd2foDUx1zw8U,9216
-eth_portfolio/_shitcoins.py,sha256=B0O1j9ldkNZiL12pzCx6gbxHQMz6kWByAki7DtDK6Eg,15099
-eth_portfolio/_stableish.cp311-win32.pyd,sha256=rHg4f7cldx3jjWly-YPf33nqa4hg3D4ASawKtUhU-jI,9216
+eth_portfolio/_shitcoins.cp311-win32.pyd,sha256=r2UZ2SAVXPvLxjvQXdEaJKSWwZaBuEuUy-sOVkLFgzE,9216
+eth_portfolio/_shitcoins.py,sha256=iKDhRsq0qtSm0nal1zyJp6Ny13UAZEW4C8xU5_lfse0,15866
+eth_portfolio/_stableish.cp311-win32.pyd,sha256=Oau-B8kCixQcmuRBRSCy99iSH1avs2zS3LX1DxDXpLA,9216
 eth_portfolio/_stableish.py,sha256=8pdlYe2YcZ8rTzdCzg-ihRQLPtSFXBNDjtnvuTgPRcQ,2063
 eth_portfolio/_submodules.py,sha256=zne-2YyVFoKHwkLuHx8cdz5lpcwwSDw1edJ9v8G4c1A,2263
-eth_portfolio/_utils.py,sha256=2-9J4NGyJW5MxmG3L6j8wh8cwq_8qwl_jiJjLcc9SRw,7590
+eth_portfolio/_utils.py,sha256=PlzMkvrSlR4htROT1sMP11m2A0m-CIcZlXVFfTW272w,7970
 eth_portfolio/address.py,sha256=RrFIWSx6jSITwh16Hqs6W6S9fz1KEaebQEk1vqL3HwI,14536
 eth_portfolio/buckets.py,sha256=pm2-_8VbGKpe6hHM6eysj17JK7Rhngr9-_gpVi-J1uA,6889
-eth_portfolio/constants.cp311-win32.pyd,sha256=HBQ90VlWMdxSfUCLtzbhy4yBOZRlF953jsEIM1S82tM,9216
+eth_portfolio/constants.cp311-win32.pyd,sha256=U98c2Z4PDLtmYiwGZJj_TwHpyht5-yzugp49xEtdt4k,9216
 eth_portfolio/constants.py,sha256=rUXWFaCGrrF_qzIdDvVzakQJsLnrGtFNn2EgRbZh8fQ,3741
 eth_portfolio/portfolio.py,sha256=FVx4QwnJH4llTWcYln9UpDkKridHSEAENbTHCBOSq_o,24904
 eth_portfolio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,13 +28,13 @@ eth_portfolio/_ledgers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 eth_portfolio/_ledgers/address.py,sha256=ZI4lVsxtXoffDHFBm0pUrSKU42KleBKThNdDHm1Nqtg,33823
 eth_portfolio/_ledgers/portfolio.py,sha256=rAr5S1tksgLPUOK1J1FbIWgvTQNzTqrRp8oukiP2BTo,13427
 eth_portfolio/_loaders/__init__.py,sha256=YrBeRuA48cN2Bg2R2nXiNt1CsUIG_7N6ENIpY6aISPo,1735
-eth_portfolio/_loaders/_nonce.cp311-win32.pyd,sha256=D06Iv9jIQZgQNoGxVebh-fc36QT-xvIQgaR1pqZzHYA,9216
+eth_portfolio/_loaders/_nonce.cp311-win32.pyd,sha256=W0gAj4UxwjKDCeRNqGgjKcjN8zqOyGjdQsXTOj0ay8Q,9216
 eth_portfolio/_loaders/_nonce.py,sha256=bA-5fZG8ALuADgQGrnoxt6p6j7QEwI6vIGnZRF1Zx7M,6481
-eth_portfolio/_loaders/balances.cp311-win32.pyd,sha256=Xo4YMOYYy4ZjZpi_k4TZdzcrVF4ereSYKXhycfE-nOI,9216
+eth_portfolio/_loaders/balances.cp311-win32.pyd,sha256=Y9vxDAV0Xl4a0QdBjoQQWjJt26-mYdYP8WfZ_mVf9ZI,9216
 eth_portfolio/_loaders/balances.py,sha256=_v-x1M3lzDHPt8svHmCcpxZKw0BaGHfZimhkwgphY8A,3226
 eth_portfolio/_loaders/token_transfer.py,sha256=58NoMc28CRSjuxP-_kNmXL7jS1oEFZayTZ9VAKQcVow,8741
 eth_portfolio/_loaders/transaction.py,sha256=WXsiNahcb5jNbXCX2-ceao3Cybfi-7_th8bnw9elmP0,9386
-eth_portfolio/_loaders/utils.cp311-win32.pyd,sha256=mJGtC-uLKAVnaZnajlsi8vErmjhiLl7XyE456VehxeM,9216
+eth_portfolio/_loaders/utils.cp311-win32.pyd,sha256=yIF7r9uerC1D9P2d5DPtk4CnMSmR4QbeZN2_M6kZLYg,9216
 eth_portfolio/_loaders/utils.py,sha256=_nhPmGq_h_y_JPU9vXvhzqoKAWtgLRhYy_PdJXbyUdw,2326
 eth_portfolio/_ydb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_ydb/token_transfers.py,sha256=HUTeWShcQD4IzocTHmBOreml0jbVttLcaed1fNiJ2qg,5297
@@ -58,26 +58,26 @@ eth_portfolio/typing/balance/single.py,sha256=NmtWXqCWMIkaoyvfL67Rh0wWurLf55fVaD
 eth_portfolio_scripts/__init__.py,sha256=DIBnQmjmhmNL1lO9Lq4QptrZmC7u6_N3p9zRjcZ9vbY,281
 eth_portfolio_scripts/_args.py,sha256=M33vPkja62XEJeCZAqacNSBCqbzse07wepwyBOtkvVo,682
 eth_portfolio_scripts/_logging.py,sha256=EgW8ozQZLAgt_cUgqe5BYZLMVQwB6X-0gq0T-BvqlTY,369
-eth_portfolio_scripts/_portfolio.py,sha256=xa-xNI3w6P54evq0qfRL0Vv2LEZ-6GnNKsSfDVaK-H0,6905
+eth_portfolio_scripts/_portfolio.py,sha256=f2o1fNJLsB0Y1Qo-GCIeLaKa3t8H1LwdDjstVX6ByzE,7116
 eth_portfolio_scripts/_utils.py,sha256=7maEWyS5i_Kp7iVaa5puf2ZyefqHDsUOqTDLz-UwIQY,2630
-eth_portfolio_scripts/balances.cp311-win32.pyd,sha256=7A9A3NrKd6Pzmcx7amTt0OOIUIhUvZ4MBwPm-AgFlXM,9216
-eth_portfolio_scripts/balances.py,sha256=reli3W6K9-8F8I_n0tIwS9SuUykpPJnbiMsnJgY9N_w,1573
-eth_portfolio_scripts/main.py,sha256=vSYt6Ajq2wZ1ErSoEdLaLQmfpZnFcN6S-kSYaKQ0KEY,3633
+eth_portfolio_scripts/balances.cp311-win32.pyd,sha256=CIlqs54ghRK4PFxdlbAPz6mUYN9u1sqr4ihnUMbPto0,9216
+eth_portfolio_scripts/balances.py,sha256=ApYTA5caujTRAIDxHnYmHk03CqFC9nNpTzJIDWLws8E,1640
+eth_portfolio_scripts/main.py,sha256=upkr0Vc758qti___5kyDsE0zcfwiZju4xvAQsKsu9iw,3804
 eth_portfolio_scripts/py.typed,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-eth_portfolio_scripts/docker/__init__.cp311-win32.pyd,sha256=i5NqIYII1zZVu52kT6m8jc26cqY64-5ibuK8Izo5mFE,9216
+eth_portfolio_scripts/docker/__init__.cp311-win32.pyd,sha256=SaKVdrTW6JQU338cv3xNfr8n4psp_IcPmP0HLo1g6gU,9216
 eth_portfolio_scripts/docker/__init__.py,sha256=R27uZPLUEK2--fb9IrxrDUk6R5_IVFJSv7s_ia7p5Xk,409
-eth_portfolio_scripts/docker/check.cp311-win32.pyd,sha256=XuYnAFj6qX5L8FHsQfPlQ41239qBFQD5FDYUlIK2D5Y,9216
+eth_portfolio_scripts/docker/check.cp311-win32.pyd,sha256=-txm7dsw6CmqgnqNYPauACwhouvred9lGiV-siD0N8g,9216
 eth_portfolio_scripts/docker/check.py,sha256=JFxUxGRSz20EgjKqCLBkCqR4N1ihzO_3ykU3jPzp_UU,1801
 eth_portfolio_scripts/docker/docker-compose.yaml,sha256=P2ZJAQBXRQX-nZ5CoNm__R2KihsA0njoTwJcIWn1_s0,1870
-eth_portfolio_scripts/docker/docker_compose.cp311-win32.pyd,sha256=P-aQAgCVVCjN6TDqwp4qqGa1DgTUlbJ0KSBXTkBDIxg,9216
+eth_portfolio_scripts/docker/docker_compose.cp311-win32.pyd,sha256=t-IXxxjOWdtRIdB5nRWARCpHwbQ6Mo78TSKaBsO_CgY,9216
 eth_portfolio_scripts/docker/docker_compose.py,sha256=tewgCWZP6g9sVFHbQnGC1au-bTnvuvXMZgTKKgpmeOc,2304
 eth_portfolio_scripts/docker/.grafana/dashboards/dashboards.yaml,sha256=wktTI-OAdF_khhbciZFo4Gt2V9bUjbe7GLqwdzTKf0U,212
 eth_portfolio_scripts/docker/.grafana/dashboards/Portfolio/Balances.json,sha256=XGMV8e4tDak53e9bmymwAB4uqZmAIcU5JlRT3OiwTeU,70750
 eth_portfolio_scripts/docker/.grafana/datasources/datasources.yml,sha256=8PPH_QDhfbRRh3IidskW46rifJejloa1a9I1KCw2FTk,199
 eth_portfolio_scripts/victoria/__init__.py,sha256=R0VvKiAC0e57zZNihcCptVkFO5CBHIbp2trFYuyY01M,2038
 eth_portfolio_scripts/victoria/types.py,sha256=KNq8aIiNXeiDnCKL7xycmouo0YeKI-sbQkIcTymcSYk,745
-eth_portfolio_temp-0.1.8.dev0.dist-info/METADATA,sha256=FNQyZP8AWSw3sjQQa2rmYyYVbdCLoTpyGi39Tp5wFOs,804
-eth_portfolio_temp-0.1.8.dev0.dist-info/WHEEL,sha256=Ri8zddKrjGdgjlj1OpSsvpDnvHfnQhMQWi3E_v2pqng,97
-eth_portfolio_temp-0.1.8.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
-eth_portfolio_temp-0.1.8.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
-eth_portfolio_temp-0.1.8.dev0.dist-info/RECORD,,
+eth_portfolio_temp-0.2.2.dev0.dist-info/METADATA,sha256=nszEgqdcwJnICtDLL2x8XAJNfNj4Eo3_b_-EqWwJcfI,804
+eth_portfolio_temp-0.2.2.dev0.dist-info/WHEEL,sha256=Ri8zddKrjGdgjlj1OpSsvpDnvHfnQhMQWi3E_v2pqng,97
+eth_portfolio_temp-0.2.2.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
+eth_portfolio_temp-0.2.2.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
+eth_portfolio_temp-0.2.2.dev0.dist-info/RECORD,,