Feature/issue 88

README.md

@@ -33,15 +33,17 @@ The following NIPs are supported by the API out-of-the-box:
 - [NIP-30](https://github.com/nostr-protocol/nips/blob/master/30.md)
 - [NIP-32](https://github.com/nostr-protocol/nips/blob/master/32.md)
 - [NIP-40](https://github.com/nostr-protocol/nips/blob/master/40.md)
-- [NIP-42](https://github.com/nostr-protocol/nips/blob/master/42.md)
 - [NIP-44](https://github.com/nostr-protocol/nips/blob/master/44.md)
 - [NIP-46](https://github.com/nostr-protocol/nips/blob/master/46.md)
 - [NIP-57](https://github.com/nostr-protocol/nips/blob/master/57.md)
 
 We also provide the classes [GenericEvent](https://github.com/tcheeric/nostr-java/blob/main/nostr-java-event/src/main/java/nostr/event/impl/GenericEvent.java) and [GenericTag](https://github.com/tcheeric/nostr-java/blob/main/nostr-java-event/src/main/java/nostr/event/impl/GenericTag.java) for creating events and tags that are currently not supported out-of-the-box.
-See working example [here](https://github.com/tcheeric/nostr-java/tree/main/nostr-java-examples)
+See a working example [here](https://github.com/tcheeric/nostr-java/tree/main/nostr-java-examples)
 
 Additional reading:
 - [nostr-java-api](https://github.com/tcheeric/nostr-java/tree/main/nostr-java-api)
 - [nostr-java-id](https://github.com/tcheeric/nostr-java/tree/main/nostr-java-id)
 - [nostr-java-examples](https://github.com/tcheeric/nostr-java/tree/main/nostr-java-examples)
+
+## Dev Discussion Group:
+- Nostr Public Channel: nostr:nevent1qqszqdmxg26sehmnyrcu2ler8azz6wyj6fh0qg3ad5fnnm6xfqqvhzcppamhxue69uhkummnw3ezumt0d5pzpl7nwh45p66gvet2q28dhjpcyh6clux4cjsm5gh7waza9pzjnmgglv06ew

nostr-java-api/src/main/java/nostr/api/EventNostr.java

@@ -19,14 +19,13 @@
 /**
  * @author guilhermegps
  */
+@Getter
 @NoArgsConstructor
 public abstract class EventNostr<T extends GenericEvent> extends Nostr {
 
-    @Getter
     @Setter
     private T event;
 
-    @Getter
     private PublicKey recipient;
 
     public EventNostr(@NonNull Identity sender) {

nostr-java-api/src/main/java/nostr/api/NIP01.java

@@ -28,6 +28,7 @@
 import nostr.event.NIP01Event;
 import nostr.event.impl.Filters;
 import nostr.event.list.EventList;
+import nostr.event.list.FiltersList;
 import nostr.event.list.GenericTagQueryList;
 import nostr.event.list.KindList;
 import nostr.event.list.PublicKeyList;
@@ -222,6 +223,7 @@ public static Filters createFilters(EventList events, PublicKeyList authors, Kin
         		.build();
     }
 
+
     /**
      * Create an event message to send events requested by clients
      *
@@ -239,11 +241,11 @@ public static EventMessage createEventMessage(@NonNull IEvent event, @NonNull St
      * Create a REQ message to request events and subscribe to new updates
      *
      * @param subscriptionId the subscription id
-     * @param filters the filters object
+     * @param filtersList the filters list
      * @return a REQ message
      */
-    public static ReqMessage createReqMessage(@NonNull String subscriptionId, @NonNull Filters filters) {
-        return new ReqMessageFactory(subscriptionId, filters).create();
+    public static ReqMessage createReqMessage(@NonNull String subscriptionId, @NonNull FiltersList filtersList) {
+        return new ReqMessageFactory(subscriptionId, filtersList).create();
     }
 
     /**

nostr-java-api/src/main/java/nostr/api/NIP04.java

@@ -91,9 +91,8 @@ public static String encrypt(@NonNull IIdentity senderId, @NonNull String messag
      * @param rcptId
      * @param dm     the encrypted direct message
      * @return the DM content in clear-text
-     * @throws NostrException
      */
-    public static String decrypt(@NonNull IIdentity rcptId, @NonNull DirectMessageEvent dm) throws NostrException {
+    public static String decrypt(@NonNull IIdentity rcptId, @NonNull DirectMessageEvent dm) {
         return NIP04.decrypt(rcptId, (GenericEvent) dm);
     }
 

nostr-java-api/src/main/java/nostr/api/NIP44.java

@@ -73,7 +73,7 @@ public NIP44<T> encrypt() {
     }
 
     public static String encrypt(@NonNull IIdentity senderId, @NonNull String message, @NonNull PublicKey recipient) {
-        MessageCipher cipher = new MessageCipher44(senderId.getPrivateKey().toString(), recipient.toString());
+        MessageCipher cipher = new MessageCipher44(senderId.getPrivateKey().getRawData(), recipient.getRawData());
         return cipher.encrypt(message);
     }
 
@@ -97,7 +97,7 @@ public static String decrypt(@NonNull IIdentity rcptId, @NonNull EncryptedPayloa
      * @return the ep content in clear-text
      */
     public static String decrypt(@NonNull IIdentity identity, @NonNull String encrypteEPessage, @NonNull PublicKey recipient) {
-        MessageCipher cipher = new MessageCipher44(identity.getPrivateKey().toString(), recipient.toString());
+        MessageCipher cipher = new MessageCipher44(identity.getPrivateKey().getRawData(), recipient.getRawData());
         return cipher.decrypt(encrypteEPessage);
     }
 
@@ -112,14 +112,14 @@ public static String decrypt(@NonNull IIdentity rcptId, @NonNull GenericEvent ev
         boolean rcptFlag = amITheRecipient(rcptId, event);
 
         if (!rcptFlag) { // I am the message sender
-            MessageCipher cipher = new MessageCipher44(rcptId.getPrivateKey().toString(), pTag.getPublicKey().toString());
+            MessageCipher cipher = new MessageCipher44(rcptId.getPrivateKey().getRawData(), pTag.getPublicKey().getRawData());
             return cipher.decrypt(event.getContent());
         }
 
         // I am the message recipient
         var sender = event.getPubKey();
         log.log(Level.FINE, "The message is being decrypted for {0}", sender);
-        MessageCipher cipher = new MessageCipher44(rcptId.getPrivateKey().toString(), sender.toString());
+        MessageCipher cipher = new MessageCipher44(rcptId.getPrivateKey().getRawData(), sender.getRawData());
         return cipher.decrypt(event.getContent());
     }
 
@@ -128,7 +128,7 @@ private static void encryptDirectMessage(@NonNull IIdentity senderId, @NonNull E
         ITag pkTag = ep.getTags().get(0);
         if (pkTag instanceof PubKeyTag pubKeyTag) {
             var rcptPublicKey = pubKeyTag.getPublicKey();
-            MessageCipher cipher = new MessageCipher44(senderId.getPrivateKey().toString(), rcptPublicKey.toString());
+            MessageCipher cipher = new MessageCipher44(senderId.getPrivateKey().getRawData(), rcptPublicKey.getRawData());
             var encryptedContent = cipher.encrypt(ep.getContent());
             ep.setContent(encryptedContent);
         }

nostr-java-api/src/main/java/nostr/api/Nostr.java

@@ -24,9 +24,10 @@
 import nostr.event.json.codec.BaseTagDecoder;
 import nostr.event.json.codec.BaseTagEncoder;
 import nostr.event.json.codec.FiltersDecoder;
-import nostr.event.json.codec.FiltersEncoder;
+import nostr.event.json.codec.FiltersListEncoder;
 import nostr.event.json.codec.GenericEventDecoder;
 import nostr.event.json.codec.GenericTagQueryEncoder;
+import nostr.event.list.FiltersList;
 import nostr.id.IIdentity;
 
 import java.util.List;
@@ -83,12 +84,24 @@ public void send(@NonNull IEvent event) {
     }
 
 	public void send(@NonNull Filters filters, @NonNull String subscriptionId) {
-		getClient().send(filters, subscriptionId);
+        FiltersList filtersList = new FiltersList();
+        filtersList.add(filters);
+		getClient().send(filtersList, subscriptionId);
+    }
+
+    public void send(@NonNull FiltersList filtersList, @NonNull String subscriptionId) {
+        getClient().send(filtersList, subscriptionId);
     }
 
     public void send(@NonNull Filters filters, @NonNull String subscriptionId, Map<String, String> relays) {
+        FiltersList filtersList = new FiltersList();
+        filtersList.add(filters);
+        send(filtersList, subscriptionId, relays);
+    }
+
+    public void send(@NonNull FiltersList filtersList, @NonNull String subscriptionId, Map<String, String> relays) {
         setRelays(relays);
-        getClient().send(filters, subscriptionId);
+        getClient().send(filtersList, subscriptionId);
     }
 
     /**
@@ -184,19 +197,19 @@ public static BaseTag decodeTag(@NonNull String json) {
         // Filters
 
         /**
-         * @param filters
+         * @param filtersList
          * @param relay
          */
-        public static String encode(@NonNull Filters filters, Relay relay) {
-            final var enc = new FiltersEncoder(filters, relay);
+        public static String encode(@NonNull FiltersList filtersList, Relay relay) {
+            final var enc = new FiltersListEncoder(filtersList, relay);
             return enc.encode();
         }
 
         /**
-         * @param filters
+         * @param filtersList
          */
-        public static String encode(@NonNull Filters filters) {
-            return Nostr.Json.encode(filters, null);
+        public static String encode(@NonNull FiltersList filtersList) {
+            return Nostr.Json.encode(filtersList, null);
         }
 
         /**

nostr-java-api/src/main/java/nostr/api/factory/impl/NIP01Impl.java

@@ -18,11 +18,11 @@
 import nostr.event.BaseTag;
 import nostr.event.Marker;
 import nostr.event.impl.EphemeralEvent;
-import nostr.event.impl.Filters;
 import nostr.event.impl.MetadataEvent;
 import nostr.event.impl.ParameterizedReplaceableEvent;
 import nostr.event.impl.ReplaceableEvent;
 import nostr.event.impl.TextNoteEvent;
+import nostr.event.list.FiltersList;
 import nostr.event.message.CloseMessage;
 import nostr.event.message.EoseMessage;
 import nostr.event.message.EventMessage;
@@ -153,11 +153,11 @@ public EventMessage create() {
     public static class ReqMessageFactory extends MessageFactory<ReqMessage> {
 
         private final String subscriptionId;
-        private final Filters filters;
+        private final FiltersList filtersList;
 
         @Override
         public ReqMessage create() {
-            return new ReqMessage(subscriptionId, filters);
+            return new ReqMessage(subscriptionId, filtersList);
         }
     }
 

nostr-java-api/src/main/java/nostr/api/factory/impl/NIP15Impl.java

@@ -47,13 +47,6 @@ public VerifyPaymentOrShippedEventFactory(@NonNull List<BaseTag> tags, VerifyPay
             this.customer = customer;
         }
 
-        @Deprecated
-        public VerifyPaymentOrShippedEventFactory(@NonNull IIdentity sender, @NonNull VerifyPaymentOrShippedEvent.PaymentShipmentStatus status, @NonNull CustomerOrderEvent.Customer customer) {
-            super(sender, status.toString());
-            this.status = status;
-            this.customer = customer;
-        }
-
         @Override
         public VerifyPaymentOrShippedEvent create() {
             return new VerifyPaymentOrShippedEvent(getSender(), customer, status);

nostr-java-base/src/main/java/nostr/base/BaseKey.java

@@ -29,17 +29,21 @@ public abstract class BaseKey implements IKey {
     protected final Bech32Prefix prefix;
 
     @Override
-    public String getBech32() {
+    public String toBech32String() {
         try {
             return Bech32.toBech32(prefix, rawData);
         } catch (NostrException ex) {
             throw new RuntimeException(ex);
         }
     }
 
-    @JsonValue
     @Override
+    @JsonValue
     public String toString() {
+        return toHexString();
+    }
+
+    public String toHexString() {
         return NostrUtil.bytesToHex(rawData);
     }
 

nostr-java-base/src/main/java/nostr/base/IKey.java

@@ -11,5 +11,5 @@ public interface IKey extends Serializable {
 
     byte[] getRawData();
 
-    String getBech32();
+    String toBech32String();
 }

nostr-java-client/src/main/java/nostr/client/Client.java

@@ -1,31 +1,13 @@
 package nostr.client;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.extern.java.Log;
 import nostr.base.IEvent;
 import nostr.base.Relay;
 import nostr.event.BaseMessage;
 import nostr.event.impl.ClientAuthenticationEvent;
-import nostr.event.impl.Filters;
+import nostr.event.list.FiltersList;
 import nostr.event.message.ClientAuthenticationMessage;
 import nostr.event.message.CloseMessage;
 import nostr.event.message.EventMessage;
@@ -37,6 +19,24 @@
 import nostr.ws.handler.spi.IRequestHandler;
 import nostr.ws.request.handler.provider.DefaultRequestHandler;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
 @Log
 public class Client {
 
@@ -122,8 +122,8 @@ public void send(@NonNull IEvent event, String subsciptionId) {
         send(message);
     }
 
-    public void send(@NonNull Filters filters, String subscriptionId) {
-        ReqMessage message = new ReqMessage(subscriptionId, filters);
+    public void send(@NonNull FiltersList filtersList, String subscriptionId) {
+        ReqMessage message = new ReqMessage(subscriptionId, filtersList);
         send(message);
     }
 
@@ -168,7 +168,7 @@ public void auth(Identity identity, String challenge) {
         this.send(authMsg);
     }
 
-    public void auth(String challenge, Relay relay) throws NostrException {
+    public void auth(String challenge, Relay relay) {
         auth(Identity.getInstance(), challenge, relay);
     }
 

nostr-java-encryption-nip44/src/main/java/nostr/encryption/nip44/MessageCipher44.java

@@ -16,8 +16,8 @@ public class MessageCipher44 implements MessageCipher {
 
     private static final int NONCE_LENGTH = 32;
 
-    private final String senderPrivateKey;
-    private final String recipientPublicKey;
+    private final byte[] senderPrivateKey;
+    private final byte[] recipientPublicKey;
 
     @Override
     public String encrypt(@NonNull String message) {
@@ -42,7 +42,7 @@ public String decrypt(@NonNull String payload) {
 
     private byte[] getConversationKey() {
         try {
-            return EncryptedPayloads.getConversationKey(senderPrivateKey, "02" + recipientPublicKey);
+            return EncryptedPayloads.getConversationKey(NostrUtil.bytesToHex(senderPrivateKey), "02" + NostrUtil.bytesToHex(recipientPublicKey));
         } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
             throw new RuntimeException(e);
         }

nostr-java-event/src/main/java/nostr/event/BaseEvent.java

@@ -2,7 +2,6 @@
 package nostr.event;
 
 import nostr.base.IEvent;
-import nostr.base.PublicKey;
 import nostr.event.impl.GenericEvent;
 
 /**
@@ -14,7 +13,6 @@ public abstract class BaseEvent implements IEvent {
     public static class ProxyEvent extends GenericEvent {
 
         public ProxyEvent(String id)  {
-            super(new PublicKey(new byte[]{}), Kind.UNDEFINED);
             setId(id);
         }
 

nostr-java-event/src/main/java/nostr/event/impl/EphemeralEvent.java

@@ -17,7 +17,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Event(name = "Ephemeral Events", nip = 1)
+@Event(name = "Ephemeral Events")
 public class EphemeralEvent extends NIP01Event {
 
     public EphemeralEvent(PublicKey pubKey, Integer kind, List<BaseTag> tags, String content) {