a big bundle of conversions and other changes.
This commit is contained in:
@@ -12,20 +12,16 @@ var _ nostr.Keyer = (*KeySigner)(nil)
|
||||
|
||||
// KeySigner is a signer that holds the private key in memory
|
||||
type KeySigner struct {
|
||||
sk string
|
||||
pk string
|
||||
sk [32]byte
|
||||
pk nostr.PubKey
|
||||
|
||||
conversationKeys *xsync.MapOf[string, [32]byte]
|
||||
conversationKeys *xsync.MapOf[nostr.PubKey, [32]byte]
|
||||
}
|
||||
|
||||
// NewPlainKeySigner creates a new KeySigner from a private key.
|
||||
// Returns an error if the private key is invalid.
|
||||
func NewPlainKeySigner(sec string) (KeySigner, error) {
|
||||
pk, err := nostr.GetPublicKey(sec)
|
||||
if err != nil {
|
||||
return KeySigner{}, err
|
||||
}
|
||||
return KeySigner{sec, pk, xsync.NewMapOf[string, [32]byte]()}, nil
|
||||
func NewPlainKeySigner(sec [32]byte) (KeySigner, error) {
|
||||
return KeySigner{sec, nostr.GetPublicKey(sec), xsync.NewMapOf[nostr.PubKey, [32]byte]()}, nil
|
||||
}
|
||||
|
||||
// SignEvent signs the provided event with the signer's private key.
|
||||
@@ -33,11 +29,11 @@ func NewPlainKeySigner(sec string) (KeySigner, error) {
|
||||
func (ks KeySigner) SignEvent(ctx context.Context, evt *nostr.Event) error { return evt.Sign(ks.sk) }
|
||||
|
||||
// GetPublicKey returns the public key associated with this signer.
|
||||
func (ks KeySigner) GetPublicKey(ctx context.Context) (string, error) { return ks.pk, nil }
|
||||
func (ks KeySigner) GetPublicKey(ctx context.Context) (nostr.PubKey, error) { return ks.pk, nil }
|
||||
|
||||
// Encrypt encrypts a plaintext message for a recipient using NIP-44.
|
||||
// It caches conversation keys for efficiency in repeated operations.
|
||||
func (ks KeySigner) Encrypt(ctx context.Context, plaintext string, recipient string) (string, error) {
|
||||
func (ks KeySigner) Encrypt(ctx context.Context, plaintext string, recipient nostr.PubKey) (string, error) {
|
||||
ck, ok := ks.conversationKeys.Load(recipient)
|
||||
if !ok {
|
||||
var err error
|
||||
@@ -52,7 +48,7 @@ func (ks KeySigner) Encrypt(ctx context.Context, plaintext string, recipient str
|
||||
|
||||
// Decrypt decrypts a base64-encoded ciphertext from a sender using NIP-44.
|
||||
// It caches conversation keys for efficiency in repeated operations.
|
||||
func (ks KeySigner) Decrypt(ctx context.Context, base64ciphertext string, sender string) (string, error) {
|
||||
func (ks KeySigner) Decrypt(ctx context.Context, base64ciphertext string, sender nostr.PubKey) (string, error) {
|
||||
ck, ok := ks.conversationKeys.Load(sender)
|
||||
if !ok {
|
||||
var err error
|
||||
|
||||
Reference in New Issue
Block a user