Skip to content

Commit 019760f

Browse files
ThomasFarstrikeThomasFarstrike
committed
works like a charm!
1 parent f32ebbd commit 019760f

File tree

4 files changed

+40
-24
lines changed

4 files changed

+40
-24
lines changed

‎internal_filesystem/lib/secp256k1.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
EC_UNCOMPRESSED = lib.SECP256K1_EC_UNCOMPRESSED
99

1010
HAS_RECOVERABLE = hasattr(lib, 'secp256k1_ecdsa_sign_recoverable')
11-
HAS_SCHNORR = hasattr(lib, 'secp256k1_schnorrsig_sign')
11+
#HAS_SCHNORR = hasattr(lib, 'secp256k1_schnorrsig_sign')
12+
HAS_SCHNORR = hasattr(lib, 'secp256k1_schnorrsig_sign_custom') # forgot why it's called custom
1213
HAS_ECDH = hasattr(lib, 'secp256k1_ecdh')
1314
HAS_EXTRAKEYS = hasattr(lib, 'secp256k1_keypair_create')
1415

@@ -231,16 +232,17 @@ def ecdsa_verify(self, msg, raw_sig, raw=False, digest=hashlib.sha256):
231232
return bool(verified)
232233

233234
def schnorr_verify(self, msg, schnorr_sig, bip340tag, raw=False):
235+
print("schnorr_verify 0")
234236
assert self.public_key, "No public key defined"
235237
if not HAS_SCHNORR:
236238
raise Exception("secp256k1_schnorr not enabled")
237-
239+
print("schnorr_verify 1")
238240
msg_to_sign = _bip340_tag(msg, raw, bip340tag)
239-
241+
print("schnorr_verify 2")
240242
verified = lib.secp256k1_schnorrsig_verify(
241243
secp256k1_ctx, schnorr_sig, msg_to_sign, len(msg_to_sign),
242244
self.xonly_pubkey)
243-
245+
print("schnorr_verify 3")
244246
return bool(verified)
245247

246248
def ecdh(self, scalar, hashfn=ffi.NULL, hasharg=ffi.NULL):

