From baad270a4cf4cb21710876de9d569188b8b80b9e Mon Sep 17 00:00:00 2001
From: Andrey Dolgolev <andrey@simiotics.com>
Date: Tue, 28 Sep 2021 18:08:56 +0300
Subject: [PATCH 1/3] Add ETHTXPOOL_HUMBUG_CLIENT_ID as env variable for escape
 desynchronize with crawler.

---
 backend/moonstream/providers/bugout.py | 3 ++-
 backend/moonstream/settings.py         | 4 ++++
 backend/sample.env                     | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/backend/moonstream/providers/bugout.py b/backend/moonstream/providers/bugout.py
index ee96698d..fe048413 100644
--- a/backend/moonstream/providers/bugout.py
+++ b/backend/moonstream/providers/bugout.py
@@ -16,6 +16,7 @@ from sqlalchemy.orm import Session
 from .. import data
 from ..stream_queries import StreamQuery
 
+from ..settings import ETHTXPOOL_HUMBUG_CLIENT_ID
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.WARN)
@@ -376,7 +377,7 @@ ethereum_txpool_provider = EthereumTXPoolProvider(
     description=ethereum_txpool_description,
     default_time_interval_seconds=5,
     estimated_events_per_time_interval=50,
-    tags=["client:ethereum-txpool-crawler-0"],
+    tags=[ETHTXPOOL_HUMBUG_CLIENT_ID],
 )
 
 nft_summary_description = """Event provider for NFT market summaries.
diff --git a/backend/moonstream/settings.py b/backend/moonstream/settings.py
index 0a90d751..d18bb852 100644
--- a/backend/moonstream/settings.py
+++ b/backend/moonstream/settings.py
@@ -46,6 +46,10 @@ for path in MOONSTREAM_OPENAPI_LIST:
 
 DEFAULT_STREAM_TIMEINTERVAL = 5 * 60
 
+ETHTXPOOL_HUMBUG_CLIENT_ID = os.environ.get(
+    "ETHTXPOOL_HUMBUG_CLIENT_ID", "client:ethereum-txpool-crawler-0"
+)
+
 # S3 Bucket
 ETHERSCAN_SMARTCONTRACTS_BUCKET = os.environ.get("AWS_S3_SMARTCONTRACT_BUCKET")
 if ETHERSCAN_SMARTCONTRACTS_BUCKET is None:
diff --git a/backend/sample.env b/backend/sample.env
index 779bbb0c..6c44a369 100644
--- a/backend/sample.env
+++ b/backend/sample.env
@@ -9,3 +9,4 @@ export AWS_S3_SMARTCONTRACT_BUCKET="<AWS S3 bucket to store smart contracts>"
 export BUGOUT_BROOD_URL="https://auth.bugout.dev"
 export BUGOUT_SPIRE_URL="https://spire.bugout.dev"
 export HUMBUG_REPORTER_BACKEND_TOKEN="<Bugout Humbug token for crash reports>"
+export ETHTXPOOL_HUMBUG_CLIENT_ID="<Bugout Humbug client id for txpool transactions in journal>"
\ No newline at end of file

From 1429a08600cfb032ff357a58507d6c1208449bd7 Mon Sep 17 00:00:00 2001
From: Andrey Dolgolev <andrey@simiotics.com>
Date: Tue, 28 Sep 2021 18:27:57 +0300
Subject: [PATCH 2/3] Add fix.

---
 backend/moonstream/providers/bugout.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/moonstream/providers/bugout.py b/backend/moonstream/providers/bugout.py
index fe048413..f6a3b0bd 100644
--- a/backend/moonstream/providers/bugout.py
+++ b/backend/moonstream/providers/bugout.py
@@ -377,7 +377,7 @@ ethereum_txpool_provider = EthereumTXPoolProvider(
     description=ethereum_txpool_description,
     default_time_interval_seconds=5,
     estimated_events_per_time_interval=50,
-    tags=[ETHTXPOOL_HUMBUG_CLIENT_ID],
+    tags=[f"#client:{ETHTXPOOL_HUMBUG_CLIENT_ID}"],
 )
 
 nft_summary_description = """Event provider for NFT market summaries.

From 03c86a28f5688b9b2ee6840835873c2c04a8f25b Mon Sep 17 00:00:00 2001
From: Andrey Dolgolev <andrey@simiotics.com>
Date: Tue, 28 Sep 2021 18:29:26 +0300
Subject: [PATCH 3/3] Add fix for bugout tag.

---
 backend/moonstream/providers/bugout.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/moonstream/providers/bugout.py b/backend/moonstream/providers/bugout.py
index f6a3b0bd..1ace3ce9 100644
--- a/backend/moonstream/providers/bugout.py
+++ b/backend/moonstream/providers/bugout.py
@@ -377,7 +377,7 @@ ethereum_txpool_provider = EthereumTXPoolProvider(
     description=ethereum_txpool_description,
     default_time_interval_seconds=5,
     estimated_events_per_time_interval=50,
-    tags=[f"#client:{ETHTXPOOL_HUMBUG_CLIENT_ID}"],
+    tags=[f"client:{ETHTXPOOL_HUMBUG_CLIENT_ID}"],
 )
 
 nft_summary_description = """Event provider for NFT market summaries.