switch to bech32 everywhere

You can now use @npub, @note or @nsec to reference notes and pubkeys

Changelog-Changed: use bech32 ids everywhere
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2022-08-06 23:01:56 -07:00
parent cd9bd1b892
commit adacdbb764
5 changed files with 137 additions and 7 deletions

View File

@@ -32,15 +32,76 @@ func parse_post_reference(_ p: Parser) -> ReferencedId? {
return parse_nostr_ref_uri(p)
}
guard let id = parse_hexstr(p, len: 64) else {
if let ref = parse_post_mention(p, mention_type: typ) {
return ref
}
p.pos = start
return nil
}
func is_bech32_char(_ c: Character) -> Bool {
let contains = "qpzry9x8gf2tvdw0s3jn54khce6mua7l".contains(c)
return contains
}
func parse_post_mention(_ p: Parser, mention_type: MentionType) -> ReferencedId? {
if let id = parse_hexstr(p, len: 64) {
return ReferencedId(ref_id: id, relay_id: nil, key: mention_type.ref)
} else if let bech32_ref = parse_post_bech32_mention(p) {
return bech32_ref
} else {
return nil
}
}
func parse_post_bech32_mention(_ p: Parser) -> ReferencedId? {
let start = p.pos
if parse_str(p, "note") {
} else if parse_str(p, "npub") {
} else if parse_str(p, "nsec") {
} else {
return nil
}
if !parse_char(p, "1") {
p.pos = start
return nil
}
return ReferencedId(ref_id: id, relay_id: nil, key: typ.ref)
var end = p.pos
if consume_until(p, match: { c in !is_bech32_char(c) }) {
end = p.pos
} else {
p.pos = start
return nil
}
let sliced = String(substring(p.str, start: start, end: end))
guard let decoded = try? bech32_decode(sliced) else {
p.pos = start
return nil
}
let hex = hex_encode(decoded.data)
switch decoded.hrp {
case "note":
return ReferencedId(ref_id: hex, relay_id: nil, key: "e")
case "npub":
return ReferencedId(ref_id: hex, relay_id: nil, key: "p")
case "nsec":
guard let pubkey = privkey_to_pubkey(privkey: hex) else {
p.pos = start
return nil
}
return ReferencedId(ref_id: pubkey, relay_id: nil, key: "p")
default:
p.pos = start
return nil
}
}
/// Return a list of tags
func parse_post_blocks(content: String) -> [PostBlock] {
let p = Parser(pos: 0, str: content)

View File

@@ -58,6 +58,13 @@ func bech32_pubkey(_ pubkey: String) -> String? {
return bech32_encode(hrp: "npub", bytes)
}
func bech32_note_id(_ evid: String) -> String? {
guard let bytes = hex_decode(evid) else {
return nil
}
return bech32_encode(hrp: "note", bytes)
}
func generate_new_keypair() -> Keypair {
let key = try! secp256k1.Signing.PrivateKey()
let privkey = hex_encode(key.rawRepresentation)

View File

@@ -148,6 +148,16 @@ struct EventView: View {
}
extension View {
func pubkey_context_menu(bech32_pubkey: String) -> some View {
return self.contextMenu {
Button {
UIPasteboard.general.string = bech32_pubkey
} label: {
Label("Copy Account ID", systemImage: "doc.on.doc")
}
}
}
func event_context_menu(_ event: NostrEvent, privkey: String?) -> some View {
return self.contextMenu {
Button {
@@ -157,13 +167,13 @@ extension View {
}
Button {
UIPasteboard.general.string = "@" + event.pubkey
UIPasteboard.general.string = bech32_pubkey(event.pubkey) ?? event.pubkey
} label: {
Label("Copy User ID", systemImage: "tag")
}
Button {
UIPasteboard.general.string = "&" + event.id
UIPasteboard.general.string = bech32_note_id(event.id) ?? event.id
} label: {
Label("Copy Note ID", systemImage: "tag")
}

View File

@@ -104,6 +104,7 @@ struct ProfileView: View {
KeyView(pubkey: profile.pubkey)
.padding(.bottom, 10)
.pubkey_context_menu(bech32_pubkey: bech32_pubkey(profile.pubkey) ?? profile.pubkey)
Text(data?.about ?? "")
@@ -190,12 +191,14 @@ struct KeyView: View {
var body: some View {
let col = id_to_color(pubkey)
let bech32 = bech32_pubkey(pubkey) ?? pubkey
let half = bech32.count / 2
VStack {
Text("\(String(pubkey.prefix(32)))")
Text("\(String(bech32.prefix(half)))")
.foregroundColor(colorScheme == .light ? .black : col)
.font(.footnote.monospaced())
Text("\(String(pubkey.suffix(32)))")
Text("\(String(bech32.suffix(half)))")
.font(.footnote.monospaced())
.foregroundColor(colorScheme == .light ? .black : col)
}