rename account id

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/invoices.ts b/lib/invoices.ts
index 0094c6d7..4626e257 100644
--- a/lib/invoices.ts
+++ b/lib/invoices.ts
@@ -13,7 +13,7 @@ let lq = rpc(config.liquid);
 export let generate = async ({ invoice, user }) => {
   let {
     bolt11,
-    account,
+    aid,
     currency,
     expiry,
     fiat,
@@ -25,19 +25,18 @@ export let generate = async ({ invoice, user }) => {
     memo,
     memoPrompt,
     prompt,
-    type,
+    type = types.lightning,
     webhook,
     secret,
   } = invoice;
 
+  let account = await g(`account:${aid}`);
   amount = parseInt(amount || 0);
   tip = parseInt(tip) || null;
 
   if (user) user = await getUser(user.username);
   if (!user) fail("user not provided");
 
-  if (account === user.id) account = undefined;
-
   let rates = await g("rates");
   if (!currency) currency = user.currency;
   if (!rate) rate = rates[currency];
@@ -51,8 +50,9 @@ export let generate = async ({ invoice, user }) => {
 
   let hash, text;
 
-  if (account) {
-    let node = rpc({ ...config.bitcoin, wallet: account });
+  if (account.seed) {
+    type = "bitcoin";
+    let node = rpc({ ...config[type], wallet: aid });
     hash = await node.getNewAddress();
     text = bip21(hash, invoice);
   } else if (type === types.lightning) {
@@ -91,7 +91,7 @@ export let generate = async ({ invoice, user }) => {
 
   invoice = {
     amount,
-    account,
+    aid,
     created: Date.now(),
     currency,
     hash,