From d90e5fbf0bd775035557ec9b4a6454f72cab8863 Mon Sep 17 00:00:00 2001
From: supertestnet <58400631+supertestnet@users.noreply.github.com>
Date: Mon, 3 Jun 2024 12:39:26 -0500
Subject: [PATCH] Update nwcjs.js

---
 nwcjs.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nwcjs.js b/nwcjs.js
index 4f4864b..19d3b3d 100644
--- a/nwcjs.js
+++ b/nwcjs.js
@@ -57,7 +57,7 @@ var nwcjs = {
         });
         return event.id;
     },
-    getEvents: async ( relay, kinds, until, since, limit, etags, ptags, seconds_of_delay_tolerable, debug ) => {
+    getEvents: async ( relay, kinds, until, since, limit, etags, ptags, seconds_of_delay_tolerable ) => {
         var socket = new WebSocket( relay );
         var events = [];
         socket.addEventListener( 'message', async function( message ) {
@@ -83,7 +83,7 @@ var nwcjs = {
             await nwcjs.waitSomeSeconds( 1 );
             num_of_seconds_waited = num_of_seconds_waited + 1;
             var time_is_up = num_of_seconds_waited >= seconds_of_delay_tolerable;
-            if ( debug ) console.log( `num_of_seconds_waited:`, num_of_seconds_waited, `out of`, seconds_of_delay_tolerable );
+            console.log( `num_of_seconds_waited:`, num_of_seconds_waited, `out of`, seconds_of_delay_tolerable );
             if ( time_is_up ) {
                 socket.close();
                 return events;
@@ -229,16 +229,16 @@ var nwcjs = {
         num = Number( num );
         return new Promise( resolve => setTimeout( resolve, num ) );
     },
-    getZapRequest: async ( lnaddress, amount, relay = "wss://nostrue.com" ) => {
+    getZapRequest: async ( endpoint, amount, relay = "wss://nostrue.com" ) => {
         amount = amount * 1000;
-        var endpoint = lnaddress.split( "@" );
+        var endpoint = endpoint.split( "@" );
         var url = "https://" + endpoint[ 1 ] + "/.well-known/lnurlp/" + endpoint[ 0 ];
         var url_bytes = new TextEncoder().encode( url );
         var lnurl = bech32.bech32.encode( "lnurl", bech32.bech32.toWords( url_bytes ), 100_000 );
         var data = await fetch( url );
         data = await data.json();
         var serverpub = data[ "nostrPubkey" ];
-        var privkey = nwcjs.bytesToHex( nobleSecp256k1.utils.randomPrivateKey() )
+        var privkey = nwcjs.bytesToHex( nobleSecp256k1.utils.randomPrivateKey() );
         var pubkey = nobleSecp256k1.getPublicKey( privkey, true ).substring( 2 );
         var obj = {
             kind: 9734,
@@ -247,7 +247,7 @@ var nwcjs = {
               [ "relays", relay ],
               [ "amount", `${amount}` ],
               [ "p", serverpub ],
-              [ "e", "ab".repeat( 32 ) ],
+              [ "e", pubkey ],
               [ "lnurl", lnurl ],
             ],
             created_at: Math.floor( Date.now() / 1000 ),
@@ -263,7 +263,7 @@ var nwcjs = {
     },
     checkZapStatus: async ( invoice, relay = "wss://nostrue.com" ) => {
         var bolt11;
-        var events = await nwcjs.getEvents( relay, [ 9735 ], null, null, 1, [ "ab".repeat( 32 ) ], null, 3 );
+        var events = await nwcjs.getEvents( relay, [ 9735 ], null, null, 1, [ pubkey ], null, 3 );
         if ( !events.length ) return "not paid yet";
         var receipt = events[ 0 ];
         receipt.tags.every( item => {