nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Adds protections for calculating zap amounts without a private key

Browse Source
This commit is contained in:
Vitor Pamplona
2023-05-05 13:49:18 -04:00
parent cffcc158f5
commit 86adac95c9
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+14 -9
View File
@@ -178,17 +178,23 @@ class Account(
} }
fun isNIP47Author(pubkeyHex: String?): Boolean { fun isNIP47Author(pubkeyHex: String?): Boolean {
val privKey = zapPaymentRequest?.secret?.toByteArray() ?: loggedIn.privKey!! val privKey = zapPaymentRequest?.secret?.toByteArray() ?: loggedIn.privKey
if (privKey == null) return false
val pubKey = Utils.pubkeyCreate(privKey).toHexKey() val pubKey = Utils.pubkeyCreate(privKey).toHexKey()
return (pubKey == pubkeyHex) return (pubKey == pubkeyHex)
} }
fun decryptZapPaymentResponseEvent(zapResponseEvent: LnZapPaymentResponseEvent): Response? { fun decryptZapPaymentResponseEvent(zapResponseEvent: LnZapPaymentResponseEvent): Response? {
val myNip47 = zapPaymentRequest ?: return null val myNip47 = zapPaymentRequest ?: return null
return zapResponseEvent.response(
myNip47.secret?.toByteArray() ?: loggedIn.privKey!!, val privKey = myNip47.secret?.toByteArray() ?: loggedIn.privKey
myNip47.pubKeyHex.toByteArray() val pubKey = myNip47.pubKeyHex.toByteArray()
)
if (privKey == null) return null
return zapResponseEvent.response(privKey, pubKey)
} }
fun calculateIfNoteWasZappedByAccount(zappedNote: Note?): Boolean { fun calculateIfNoteWasZappedByAccount(zappedNote: Note?): Boolean {
@@ -196,10 +202,9 @@ class Account(
} }
fun calculateZappedAmount(zappedNote: Note?): BigDecimal { fun calculateZappedAmount(zappedNote: Note?): BigDecimal {
return zappedNote?.zappedAmount( val privKey = zapPaymentRequest?.secret?.toByteArray() ?: loggedIn.privKey
zapPaymentRequest?.secret?.toByteArray() ?: loggedIn.privKey!!, val pubKey = zapPaymentRequest?.pubKeyHex?.toByteArray()
zapPaymentRequest?.pubKeyHex?.toByteArray() return zappedNote?.zappedAmount(privKey, pubKey) ?: BigDecimal.ZERO
) ?: BigDecimal.ZERO
} }
fun sendZapPaymentRequestFor(bolt11: String, zappedNote: Note?, onResponse: (Response?) -> Unit) { fun sendZapPaymentRequestFor(bolt11: String, zappedNote: Note?, onResponse: (Response?) -> Unit) {