mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-10-05 11:18:24 +00:00
Merge pull request #4202 from vitorpamplona/claude/quirky-gates-g6co4j
Replace JacksonMapper with native JSON serialization in CordnMigration
This commit is contained in:
+2
-3
@@ -34,7 +34,6 @@ import com.vitorpamplona.quartz.nip01Core.core.Event
|
|||||||
import com.vitorpamplona.quartz.nip01Core.core.HexKey
|
import com.vitorpamplona.quartz.nip01Core.core.HexKey
|
||||||
import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
|
import com.vitorpamplona.quartz.nip01Core.crypto.KeyPair
|
||||||
import com.vitorpamplona.quartz.nip01Core.crypto.verify
|
import com.vitorpamplona.quartz.nip01Core.crypto.verify
|
||||||
import com.vitorpamplona.quartz.nip01Core.jackson.JacksonMapper
|
|
||||||
import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
|
import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
|
||||||
import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.fetchFirst
|
import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.fetchFirst
|
||||||
import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.publishAndConfirm
|
import com.vitorpamplona.quartz.nip01Core.relay.client.accessories.publishAndConfirm
|
||||||
@@ -150,7 +149,7 @@ class CordnMigration(
|
|||||||
val dTag = RandomInstance.randomChars(D_TAG_LENGTH)
|
val dTag = RandomInstance.randomChars(D_TAG_LENGTH)
|
||||||
|
|
||||||
val inner = signer.signInner(inventory)
|
val inner = signer.signInner(inventory)
|
||||||
val sealedInner = signer.nip44Encrypt(JacksonMapper.toJson(inner), signer.pubKey)
|
val sealedInner = signer.nip44Encrypt(inner.toJson(), signer.pubKey)
|
||||||
|
|
||||||
val outer =
|
val outer =
|
||||||
NostrSignerInternal(ephemeral).sign<Event>(
|
NostrSignerInternal(ephemeral).sign<Event>(
|
||||||
@@ -215,7 +214,7 @@ class CordnMigration(
|
|||||||
|
|
||||||
val inner =
|
val inner =
|
||||||
try {
|
try {
|
||||||
JacksonMapper.fromJson(innerJson)
|
Event.fromJson(innerJson)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
throw CordnMigrationException("the tip's inner event is not readable: ${e.message}")
|
throw CordnMigrationException("the tip's inner event is not readable: ${e.message}")
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user