lukechilds
/
sphinx-relay
mirror of https://github.com/lukechilds/sphinx-relay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix NESTED_PUBKEY_HASH

utxos
Evan Feenstra 4 years ago
parent
f3cfda262d
commit
f1e6a2d71e
6 changed files with 15 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dist/src/controllers/queries.js
  2. 2
      dist/src/controllers/queries.js.map
  3. 6
      dist/src/utils/lightning.js
  4. 2
      dist/src/utils/lightning.js.map
  5. 2
      src/controllers/queries.ts
  6. 8
      src/utils/lightning.ts

2
dist/src/controllers/queries.js
View File

@ -84,7 +84,7 @@ exports.receiveQuery = (payload) => __awaiter(void 0, void 0, void 0, function*
let result = '';
switch (q.type) {
case 'onchain_address':
const addy = yield lightning.newAddress('np2wkh');
const addy = yield lightning.newAddress(lightning.NESTED_PUBKEY_HASH);
const acc = {
date: new Date(),
pubkey: sender_pub_key,

2
dist/src/controllers/queries.js.map
View File

@ -1 +1 @@
{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/controllers/queries.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/controllers/queries.ts"],"names":[],"mappings":"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"}

6
dist/src/utils/lightning.js
View File

@ -144,7 +144,11 @@ const queryRoute = (pub_key, amt) => __awaiter(void 0, void 0, void 0, function*
});
});
exports.queryRoute = queryRoute;
function newAddress(type = 'np2wkh') {
exports.WITNESS_PUBKEY_HASH = 0;
exports.NESTED_PUBKEY_HASH = 1;
exports.UNUSED_WITNESS_PUBKEY_HASH = 2;
exports.UNUSED_NESTED_PUBKEY_HASH = 3;
function newAddress(type = exports.NESTED_PUBKEY_HASH) {
return __awaiter(this, void 0, void 0, function* () {
return new Promise(function (resolve, reject) {
return __awaiter(this, void 0, void 0, function* () {

2
dist/src/utils/lightning.js.map
View File

File diff suppressed because one or more lines are too long

2
src/controllers/queries.ts
View File

@ -84,7 +84,7 @@ export const receiveQuery = async (payload) => {
let result = ''
switch (q.type) {
case 'onchain_address':
const addy = await lightning.newAddress('np2wkh')
const addy = await lightning.newAddress(lightning.NESTED_PUBKEY_HASH)
const acc = {
date: new Date(),
pubkey: sender_pub_key,

8
src/utils/lightning.ts
View File

@ -136,8 +136,12 @@ const queryRoute = async (pub_key, amt) => {
})
}
export type NewAddressType = 'np2wkh'
export async function newAddress(type:NewAddressType='np2wkh'): Promise<string> {
export const WITNESS_PUBKEY_HASH = 0;
export const NESTED_PUBKEY_HASH = 1;
export const UNUSED_WITNESS_PUBKEY_HASH = 2;
export const UNUSED_NESTED_PUBKEY_HASH = 3;
export type NewAddressType = 0|1|2|3
export async function newAddress(type:NewAddressType=NESTED_PUBKEY_HASH): Promise<string> {
return new Promise(async function (resolve, reject) {
let lightning = await loadLightning()
lightning.newAddress(

Write Preview
Loading…
Cancel
Save