mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2026-10-30 07:37:38 +00:00
Claude
fab9475779
# Conflicts: # commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/cordn/CordnBackup.kt # commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/marmot/MarmotManager.kt # gradle/libs.versions.toml # marmotBench/src/main/kotlin/com/vitorpamplona/marmotbench/PrimitiveBenchmarks.kt # quartz/build.gradle.kts # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/cordn/appEncryptedMedia/CordnMediaEncryption.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/cordn/spec03Payloads/SealedPayload.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/zapstore/identityProof/CertificateSignature.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/zapstore/identityProof/IdentityProofEvent.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/MarmotInboundProcessor.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/appComponents/CurrentProfileGroupFactory.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/appComponents/EncryptedMediaV2.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/appComponents/agentTextStream/AgentTextStreamCrypto.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip00KeyPackages/KeyPackageRotationManager.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/mip04EncryptedMedia/Mip04MediaEncryption.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/protocolCore/MarmotConvergenceEngine.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/protocolCore/MarmotPublishGate.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/marmot/protocolCore/MlsCandidateStateEngine.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/mls/crypto/Hpke.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/mls/crypto/MlsCryptoProvider.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/mls/crypto/X25519.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/mls/group/MlsGroup.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/mls/group/MlsGroupState.kt # quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip44Encryption/SharedKeyCache.kt # quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/experimental/zapstore/identityProof/IdentityProofEventTest.kt # quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/marmot/MarmotGroupImageTest.kt # quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/marmot/protocolCore/MlsCandidateGraphTest.kt # quartz/src/commonTest/kotlin/com/vitorpamplona/quartz/mls/interop/WelcomeInteropTest.kt # quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/experimental/zapstore/identityProof/CertificateSignature.jvmAndroid.kt # quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/cordn/interop/TsMlsFixtures.kt # quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/experimental/zapstore/identityProof/IdentityProofVerificationTest.kt # quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/marmot/appComponents/CurrentProfileWelcomeTest.kt # quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/mls/HpkeTest.kt # quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/mls/MlsConformanceTest.kt # quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/mls/MlsGroupTest.kt # quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/mls/X25519Test.kt