mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2024-11-20 18:21:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4127 from BlueWallet/fix-ln-address-onion

Browse Source 
FIX: lightning address should now work with .onion addresses
This commit is contained in:
GLaDOS 2021-10-28 22:29:48 +01:00 committed by GitHub
commit 0900cde7be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
class/lnurl.js
View File

@ -195,7 +195,7 @@ export default class Lnurl {
fixed: min === max,
min,
max,
domain: data.callback.match(/https:\/\/([^/]+)\//)[1],
domain: data.callback.match(/^(https|http):\/\/([^/]+)\//)[2],
metadata: data.metadata,
description,
image,

43
tests/unit/lnurl.test.js
View File

@ -217,6 +217,7 @@ describe('lightning address', function () {
it('can detect', async () => {
assert.ok(Lnurl.isLightningAddress('lnaddress@zbd.gg'));
assert.ok(Lnurl.isLightningAddress('avatar@st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion'));
assert.ok(Lnurl.isLightningAddress(' lnaddress@zbd.gg '));
assert.ok(Lnurl.isLightningAddress(' lnaddress@zbd.gg '));
assert.ok(Lnurl.isLightningAddress(' lnaddress@8.8.8.8 '));
@ -226,7 +227,9 @@ describe('lightning address', function () {
assert.ok(!Lnurl.isLightningAddress('@'));
assert.ok(!Lnurl.isLightningAddress('@a'));
assert.ok(!Lnurl.isLightningAddress('a@'));
});
it('works', async () => {
const LN = new Lnurl('lnaddress@zbd.gg');
// poor-man's mock:
@ -260,4 +263,44 @@ describe('lightning address', function () {
assert.strictEqual(requestedUri, 'https://zbd.gg/.well-known/lnurlp/lnaddress');
});
it('works with onion', async () => {
assert.ok(Lnurl.isLightningAddress('avatar@st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion'));
const LN = new Lnurl('avatar@st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion');
// poor-man's mock:
LN._fetchGet = LN.fetchGet;
let requestedUri = -1;
LN.fetchGet = actuallyRequestedUri => {
requestedUri = actuallyRequestedUri;
return {
status: 'OK',
callback: 'http://st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion/.well-known/lnurlp/avatar',
tag: 'payRequest',
maxSendable: 100000000,
minSendable: 1000,
metadata:
'[["text/identifier", "avatar@st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion"], ["text/plain", "Sats for avatar@st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion"]]',
commentAllowed: 0,
};
};
const lnurlpayPayload = await LN.callLnurlPayService();
assert.deepStrictEqual(lnurlpayPayload, {
amount: 1,
callback: 'http://st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion/.well-known/lnurlp/avatar',
commentAllowed: 0,
description: 'Sats for avatar@st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion',
domain: 'st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion',
fixed: false,
image: undefined,
max: 100000,
metadata:
'[["text/identifier", "avatar@st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion"], ["text/plain", "Sats for avatar@st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion"]]',
min: 1,
});
assert.strictEqual(requestedUri, 'http://st5owtpsa2e62yf64luxogbecj7lk3t5vmesshsnrzu2untyf2i4t4ad.onion/.well-known/lnurlp/avatar');
});
});