‎internal_filesystem/lib/secp256k1_compat.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,11 +267,15 @@ def secp256k1_schnorrsig_sign_custom(self, ctx, sig64, msg, msg_len, keypair, au
267267
return 0
268268

269269
def secp256k1_schnorrsig_verify(self, ctx, schnorr_sig, msg, msg_len, xonly_pubkey):
270+
print("compat.py secp256k1_schnorrsig_verify 1")
270271
try:
272+
print("compat.py secp256k1_schnorrsig_verify 2")
271273
if isinstance(xonly_pubkey, FFI.CData):
272274
xonly_pubkey = xonly_pubkey._data
275+
print("compat.py secp256k1_schnorrsig_verify 3")
273276
return usecp256k1.schnorrsig_verify(schnorr_sig, msg, xonly_pubkey)
274277
except (ValueError, AttributeError):
278+
print("compat.py secp256k1_schnorrsig_verify error")
275279
return 0
276280

277281
def secp256k1_tagged_sha256(self, ctx, hash32, tag, tag_len, msg, msg_len):

‎internal_filesystem/lib/websocket.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def _run_callback(callback, *args):
4040
"""Add callback to queue for execution."""
4141
try:
4242
_callback_queue.append((callback, args))
43-
_log_debug(f"Queued callback {callback}, queue size: {len(_callback_queue)}")
43+
_log_debug(f"Queued callback {callback}, args={args}, queue size: {len(_callback_queue)}")
4444
except IndexError:
4545
_log_error("Callback queue full, dropping callback")
4646

@@ -52,7 +52,9 @@ async def _process_callbacks_async():
5252
try:
5353
callback, args = _callback_queue.popleft()
5454
if callback is not None:
55-
_log_debug(f"Executing callback {callback} with args {args}")
55+
_log_debug(f"Executing callback {callback} with {len(args)} args")
56+
for i, arg in enumerate(args):
57+
_log_debug(f"Arg {i}: {arg}")
5658
try:
5759
callback(*args)
5860
except Exception as e:
@@ -294,7 +296,7 @@ async def _connect_and_run(self):
294296
self._start_ping_task()
295297

296298
async for msg in ws:
297-
_log_debug(f"Received msg: type={msg.type}, data={str(msg.data)[:30]}...")
299+
_log_debug(f"Received msg: type={msg.type}, data={str(msg.data)[:20]}...")
298300
if not self.running:
299301
_log_debug("Not running, breaking message loop")
300302
break
@@ -309,11 +311,11 @@ async def _connect_and_run(self):
309311
if msg.type == WSMsgType.TEXT:
310312
data = msg.data
311313
_run_callback(self.on_data, self, data, ABNF.OPCODE_TEXT, True)
312-
_run_callback(self.on_message, self, data)
314+
_run_callback(self.on_message, self, data) # Standard websocket-client
313315
elif msg.type == WSMsgType.BINARY:
314316
data = msg.data
315317
_run_callback(self.on_data, self, data, ABNF.OPCODE_BINARY, True)
316-
_run_callback(self.on_message, self, data)
318+
_run_callback(self.on_message, self, data) # Standard websocket-client
317319
elif msg.type == WSMsgType.ERROR or ws.ws.closed:
318320
_log_error("WebSocket error or closed")
319321
raise WebSocketConnectionClosedException("WebSocket closed")

‎internal_filesystem/lib/websocket_nostr_receive.py‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
import json
22
import ssl
33
import time
4+
import _thread
5+
46
from nostr.filter import Filter, Filters
57
from nostr.event import Event, EventKind
68
from nostr.relay_manager import RelayManager
79
from nostr.message_type import ClientMessageType
810

911
#filters = Filters([Filter(authors=[<a nostr pubkey in hex>], kinds=[EventKind.TEXT_NOTE])])
1012
#filters = Filters([Filter(authors="04c915daefee38317fa734444acee390a8269fe5810b2241e5e6dd343dfbecc9", kinds=[EventKind.TEXT_NOTE])])
13+
#timestamp = round(time.time()-10)
14+
timestamp = round(time.time()-100)
1115
#timestamp = round(time.time()-1000)
12-
timestamp = round(time.time()-5000)
16+
#timestamp = round(time.time()-5000)
1317
#filters = Filters([Filter(authors="04c915daefee38317fa734444acee390a8269fe5810b2241e5e6dd343dfbecc9", kinds=[9735], since=timestamp)])
1418
filters = Filters([Filter(kinds=[9735], since=timestamp)])
1519

@@ -36,17 +40,21 @@
3640
relay_manager.publish_message(message)
3741
time.sleep(1) # allow the messages to send
3842

39-
print("printing events:")
40-
#while relay_manager.message_pool.has_events():
41-
for _ in range(60):
42-
time.sleep(1)
43-
print(".")
44-
try:
45-
event_msg = relay_manager.message_pool.get_event()
46-
print(event_msg.event.content)
47-
except Exception as e:
48-
print(f"pool.get_event() got error: {e}")
49-
50-
51-
print("closing:")
52-
relay_manager.close_connections()
43+
def printevents():
44+
print("printing events:")
45+
#while relay_manager.message_pool.has_events():
46+
for _ in range(60):
47+
time.sleep(1)
48+
print(".")
49+
try:
50+
event_msg = relay_manager.message_pool.get_event()
51+
print(event_msg.event.content)
52+
except Exception as e:
53+
print(f"pool.get_event() got error: {e}")
54+
print("60 seconds passed, closing:")
55+
relay_manager.close_connections()
56+
57+
#_thread.stack_size(32*1024)
58+
#_thread.start_new_thread(printevents, ())
59+
printevents()
60+

0 commit comments

Comments
 (0)