Simplify wallet creation

This commit is contained in:
Daniel Lugo 2021-12-27 14:31:49 -04:00
parent e47a67acb4
commit f09fc2be66

View file

@ -762,8 +762,12 @@ module.exports = async (
}) })
} }
walletUnlocker.genSeed({}, async (genSeedErr, genSeedResponse) => { const [genSeedErr, genSeedResponse] = await new Promise(res => {
try { walletUnlocker.genSeed({}, (_genSeedErr, _genSeedResponse) => {
res([_genSeedErr, _genSeedResponse])
})
})
if (genSeedErr) { if (genSeedErr) {
logger.debug('GenSeed Error:', genSeedErr) logger.debug('GenSeed Error:', genSeedErr)
@ -785,6 +789,7 @@ module.exports = async (
} }
logger.debug('GenSeed:', genSeedResponse) logger.debug('GenSeed:', genSeedResponse)
const mnemonicPhrase = genSeedResponse.cipher_seed_mnemonic const mnemonicPhrase = genSeedResponse.cipher_seed_mnemonic
const walletArgs = { const walletArgs = {
wallet_password: Buffer.from(password, 'utf8'), wallet_password: Buffer.from(password, 'utf8'),
@ -801,15 +806,17 @@ module.exports = async (
) )
const trustedKeys = await Storage.get('trustedPKs') const trustedKeys = await Storage.get('trustedPKs')
await Storage.setItem('trustedPKs', [ await Storage.setItem('trustedPKs', [...(trustedKeys || []), publicKey])
...(trustedKeys || []),
publicKey
])
const [initWalletErr, initWalletResponse] = await new Promise(res => {
walletUnlocker.initWallet( walletUnlocker.initWallet(
walletArgs, walletArgs,
async (initWalletErr, initWalletResponse) => { (_initWalletErr, _initWalletResponse) => {
try { res([_initWalletErr, _initWalletResponse])
}
)
})
if (initWalletErr) { if (initWalletErr) {
logger.error('initWallet Error:', initWalletErr.message) logger.error('initWallet Error:', initWalletErr.message)
const healthResponse = await checkHealth() const healthResponse = await checkHealth()
@ -828,6 +835,7 @@ module.exports = async (
success: false success: false
}) })
} }
logger.info('initWallet:', initWalletResponse) logger.info('initWallet:', initWalletResponse)
const waitUntilFileExists = seconds => { const waitUntilFileExists = seconds => {
@ -850,7 +858,7 @@ module.exports = async (
const token = await auth.generateToken() const token = await auth.generateToken()
setTimeout(() => { setTimeout(() => {
channelRequest(invite) channelRequest()
}, 30 * 1000) }, 30 * 1000)
return res.json({ return res.json({
mnemonicPhrase, mnemonicPhrase,
@ -878,23 +886,6 @@ module.exports = async (
errorMessage: err errorMessage: err
}) })
} }
}
)
} catch (err) {
logger.error(err)
return res.status(500).json({
field: 'unknown',
errorMessage: err.message || err
})
}
})
} catch (err) {
logger.error(err)
return res.status(500).json({
field: 'unknown',
errorMessage: err
})
}
}) })
app.post('/api/lnd/wallet/existing', async (req, res) => { app.post('/api/lnd/wallet/existing', async (req, res) => {