fix: include account in connector

src/extension/background-script/actions/setup/validateAccount.js

@@ -2,7 +2,7 @@ import connectors from "../../connectors";
 
 const validateAccount = async (message, sender) => {
   const account = message.args;
-  const connector = new connectors[account.connector](account.config);
+  const connector = new connectors[account.connector](account, account.config);
   await connector.init();
 
   try {

src/extension/background-script/connectors/citadel.ts

@@ -1,17 +1,19 @@
+import { Account } from "~/types";
+
 import Connector, {
+  CheckPaymentArgs,
+  CheckPaymentResponse,
   ConnectPeerResponse,
-  SendPaymentArgs,
-  SendPaymentResponse,
-  GetInfoResponse,
   GetBalanceResponse,
+  GetInfoResponse,
   GetInvoicesResponse,
+  KeysendArgs,
   MakeInvoiceArgs,
   MakeInvoiceResponse,
+  SendPaymentArgs,
+  SendPaymentResponse,
   SignMessageArgs,
   SignMessageResponse,
-  CheckPaymentArgs,
-  CheckPaymentResponse,
-  KeysendArgs,
 } from "./connector.interface";
 
 interface Config {
@@ -27,10 +29,12 @@ type RequestFunction = <ResponseType = unknown>(
 ) => Promise<ResponseType>;
 
 class CitadelConnector implements Connector {
+  account: Account;
   config: Config;
   jwt: string;
 
-  constructor(config: Config) {
+  constructor(account: Account, config: Config) {
+    this.account = account;
     this.config = config;
     this.jwt = "";
   }

src/extension/background-script/connectors/commando.ts

@@ -2,6 +2,7 @@ import Hex from "crypto-js/enc-hex";
 import UTF8 from "crypto-js/enc-utf8";
 import LnMessage from "lnmessage";
 import { v4 as uuidv4 } from "uuid";
+import { Account } from "~/types";
 
 import Connector, {
   CheckPaymentArgs,
@@ -110,10 +111,12 @@ const supportedMethods: string[] = [
 ];
 
 export default class Commando implements Connector {
+  account: Account;
   config: Config;
   ln: LnMessage;
 
-  constructor(config: Config) {
+  constructor(account: Account, config: Config) {
+    this.account = account;
     this.config = config;
     this.ln = new LnMessage({
       remoteNodePublicKey: this.config.pubkey,

src/extension/background-script/connectors/eclair.ts

@@ -1,20 +1,21 @@
 import Base64 from "crypto-js/enc-base64";
 import UTF8 from "crypto-js/enc-utf8";
+import { Account } from "~/types";
 
 import Connector, {
-  SendPaymentArgs,
-  SendPaymentResponse,
   CheckPaymentArgs,
   CheckPaymentResponse,
   ConnectPeerResponse,
+  GetBalanceResponse,
   GetInfoResponse,
   GetInvoicesResponse,
-  GetBalanceResponse,
+  KeysendArgs,
   MakeInvoiceArgs,
   MakeInvoiceResponse,
+  SendPaymentArgs,
+  SendPaymentResponse,
   SignMessageArgs,
   SignMessageResponse,
-  KeysendArgs,
 } from "./connector.interface";
 
 interface Config {
@@ -23,9 +24,11 @@ interface Config {
 }
 
 class Eclair implements Connector {
+  account: Account;
   config: Config;
 
-  constructor(config: Config) {
+  constructor(account: Account, config: Config) {
+    this.account = account;
     this.config = config;
   }
 

src/extension/background-script/connectors/galoy.ts

@@ -1,21 +1,21 @@
-import axios from "axios";
-import { AxiosRequestConfig } from "axios";
+import axios, { AxiosRequestConfig } from "axios";
 import lightningPayReq from "bolt11";
+import { Account } from "~/types";
 
 import Connector, {
-  SendPaymentArgs,
-  SendPaymentResponse,
   CheckPaymentArgs,
   CheckPaymentResponse,
   ConnectPeerResponse,
+  GetBalanceResponse,
   GetInfoResponse,
   GetInvoicesResponse,
-  GetBalanceResponse,
+  KeysendArgs,
   MakeInvoiceArgs,
   MakeInvoiceResponse,
+  SendPaymentArgs,
+  SendPaymentResponse,
   SignMessageArgs,
   SignMessageResponse,
-  KeysendArgs,
 } from "./connector.interface";
 
 interface Config {
@@ -25,9 +25,11 @@ interface Config {
 }
 
 class Galoy implements Connector {
+  account: Account;
   config: Config;
 
-  constructor(config: Config) {
+  constructor(account: Account, config: Config) {
+    this.account = account;
     this.config = config;
   }
 

src/extension/background-script/connectors/kollider.ts

@@ -5,6 +5,7 @@ import sha256 from "crypto-js/sha256";
 import { ACCOUNT_CURRENCIES } from "~/common/constants";
 import { getBTCToSats, getSatsToBTC } from "~/common/utils/currencyConvert";
 import HashKeySigner from "~/common/utils/signer";
+import { Account } from "~/types";
 
 import Connector, {
   CheckPaymentArgs,
@@ -48,6 +49,7 @@ const defaultHeaders = {
 };
 
 export default class Kollider implements Connector {
+  account: Account;
   config: Config;
   access_token?: string;
   access_token_created?: number;
@@ -58,7 +60,8 @@ export default class Kollider implements Connector {
   currency: KolliderCurrencies;
   currentAccountId: string | null;
 
-  constructor(config: Config) {
+  constructor(account: Account, config: Config) {
+    this.account = account;
     this.config = config;
     this.currency = config.currency;
     this.currentAccountId = null;

src/extension/background-script/connectors/lnbits.ts

@@ -3,23 +3,24 @@ import Hex from "crypto-js/enc-hex";
 import sha256 from "crypto-js/sha256";
 import utils from "~/common/lib/utils";
 import HashKeySigner from "~/common/utils/signer";
+import { Account } from "~/types";
 
 import state from "../state";
 import Connector, {
-  SendPaymentArgs,
-  SendPaymentResponse,
   CheckPaymentArgs,
   CheckPaymentResponse,
   ConnectorInvoice,
   ConnectPeerResponse,
+  GetBalanceResponse,
   GetInfoResponse,
   GetInvoicesResponse,
-  GetBalanceResponse,
+  KeysendArgs,
   MakeInvoiceArgs,
   MakeInvoiceResponse,
+  SendPaymentArgs,
+  SendPaymentResponse,
   SignMessageArgs,
   SignMessageResponse,
-  KeysendArgs,
 } from "./connector.interface";
 
 interface Config {
@@ -28,9 +29,11 @@ interface Config {
 }
 
 class LnBits implements Connector {
+  account: Account;
   config: Config;
 
-  constructor(config: Config) {
+  constructor(account: Account, config: Config) {
+    this.account = account;
     this.config = config;
   }
 

src/extension/background-script/connectors/lnc.ts

@@ -1,5 +1,4 @@
-import LNC from "@lightninglabs/lnc-web";
-import { CredentialStore } from "@lightninglabs/lnc-web";
+import LNC, { CredentialStore } from "@lightninglabs/lnc-web";
 import Base64 from "crypto-js/enc-base64";
 import Hex from "crypto-js/enc-hex";
 import UTF8 from "crypto-js/enc-utf8";
@@ -8,23 +7,24 @@ import SHA256 from "crypto-js/sha256";
 import snakeCase from "lodash.snakecase";
 import { encryptData } from "~/common/lib/crypto";
 import utils from "~/common/lib/utils";
+import { Account } from "~/types";
 
 import state from "../state";
 import Connector, {
   CheckPaymentArgs,
   CheckPaymentResponse,
-  SendPaymentArgs,
-  SendPaymentResponse,
-  GetInfoResponse,
+  ConnectorInvoice,
+  ConnectPeerResponse,
   GetBalanceResponse,
+  GetInfoResponse,
   GetInvoicesResponse,
-  ConnectPeerResponse,
-  ConnectorInvoice,
+  KeysendArgs,
   MakeInvoiceArgs,
   MakeInvoiceResponse,
+  SendPaymentArgs,
+  SendPaymentResponse,
   SignMessageArgs,
   SignMessageResponse,
-  KeysendArgs,
 } from "./connector.interface";
 
 interface Config {
@@ -82,9 +82,11 @@ const snakeCaseObjectDeep = (value: FixMe): FixMe => {
 };
 
 class LncCredentialStore implements CredentialStore {
+  account: Account;
   config: Config;
 
-  constructor(config: Config) {
+  constructor(account: Account, config: Config) {
+    this.account = account;
     this.config = config;
   }
 
@@ -136,7 +138,7 @@ class LncCredentialStore implements CredentialStore {
   private async _save() {
     const accounts = state.getState().accounts;
     const password = state.getState().password as string;
-    const currentAccountId = state.getState().currentAccountId as string;
+    const currentAccountId = this.account.id;
     accounts[currentAccountId].config = encryptData(this.config, password);
     state.setState({ accounts });
     await state.getState().saveToStorage();
@@ -145,13 +147,15 @@ class LncCredentialStore implements CredentialStore {
 }
 
 class Lnc implements Connector {
+  account: Account;
   config: Config;
   lnc: FixMe;
 
-  constructor(config: Config) {
+  constructor(account: Account, config: Config) {
+    this.account = account;
     this.config = config;
     this.lnc = new LNC({
-      credentialStore: new LncCredentialStore(config),
+      credentialStore: new LncCredentialStore(account, config),
     });
   }
 

src/extension/background-script/connectors/lnd.ts

@@ -4,6 +4,7 @@ import UTF8 from "crypto-js/enc-utf8";
 import WordArray from "crypto-js/lib-typedarrays";
 import SHA256 from "crypto-js/sha256";
 import utils from "~/common/lib/utils";
+import { Account } from "~/types";
 
 import Connector, {
   CheckPaymentArgs,
@@ -135,9 +136,11 @@ const pathTemplateParser = (
 };
 
 class Lnd implements Connector {
+  account: Account;
   config: Config;
 
-  constructor(config: Config) {
+  constructor(account: Account, config: Config) {
+    this.account = account;
     this.config = config;
   }
 

src/extension/background-script/connectors/lndhub.ts

@@ -7,6 +7,7 @@ import hmacSHA256 from "crypto-js/hmac-sha256";
 import sha256 from "crypto-js/sha256";
 import utils from "~/common/lib/utils";
 import HashKeySigner from "~/common/utils/signer";
+import { Account } from "~/types";
 
 import state from "../state";
 import Connector, {
@@ -43,14 +44,16 @@ const defaultHeaders = {
 };
 
 export default class LndHub implements Connector {
+  account: Account;
   config: Config;
   access_token?: string;
   access_token_created?: number;
   refresh_token?: string;
   refresh_token_created?: number;
   noRetry?: boolean;
 
-  constructor(config: Config) {
+  constructor(account: Account, config: Config) {
+    this.account = account;
     this.config = config;
   }
 

src/extension/background-script/state.ts

@@ -81,7 +81,7 @@ const state = createState<State>((set, get) => ({
     const password = get().password as string;
     const config = decryptData(account.config as string, password);
 
-    const connector = new connectors[account.connector](config);
+    const connector = new connectors[account.connector](account, config);
     await connector.init();
 
     set({ connector: connector });