Use EventTemplate instead of Event in BunkerRequestSign

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/jackson/EventMapper.kt

@@ -60,8 +60,7 @@ class EventMapper {
                         .addSerializer(BunkerRequest::class.java, BunkerRequest.BunkerRequestSerializer())
                         .addDeserializer(BunkerRequest::class.java, BunkerRequest.BunkerRequestDeserializer())
                         .addSerializer(BunkerResponse::class.java, BunkerResponse.BunkerResponseSerializer())
-                        .addDeserializer(BunkerResponse::class.java, BunkerResponse.BunkerResponseDeserializer())
-                        .addDeserializer(Event::class.java, UnsignedEventDeserializer()),
+                        .addDeserializer(BunkerResponse::class.java, BunkerResponse.BunkerResponseDeserializer()),
                 )
 
         fun fromJson(json: String): Event = mapper.readValue(json, Event::class.java)

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/signers/EventTemplate.kt

@@ -20,19 +20,28 @@
  */
 package com.vitorpamplona.quartz.nip01Core.signers
 
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.core.TagArray
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
 import com.vitorpamplona.quartz.nip01Core.core.builder
 import com.vitorpamplona.quartz.nip01Core.core.tagArray
+import com.vitorpamplona.quartz.nip01Core.jackson.EventMapper
 import com.vitorpamplona.quartz.utils.TimeUtils
 
 class EventTemplate<T : Event>(
+    @JsonProperty("created_at")
     val createdAt: Long,
     val kind: Int,
     val tags: TagArray,
     val content: String,
-)
+) {
+    fun toJson(): String = EventMapper.mapper.writeValueAsString(this)
+
+    companion object {
+        fun fromJson(json: String): EventTemplate<Event> = EventTemplateManualDeserializer.fromJson(EventMapper.mapper.readTree(json))
+    }
+}
 
 inline fun <T : Event> eventTemplate(
     kind: Int,

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/signers/EventTemplateDeserializer.kt

@@ -18,16 +18,16 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.quartz.nip01Core.jackson
+package com.vitorpamplona.quartz.nip01Core.signers
 
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
 import com.vitorpamplona.quartz.nip01Core.core.Event
 
-class UnsignedEventDeserializer : StdDeserializer<Event>(Event::class.java) {
+class EventTemplateDeserializer : StdDeserializer<EventTemplate<Event>>(EventTemplate::class.java) {
     override fun deserialize(
         jp: JsonParser,
         ctxt: DeserializationContext,
-    ): Event = UnsignedEventManualDeserializer.fromJson(jp.codec.readTree(jp))
+    ): EventTemplate<Event> = EventTemplateManualDeserializer.fromJson(jp.codec.readTree(jp))
 }

quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/signers/EventTemplateManualDeserializer.kt

@@ -18,18 +18,16 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.quartz.nip01Core.jackson
+package com.vitorpamplona.quartz.nip01Core.signers
 
 import com.fasterxml.jackson.databind.JsonNode
-import com.vitorpamplona.quartz.EventFactory
 import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.jackson.toTypedArray
 
-class UnsignedEventManualDeserializer {
+class EventTemplateManualDeserializer {
     companion object {
-        fun fromJson(jsonObject: JsonNode): Event =
-            EventFactory.create(
-                id = jsonObject.get("id")?.asText()?.intern() ?: "",
-                pubKey = jsonObject.get("pubkey")?.asText()?.intern() ?: "",
+        fun fromJson(jsonObject: JsonNode): EventTemplate<Event> =
+            EventTemplate(
                 createdAt = jsonObject.get("created_at").asLong(),
                 kind = jsonObject.get("kind").asInt(),
                 tags =
@@ -37,7 +35,6 @@ class UnsignedEventManualDeserializer {
                         it.toTypedArray { s -> if (s.isNull) "" else s.asText().intern() }
                     },
                 content = jsonObject.get("content").asText(),
-                sig = jsonObject.get("sig")?.asText()?.intern() ?: "",
             )
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/nip46RemoteSigner/BunkerRequestSign.kt

@@ -21,11 +21,12 @@
 package com.vitorpamplona.quartz.nip46RemoteSigner
 
 import com.vitorpamplona.quartz.nip01Core.core.Event
+import com.vitorpamplona.quartz.nip01Core.signers.EventTemplate
 import java.util.UUID
 
 class BunkerRequestSign(
     id: String = UUID.randomUUID().toString(),
-    val event: Event,
+    val event: EventTemplate<Event>,
 ) : BunkerRequest(id, METHOD_NAME, arrayOf(event.toJson())) {
     companion object {
         val METHOD_NAME = "sign_event"
@@ -33,6 +34,6 @@ class BunkerRequestSign(
         fun parse(
             id: String,
             params: Array<String>,
-        ): BunkerRequestSign = BunkerRequestSign(id, Event.fromJson(params[0]))
+        ): BunkerRequestSign = BunkerRequestSign(id, EventTemplate.fromJson(params[0]))
     }
 }