diff --git a/nostr_dvm/utils/dvmconfig.py b/nostr_dvm/utils/dvmconfig.py index e2c88b2..f6abc54 100644 --- a/nostr_dvm/utils/dvmconfig.py +++ b/nostr_dvm/utils/dvmconfig.py @@ -20,9 +20,8 @@ class DVMConfig: "wss://relay.nostr.net" ] - RECONCILE_DB_RELAY_LIST = ["wss://relay.damus.io", "wss://nostr21.com", - "wss://nostr.oxtr.dev", - "wss://relay.nostr.net" , "wss://relay.primal.net"] #, "wss://relay.snort.social"] + RECONCILE_DB_RELAY_LIST = ["wss://relay.damus.io", "wss://nostr.oxtr.dev", + "wss://relay.nostr.net" , "wss://relay.primal.net"] # Straight Censorship (reply guy spam) MUTE = [PublicKey.parse("npub1x5vhtx7j2prvueeenwf7tmesrzmuzc50zs0aakgd75v5c30ekj3s5zjckj"), diff --git a/tests/discovery.py b/tests/discovery.py index 4044280..6710256 100644 --- a/tests/discovery.py +++ b/tests/discovery.py @@ -150,9 +150,6 @@ def build_example_nostrband(name, identifier, admin_config, image, about, custom dvm_config.RECONCILE_DB_RELAY_LIST = RECONCILE_DB_RELAY_LIST dvm_config.RELAY_LIST = RELAY_LIST dvm_config.LOGLEVEL = LogLevel.INFO - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -292,9 +289,6 @@ def build_example_topic(name, identifier, admin_config, options, image, descript dvm_config.RECONCILE_DB_RELAY_LIST = RECONCILE_DB_RELAY_LIST dvm_config.RELAY_LIST = RELAY_LIST dvm_config.DATABASE = database - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -328,22 +322,15 @@ def build_example_topic(name, identifier, admin_config, options, image, descript def build_example_popular(name, identifier, admin_config, options, image, cost=0, update_rate=180, processing_msg=None, update_db=True, database=None): dvm_config = build_default_config(identifier) - dvm_config.USE_OWN_VENV = False dvm_config.LOGLEVEL = LogLevel.INFO - # dvm_config.SHOWLOG = True dvm_config.SCHEDULE_UPDATES_SECONDS = update_rate # Every 10 minutes dvm_config.UPDATE_DATABASE = update_db dvm_config.FIX_COST = cost - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg", - #"wss://relay.nostr.net"] dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg dvm_config.AVOID_PAID_OUTBOX_RELAY_LIST = AVOID_OUTBOX_RELAY_LIST dvm_config.RECONCILE_DB_RELAY_LIST = RECONCILE_DB_RELAY_LIST dvm_config.RELAY_LIST = RELAY_LIST dvm_config.DATABASE = database - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -386,9 +373,6 @@ def build_example_popular_followers(name, identifier, admin_config, options, ima dvm_config.AVOID_PAID_OUTBOX_RELAY_LIST = AVOID_OUTBOX_RELAY_LIST dvm_config.RECONCILE_DB_RELAY_LIST = RECONCILE_DB_RELAY_LIST dvm_config.RELAY_LIST = RELAY_LIST - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -505,9 +489,6 @@ def build_example_top_zapped(name, identifier, admin_config, options, image, cos dvm_config.RECONCILE_DB_RELAY_LIST = RECONCILE_DB_RELAY_LIST dvm_config.RELAY_LIST = RELAY_LIST dvm_config.DATABASE = database - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -556,12 +537,7 @@ def build_example_mostr(name, identifier, admin_config, options, image, cost=0, dvm_config.LOGLEVEL = LogLevel.DEBUG dvm_config.FIX_COST = cost - # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg", - # "wss://relay.nostr.net"] dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg - # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -1124,6 +1100,8 @@ def playground(): subscription_config.PRIVATE_KEY = check_and_set_private_key("dvm_subscription") npub = Keys.parse(subscription_config.PRIVATE_KEY).public_key().to_bech32() invoice_key, admin_key, wallet_id, user_id, lnaddress = check_and_set_ln_bits_keys("dvm_subscription", npub) + subscription_config.RECONCILE_DB_RELAY_LIST = RECONCILE_DB_RELAY_LIST + subscription_config.RELAY_LIST = RELAY_LIST subscription_config.LNBITS_INVOICE_KEY = invoice_key subscription_config.LNBITS_ADMIN_KEY = admin_key # The dvm might pay failed jobs back subscription_config.LNBITS_URL = os.getenv("LNBITS_HOST") diff --git a/tests/discovery_gallery.py b/tests/discovery_gallery.py index af11f72..11f9d76 100644 --- a/tests/discovery_gallery.py +++ b/tests/discovery_gallery.py @@ -33,12 +33,7 @@ def build_example_gallery(name, identifier, admin_config, options, image, cost=0 dvm_config.UPDATE_DATABASE = update_db dvm_config.LOGLEVEL = LogLevel.DEBUG dvm_config.FIX_COST = cost - # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg", - # "wss://relay.nostr.net"] dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg - # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 diff --git a/tests/discovery_mostr.py b/tests/discovery_mostr.py index 4a7092d..446d570 100644 --- a/tests/discovery_mostr.py +++ b/tests/discovery_mostr.py @@ -37,12 +37,7 @@ def build_example_mostr(name, identifier, admin_config, options, image, cost=0, dvm_config.RECONCILE_DB_RELAY_LIST = ["wss://nfrelay.app/?user=activitypub"] dvm_config.LOGLEVEL = LogLevel.DEBUG dvm_config.FIX_COST = cost - # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg", - # "wss://relay.nostr.net"] dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg - # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 diff --git a/tests/discovery_one_per_follow.py b/tests/discovery_one_per_follow.py index 63840fd..1dce146 100644 --- a/tests/discovery_one_per_follow.py +++ b/tests/discovery_one_per_follow.py @@ -38,11 +38,7 @@ def build_example_oneperfollow(name, identifier, admin_config, options, image, c dvm_config.LOGLEVEL = LogLevel.DEBUG dvm_config.FIX_COST = cost dvm_config.RELAY_LIST = ["wss://relay.damus.io", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg", "wss://relay.primal.net"] - # "wss://relay.nostr.net"] dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg - # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 diff --git a/tests/discovery_people.py b/tests/discovery_people.py index 14b69fb..0d9f014 100644 --- a/tests/discovery_people.py +++ b/tests/discovery_people.py @@ -42,12 +42,7 @@ def build_example_wot(name, identifier, admin_config, options, image, cost=0, up #dvm_config.RECONCILE_DB_RELAY_LIST = RECONCILE_DB_RELAY_LIST dvm_config.LOGLEVEL = LogLevel.DEBUG dvm_config.FIX_COST = cost - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg", - #"wss://relay.nostr.net"] dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 diff --git a/tests/discovery_test.py b/tests/discovery_test.py index e3d4884..c852d83 100644 --- a/tests/discovery_test.py +++ b/tests/discovery_test.py @@ -149,9 +149,6 @@ def build_example_nostrband(name, identifier, admin_config, image, about, custom dvm_config.AVOID_PAID_OUTBOX_RELAY_LIST = AVOID_OUTBOX_RELAY_LIST dvm_config.RELAY_LIST = RELAY_LIST dvm_config.LOGLEVEL = LogLevel.INFO - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -289,9 +286,6 @@ def build_example_topic(name, identifier, admin_config, options, image, descript dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg dvm_config.AVOID_PAID_OUTBOX_RELAY_LIST = AVOID_OUTBOX_RELAY_LIST dvm_config.RELAY_LIST = RELAY_LIST - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -331,14 +325,9 @@ def build_example_popular(name, identifier, admin_config, options, image, cost=0 dvm_config.SCHEDULE_UPDATES_SECONDS = update_rate # Every 10 minutes dvm_config.UPDATE_DATABASE = update_db dvm_config.FIX_COST = cost - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg", - #"wss://relay.nostr.net"] dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg dvm_config.AVOID_PAID_OUTBOX_RELAY_LIST = AVOID_OUTBOX_RELAY_LIST dvm_config.RELAY_LIST = RELAY_LIST - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -380,9 +369,6 @@ def build_example_popular_followers(name, identifier, admin_config, options, ima dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg dvm_config.AVOID_PAID_OUTBOX_RELAY_LIST = AVOID_OUTBOX_RELAY_LIST dvm_config.RELAY_LIST = RELAY_LIST - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -495,9 +481,6 @@ def build_example_top_zapped(name, identifier, admin_config, options, image, cos dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg dvm_config.AVOID_PAID_OUTBOX_RELAY_LIST = AVOID_OUTBOX_RELAY_LIST dvm_config.RELAY_LIST = RELAY_LIST - #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -545,12 +528,7 @@ def build_example_mostr(name, identifier, admin_config, options, image, cost=0, dvm_config.LOGLEVEL = LogLevel.DEBUG dvm_config.FIX_COST = cost - # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg", - # "wss://relay.nostr.net"] dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg - # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89 @@ -591,11 +569,7 @@ def build_example_oneperfollow(name, identifier, admin_config, options, image, c dvm_config.LOGLEVEL = LogLevel.DEBUG dvm_config.FIX_COST = cost dvm_config.RELAY_LIST = ["wss://relay.damus.io", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg", "wss://relay.primal.net"] - # "wss://relay.nostr.net"] dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg - # dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", - # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" - # ] admin_config.LUD16 = dvm_config.LN_ADDRESS # Add NIP89