mirror of
https://github.com/aljazceru/nostrdvm.git
synced 2025-12-20 07:24:22 +01:00
adapt NostrSigner to new sdk
This commit is contained in:
@@ -5,7 +5,7 @@ import signal
|
|||||||
from multiprocessing.connection import Connection
|
from multiprocessing.connection import Connection
|
||||||
|
|
||||||
from nostr_sdk import (Keys, Timestamp, Filter, nip04_decrypt, HandleNotification, EventBuilder, PublicKey,
|
from nostr_sdk import (Keys, Timestamp, Filter, nip04_decrypt, HandleNotification, EventBuilder, PublicKey,
|
||||||
Options, Tag, Event, nip04_encrypt, EventId, Nip19Event, Kind, KindEnum,
|
Options, Tag, Event, nip04_encrypt, EventId, Nip19Event, Kind, KindEnum, NostrSigner,
|
||||||
UnsignedEvent, UnwrappedGift, uniffi_set_event_loop, ClientBuilder, make_private_msg)
|
UnsignedEvent, UnwrappedGift, uniffi_set_event_loop, ClientBuilder, make_private_msg)
|
||||||
|
|
||||||
from nostr_dvm.utils.admin_utils import admin_make_database_updates
|
from nostr_dvm.utils.admin_utils import admin_make_database_updates
|
||||||
@@ -49,7 +49,7 @@ class Bot:
|
|||||||
self.CHATBOT = False
|
self.CHATBOT = False
|
||||||
|
|
||||||
opts = Options().gossip(True)
|
opts = Options().gossip(True)
|
||||||
self.client = ClientBuilder().signer(self.keys).opts(opts).build()
|
self.client = ClientBuilder().signer(NostrSigner.keys(self.keys)).opts(opts).build()
|
||||||
self.invoice_list = []
|
self.invoice_list = []
|
||||||
|
|
||||||
pk = self.keys.public_key()
|
pk = self.keys.public_key()
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import os
|
|||||||
from sys import platform
|
from sys import platform
|
||||||
|
|
||||||
from nostr_sdk import PublicKey, Keys, Client, Tag, Event, EventBuilder, Filter, HandleNotification, Timestamp, \
|
from nostr_sdk import PublicKey, Keys, Client, Tag, Event, EventBuilder, Filter, HandleNotification, Timestamp, \
|
||||||
LogLevel, Options, nip04_encrypt, Kind, RelayLimits, uniffi_set_event_loop, ClientBuilder
|
LogLevel, Options, nip04_encrypt, Kind, RelayLimits, uniffi_set_event_loop, ClientBuilder, NostrSigner
|
||||||
|
|
||||||
from nostr_dvm.utils.admin_utils import admin_make_database_updates, AdminConfig
|
from nostr_dvm.utils.admin_utils import admin_make_database_updates, AdminConfig
|
||||||
from nostr_dvm.utils.backend_utils import get_amount_per_task, check_task_is_supported, get_task
|
from nostr_dvm.utils.backend_utils import get_amount_per_task, check_task_is_supported, get_task
|
||||||
@@ -48,7 +48,7 @@ class DVM:
|
|||||||
Options().relay_limits(relaylimits)) #.difficulty(28)
|
Options().relay_limits(relaylimits)) #.difficulty(28)
|
||||||
|
|
||||||
#self.client = Client(self.keys)
|
#self.client = Client(self.keys)
|
||||||
self.client = ClientBuilder().signer(self.keys).opts(opts).build()
|
self.client = ClientBuilder().signer(NostrSigner.keys(self.keys)).opts(opts).build()
|
||||||
self.job_list = []
|
self.job_list = []
|
||||||
self.jobs_on_hold_list = []
|
self.jobs_on_hold_list = []
|
||||||
pk = self.keys.public_key()
|
pk = self.keys.public_key()
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ class DicoverContentLatestLongForm(DVMTaskInterface):
|
|||||||
|
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
# print(self.db_name)
|
# print(self.db_name)
|
||||||
cli = ClientBuilder().database(database).signer(keys).build()
|
cli = ClientBuilder().database(database).signer(NostrSigner.keys(keys)).build()
|
||||||
await cli.connect()
|
await cli.connect()
|
||||||
|
|
||||||
# Negentropy reconciliation
|
# Negentropy reconciliation
|
||||||
@@ -175,7 +175,7 @@ class DicoverContentLatestLongForm(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).opts(opts).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).opts(opts).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ class DicoverContentLatestWiki(DVMTaskInterface):
|
|||||||
|
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
# print(self.db_name)
|
# print(self.db_name)
|
||||||
cli = ClientBuilder().database(database).signer(keys).build()
|
cli = ClientBuilder().database(database).signer(NostrSigner.keys(keys)).build()
|
||||||
await cli.connect()
|
await cli.connect()
|
||||||
|
|
||||||
# Negentropy reconciliation
|
# Negentropy reconciliation
|
||||||
@@ -175,7 +175,7 @@ class DicoverContentLatestWiki(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).opts(opts).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).opts(opts).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ class DicoverContentCurrentlyPopular(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -216,7 +216,7 @@ class DicoverContentCurrentlyPopularZaps(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ class DicoverContentCurrentlyPopularFollowers(DVMTaskInterface):
|
|||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
|
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().database(database).signer(keys).opts(opts).build()
|
cli = ClientBuilder().database(database).signer(NostrSigner.keys(keys)).opts(opts).build()
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|
||||||
@@ -192,7 +192,7 @@ class DicoverContentCurrentlyPopularFollowers(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ class DicoverContentCurrentlyPopularGallery(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
|
|
||||||
cli = ClientBuilder().database(databasegallery).signer(keys).opts(opts).build()
|
cli = ClientBuilder().database(databasegallery).signer(NostrSigner.keys(keys)).opts(opts).build()
|
||||||
for relay in relays:
|
for relay in relays:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|
||||||
@@ -241,7 +241,7 @@ class DicoverContentCurrentlyPopularGallery(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ class DicoverContentCurrentlyPopularMostr(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -147,7 +147,7 @@ class DicoverContentCurrentlyPopularNonFollowers(DVMTaskInterface):
|
|||||||
if self.database is None:
|
if self.database is None:
|
||||||
self.database = NostrDatabase.lmdb(self.db_name)
|
self.database = NostrDatabase.lmdb(self.db_name)
|
||||||
|
|
||||||
cli = ClientBuilder().database(self.database).signer(keys).opts(opts).build()
|
cli = ClientBuilder().database(self.database).signer(NostrSigner.keys(keys)).opts(opts).build()
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|
||||||
@@ -228,7 +228,7 @@ class DicoverContentCurrentlyPopularNonFollowers(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -205,7 +205,7 @@ class DicoverContentCurrentlyPopularbyTopic(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ class Discoverlatestperfollower(DVMTaskInterface):
|
|||||||
|
|
||||||
opts = (Options().relay_limits(relaylimits))
|
opts = (Options().relay_limits(relaylimits))
|
||||||
|
|
||||||
cli = ClientBuilder().signer(keys).opts(opts).build()
|
cli = ClientBuilder().signer(NostrSigner(NostrSigner.keys(keys))).opts(opts).build()
|
||||||
for relay in self.dvm_config.RELAY_LIST:
|
for relay in self.dvm_config.RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
# ropts = RelayOptions().ping(False)
|
# ropts = RelayOptions().ping(False)
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ class DicoverContentDBUpdateScheduler(DVMTaskInterface):
|
|||||||
if self.database is None:
|
if self.database is None:
|
||||||
self.database = NostrDatabase.lmdb(self.db_name)
|
self.database = NostrDatabase.lmdb(self.db_name)
|
||||||
|
|
||||||
cli = ClientBuilder().signer(keys).database(self.database).opts(opts).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(self.database).opts(opts).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ class DiscoveryBotFarms(DVMTaskInterface):
|
|||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
|
|
||||||
database = NostrDatabase.lmdb("db/nostr_profiles.db")
|
database = NostrDatabase.lmdb("db/nostr_profiles.db")
|
||||||
cli = ClientBuilder().database(database).signer(keys).build()
|
cli = ClientBuilder().database(database).signer(NostrSigner.keys(keys)).build()
|
||||||
|
|
||||||
await cli.add_relay("wss://relay.damus.io")
|
await cli.add_relay("wss://relay.damus.io")
|
||||||
# cli.add_relay("wss://atl.purplerelay.com")
|
# cli.add_relay("wss://atl.purplerelay.com")
|
||||||
@@ -137,7 +137,7 @@ class DiscoveryBotFarms(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb("db/nostr_profiles.db")
|
database = NostrDatabase.lmdb("db/nostr_profiles.db")
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
await cli.add_relay("wss://relay.damus.io")
|
await cli.add_relay("wss://relay.damus.io")
|
||||||
await cli.add_relay("wss://nostr21.com")
|
await cli.add_relay("wss://nostr21.com")
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ class DiscoverReports(DVMTaskInterface):
|
|||||||
Options().relay_limits(relaylimits))
|
Options().relay_limits(relaylimits))
|
||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
cli = ClientBuilder().signer(keys).opts(opts).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).opts(opts).build()
|
||||||
# cli.add_relay("wss://relay.nostr.band")
|
# cli.add_relay("wss://relay.nostr.band")
|
||||||
for relay in self.dvm_config.RELAY_LIST:
|
for relay in self.dvm_config.RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ class DiscoverInactiveFollows(DVMTaskInterface):
|
|||||||
|
|
||||||
opts = (Options().relay_limits(relaylimits))
|
opts = (Options().relay_limits(relaylimits))
|
||||||
|
|
||||||
cli = ClientBuilder().signer(keys).opts(opts).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).opts(opts).build()
|
||||||
for relay in self.dvm_config.RELAY_LIST:
|
for relay in self.dvm_config.RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
await cli.add_relay("wss://nostr.band")
|
await cli.add_relay("wss://nostr.band")
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ class DiscoverNonFollowers(DVMTaskInterface):
|
|||||||
relaylimits))
|
relaylimits))
|
||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
cli= ClientBuilder().signer(keys).opts(opts).build()
|
cli= ClientBuilder().signer(NostrSigner.keys(keys)).opts(opts).build()
|
||||||
|
|
||||||
# cli.add_relay("wss://relay.nostr.band")
|
# cli.add_relay("wss://relay.nostr.band")
|
||||||
for relay in self.dvm_config.RELAY_LIST:
|
for relay in self.dvm_config.RELAY_LIST:
|
||||||
|
|||||||
@@ -205,7 +205,7 @@ class DiscoverPeopleMyWOT(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -210,7 +210,7 @@ class DiscoverPeopleWOT(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in self.dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ class SearchUser(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().database(database).signer(keys).build()
|
cli = ClientBuilder().database(database).signer(NostrSigner.keys(keys)).build()
|
||||||
|
|
||||||
await cli.add_relay(self.relay)
|
await cli.add_relay(self.relay)
|
||||||
# cli.add_relay("wss://atl.purplerelay.com")
|
# cli.add_relay("wss://atl.purplerelay.com")
|
||||||
@@ -140,7 +140,7 @@ class SearchUser(DVMTaskInterface):
|
|||||||
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
database = NostrDatabase.lmdb(self.db_name)
|
database = NostrDatabase.lmdb(self.db_name)
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
await cli.add_relay(self.relay)
|
await cli.add_relay(self.relay)
|
||||||
await cli.connect()
|
await cli.connect()
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ from typing import List
|
|||||||
import dotenv
|
import dotenv
|
||||||
from nostr_sdk import Filter, Client, Alphabet, EventId, Event, PublicKey, Tag, Keys, nip04_decrypt, Metadata, Options, \
|
from nostr_sdk import Filter, Client, Alphabet, EventId, Event, PublicKey, Tag, Keys, nip04_decrypt, Metadata, Options, \
|
||||||
Nip19Event, SingleLetterTag, RelayLimits, SecretKey, Connection, ConnectionTarget, \
|
Nip19Event, SingleLetterTag, RelayLimits, SecretKey, Connection, ConnectionTarget, \
|
||||||
EventBuilder, Kind, ClientBuilder, SendEventOutput
|
EventBuilder, Kind, ClientBuilder, SendEventOutput, NostrSigner
|
||||||
|
|
||||||
from nostr_dvm.utils.definitions import EventDefinitions, relay_timeout
|
from nostr_dvm.utils.definitions import EventDefinitions, relay_timeout
|
||||||
|
|
||||||
@@ -220,7 +220,7 @@ async def send_event_outbox(event: Event, client, dvm_config) -> SendEventOutput
|
|||||||
opts = Options().relay_limits(relaylimits).connection(connection).timeout(timedelta(seconds=5))
|
opts = Options().relay_limits(relaylimits).connection(connection).timeout(timedelta(seconds=5))
|
||||||
sk = SecretKey.from_hex(dvm_config.PRIVATE_KEY)
|
sk = SecretKey.from_hex(dvm_config.PRIVATE_KEY)
|
||||||
keys = Keys.parse(sk.to_hex())
|
keys = Keys.parse(sk.to_hex())
|
||||||
outboxclient = ClientBuilder().signer(keys).opts(opts).build()
|
outboxclient = ClientBuilder().signer(NostrSigner.keys(keys)).opts(opts).build()
|
||||||
print("[" + dvm_config.NIP89.NAME + "] Receiver Inbox relays: " + str(relays))
|
print("[" + dvm_config.NIP89.NAME + "] Receiver Inbox relays: " + str(relays))
|
||||||
|
|
||||||
for relay in relays[:5]:
|
for relay in relays[:5]:
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ async def get_following(pks, max_time_request=10, newer_than_time=None, dvm_conf
|
|||||||
|
|
||||||
# fetching events
|
# fetching events
|
||||||
keys = Keys.parse(check_and_set_private_key("test_client"))
|
keys = Keys.parse(check_and_set_private_key("test_client"))
|
||||||
cli = ClientBuilder().signer(keys).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).build()
|
||||||
|
|
||||||
for relay in dvm_config.SYNC_DB_RELAY_LIST:
|
for relay in dvm_config.SYNC_DB_RELAY_LIST:
|
||||||
await cli.add_relay(relay)
|
await cli.add_relay(relay)
|
||||||
@@ -586,7 +586,7 @@ async def get_metadata(npub):
|
|||||||
except:
|
except:
|
||||||
return "", "", ""
|
return "", "", ""
|
||||||
keys = Keys.parse(check_and_set_private_key("test_client"))
|
keys = Keys.parse(check_and_set_private_key("test_client"))
|
||||||
client = ClientBuilder().signer(keys).build()
|
client = ClientBuilder().signer(NostrSigner.keys(keys)).build()
|
||||||
await client.add_relay("wss://relay.damus.io")
|
await client.add_relay("wss://relay.damus.io")
|
||||||
await client.add_relay("wss://purplepag.es")
|
await client.add_relay("wss://purplepag.es")
|
||||||
await client.connect()
|
await client.connect()
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ async def getmetadata(npub):
|
|||||||
except:
|
except:
|
||||||
return "", "", ""
|
return "", "", ""
|
||||||
keys = Keys.parse("nsec1zmzllu40a7mr7ztl78uwfwslnp0pn0pww868adl05x52d4la237s6m8qfj")
|
keys = Keys.parse("nsec1zmzllu40a7mr7ztl78uwfwslnp0pn0pww868adl05x52d4la237s6m8qfj")
|
||||||
client = ClientBuilder().signer(keys).build()
|
client = ClientBuilder().signer(NostrSigner.keys(keys)).build()
|
||||||
await client.add_relay("wss://relay.damus.io")
|
await client.add_relay("wss://relay.damus.io")
|
||||||
#await client.add_relay("wss://relay.primal.net")
|
#await client.add_relay("wss://relay.primal.net")
|
||||||
await client.add_relay("wss://purplepag.es")
|
await client.add_relay("wss://purplepag.es")
|
||||||
@@ -54,7 +54,7 @@ async def getmetadata(npub):
|
|||||||
async def sync_db():
|
async def sync_db():
|
||||||
keys = Keys.parse("nsec1zmzllu40a7mr7ztl78uwfwslnp0pn0pww868adl05x52d4la237s6m8qfj")
|
keys = Keys.parse("nsec1zmzllu40a7mr7ztl78uwfwslnp0pn0pww868adl05x52d4la237s6m8qfj")
|
||||||
database = NostrDatabase.lmdb("db/nostr_followlists.db")
|
database = NostrDatabase.lmdb("db/nostr_followlists.db")
|
||||||
cli = ClientBuilder().signer(keys).database(database).build()
|
cli = ClientBuilder().signer(NostrSigner.keys(keys)).database(database).build()
|
||||||
|
|
||||||
await cli.add_relay("wss://relay.damus.io") # TODO ADD MORE
|
await cli.add_relay("wss://relay.damus.io") # TODO ADD MORE
|
||||||
# await cli.add_relay("wss://relay.primal.net") # TODO ADD MORE
|
# await cli.add_relay("wss://relay.primal.net") # TODO ADD MORE
|
||||||
|
|||||||
Reference in New Issue
Block a user