cleanup imports with new eslint rule to keep imports organized (#722)

* cleanup imports with new eslint rule to keep imports organized

* updated lock file

* we shouldnt remove package-lock in the docker file and added new package-lock.json

* removed yarn.lock

.eslintrc

@@ -2,7 +2,9 @@
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
-    "prettier"
+    "prettier",
+		"plugin:import/recommended",
+		"plugin:import/typescript",
   ],
   "rules": {
     "no-async-promise-executor": 1,
@@ -11,7 +13,8 @@
     "@typescript-eslint/no-empty-function": 1,
     "@typescript-eslint/no-unused-vars": 1,
     "@typescript-eslint/no-explicit-any": 1,
-    "@typescript-eslint/no-non-null-assertion": 1
+    "@typescript-eslint/no-non-null-assertion": 1,
+		"import/order": 2
   },
   "parser": "@typescript-eslint/parser",
   "parserOptions": {

Dockerfile

@@ -11,8 +11,6 @@ RUN which python3
 RUN apt install -y g++ gcc libmcrypt-dev
 RUN apt-get -y install git
 
-RUN rm ./package-lock.json
-
 RUN npm install
 
 RUN cp /relay/config/app.json /relay/dist/config/app.json

package.json

@@ -19,7 +19,7 @@
     "build-binaries": "rm -rf dist/ && tsc && cp config/app.json dist/config/app.json && cp config/config.json dist/config/config.json && pkg . --target node12-alpine-x64,node12-macos-x64 --out-path binaries",
     "start-ecs": "cp config/app.json dist/config/app.json && cp config/config.json dist/config/config.json && export NODE_ENV=production && node --max-old-space-size=128 dist/app.js",
     "start-ecs-inspect": "cp config/app.json dist/config/app.json && cp config/config.json dist/config/config.json && export NODE_ENV=production && node --inspect --max-old-space-size=128 dist/app.js",
-    "lint": "eslint src --fix --max-warnings 457",
+    "lint": "eslint src --fix --max-warnings 438",
     "postinstall": "git apply protobuf_long.patch"
   },
   "keywords": [],
@@ -130,6 +130,7 @@
     "ava-http": "^1.0.0",
     "eslint": "^7.30.0",
     "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-import": "^2.27.5",
     "husky": "^7.0.1",
     "prettier": "^2.3.2",
     "pretty-quick": "^3.1.1",

src/controllers/actionHistory.ts

@@ -1,6 +1,6 @@
+import { Response } from 'express'
 import { models } from '../models'
 import { Req } from '../types'
-import { Response } from 'express'
 import { success, failure } from '../utils/res'
 import { asyncForEach } from '../helpers'
 import constants from '../constants'

src/controllers/api/personal.ts

@@ -1,6 +1,6 @@
-import * as meme from '../../utils/meme'
 import * as FormData from 'form-data'
 import fetch from 'node-fetch'
+import * as meme from '../../utils/meme'
 import * as people from '../../utils/people'
 import {
   models,

src/controllers/auth.ts

@@ -1,9 +1,9 @@
+import * as fs from 'fs'
 import { createJWT, scopes } from '../utils/jwt'
 import { success, failure } from '../utils/res'
 import { loadConfig } from '../utils/config'
 import * as tribes from '../utils/tribes'
 import { generateTransportTokenKeys } from '../utils/cert'
-import * as fs from 'fs'
 import { Req } from '../types'
 
 const config = loadConfig()

src/controllers/botapi/broadcast.ts

@@ -1,13 +1,13 @@
+import * as short from 'short-uuid'
 import * as network from '../../network'
 import { models, Message, ChatRecord } from '../../models'
-import * as short from 'short-uuid'
 import * as rsa from '../../crypto/rsa'
 import * as jsonUtils from '../../utils/json'
 import * as socket from '../../utils/socket'
 import constants from '../../constants'
 import { sphinxLogger } from '../../utils/logger'
-import { Action, validateAction } from './index'
 import { ChatPlusMembers } from '../../network/send'
+import { Action, validateAction } from './index'
 
 export default async function broadcast(a: Action): Promise<void> {
   const {

src/controllers/botapi/dm.ts

@@ -1,11 +1,11 @@
-import { Action, validateAction } from './index'
-import { sphinxLogger } from '../../utils/logger'
-import { models, ChatRecord, ContactRecord } from '../../models'
 import * as md5 from 'md5'
 import * as short from 'short-uuid'
+import { sphinxLogger } from '../../utils/logger'
+import { models, ChatRecord, ContactRecord } from '../../models'
 import constants from '../../constants'
 import * as network from '../../network'
 import * as rsa from '../../crypto/rsa'
+import { Action, validateAction } from './index'
 
 export default async function dm(a: Action): Promise<void> {
   const { amount, content, pubkey } = a

src/controllers/botapi/index.ts

@@ -1,3 +1,5 @@
+/* eslint-disable import/no-unresolved */
+import { WebhookEvent } from '@octokit/webhooks-types'
 import * as network from '../../network'
 import {
   Bot,
@@ -12,16 +14,15 @@ import {
 import { success, failure, unauthorized } from '../../utils/res'
 import constants from '../../constants'
 import { getTribeOwnersChatByUUID } from '../../utils/tribes'
-import broadcast from './broadcast'
-import pay from './pay'
-import direct_message from './dm'
 import { sphinxLogger, logging } from '../../utils/logger'
 import * as hmac from '../../crypto/hmac'
 import { GITBOT_UUID, GitBotMeta, Repo, GITBOT_PIC } from '../../builtin/git'
 import { asyncForEach } from '../../helpers'
 import { Req, Res } from '../../types'
-import { WebhookEvent } from '@octokit/webhooks-types'
 import { processGithook, WebhookEventName } from '../../utils/githook'
+import direct_message from './dm'
+import pay from './pay'
+import broadcast from './broadcast'
 
 /*
 hexdump -n 8 -e '4/4 "%08X" 1 "\n"' /dev/random

src/controllers/botapi/pay.ts

@@ -1,12 +1,12 @@
+import * as short from 'short-uuid'
 import * as network from '../../network'
 import { models, Message } from '../../models'
-import * as short from 'short-uuid'
 import * as jsonUtils from '../../utils/json'
 import * as socket from '../../utils/socket'
 import constants from '../../constants'
 import { sphinxLogger } from '../../utils/logger'
-import { Action, validateAction } from './index'
 import { errMsgString } from '../../utils/errMsgString'
+import { Action, validateAction } from './index'
 
 export default async function pay(a: Action): Promise<void> {
   const { amount, bot_name, msg_uuid, reply_uuid, recipient_id, parent_id } = a

src/controllers/bots.ts

@@ -1,21 +1,21 @@
-import * as tribes from '../utils/tribes'
 import * as crypto from 'crypto'
-import { models, Message, Contact, Chat, Bot, BotMember } from '../models'
-import * as jsonUtils from '../utils/json'
-import { success, failure } from '../utils/res'
-import * as network from '../network'
-import { finalAction, Action } from './botapi'
-import * as socket from '../utils/socket'
 import fetch from 'node-fetch'
 import * as SphinxBot from 'sphinx-bot'
+import * as short from 'short-uuid'
+import * as socket from '../utils/socket'
 import { BotMsg, Payload } from '../network/interfaces'
 import constants from '../constants'
 import { logging, sphinxLogger } from '../utils/logger'
-import * as short from 'short-uuid'
+import * as network from '../network'
+import { success, failure } from '../utils/res'
+import * as jsonUtils from '../utils/json'
+import { models, Message, Contact, Chat, Bot, BotMember } from '../models'
+import * as tribes from '../utils/tribes'
 import { Req, Res } from '../types'
 import { updateGitBotPat } from '../builtin/git'
 import * as rsa from '../crypto/rsa'
 import { getTransportKey } from '../utils/cert'
+import { finalAction, Action } from './botapi'
 
 /**
 

src/controllers/chatTribes.ts

@@ -1,3 +1,5 @@
+import { Op } from 'sequelize'
+import { Response } from 'express'
 import {
   models,
   Chat,
@@ -16,12 +18,10 @@ import * as socket from '../utils/socket'
 import * as tribes from '../utils/tribes'
 import { sendNotification } from '../hub'
 import { personalizeMessage, decryptMessage } from '../utils/msg'
-import { Op } from 'sequelize'
 import constants from '../constants'
 import { logging, sphinxLogger } from '../utils/logger'
 import type { Tribe } from '../models/ts/tribe'
 import { Req, Res } from '../types'
-import { Response } from 'express'
 
 /**
  * @function joinTribe

src/controllers/chats.ts

@@ -1,3 +1,4 @@
+import * as md5 from 'md5'
 import {
   Chat,
   ChatRecord,
@@ -14,20 +15,19 @@ import * as network from '../network'
 import { Payload, ChatMember as ChatMemberNetwork } from '../network'
 import * as socket from '../utils/socket'
 import { sendNotification } from '../hub'
-import * as md5 from 'md5'
 import * as tribes from '../utils/tribes'
 import * as timers from '../utils/timers'
-import {
-  replayChatHistory,
-  createTribeChatParams,
-  addPendingContactIdsToChat,
-} from './chatTribes'
 import constants from '../constants'
 import { logging, sphinxLogger } from '../utils/logger'
 import { Req, Res } from '../types'
 import { asyncForEach } from '../helpers'
 import { loadConfig } from '../utils/config'
 import { errMsgString } from '../utils/errMsgString'
+import {
+  replayChatHistory,
+  createTribeChatParams,
+  addPendingContactIdsToChat,
+} from './chatTribes'
 
 const config = loadConfig()
 

src/controllers/contacts.ts

@@ -1,3 +1,6 @@
+import * as crypto from 'crypto'
+import { Op } from 'sequelize'
+import * as moment from 'moment'
 import {
   Contact,
   ContactRecord,
@@ -8,20 +11,17 @@ import {
   ChatMember,
   models,
 } from '../models'
-import * as crypto from 'crypto'
 import * as socket from '../utils/socket'
 import * as helpers from '../helpers'
 import * as jsonUtils from '../utils/json'
 import { success, failure } from '../utils/res'
 import password from '../utils/password'
-import { Op } from 'sequelize'
 import constants from '../constants'
 import * as tribes from '../utils/tribes'
 import * as network from '../network'
 import { Payload } from '../network'
 import { isProxy, generateNewExternalUser } from '../utils/proxy'
 import { logging, sphinxLogger } from '../utils/logger'
-import * as moment from 'moment'
 import * as rsa from '../crypto/rsa'
 import { getAndDecryptTransportToken, getTransportKey } from '../utils/cert'
 import { Req, Res } from '../types'
@@ -728,6 +728,7 @@ export const getLatestContacts = async (req: Req, res: Res): Promise<void> => {
 
   try {
     const dateToReturn = decodeURI(req.query.date as string)
+    /* eslint-disable import/namespace */
     const local = moment.utc(dateToReturn).local().toDate()
     const where: { tenant: number; updatedAt: { [Op.gte]: Date } } = {
       updatedAt: { [Op.gte]: local },

src/controllers/contentFeedStatus.ts

@@ -1,6 +1,6 @@
+import { Response } from 'express'
 import { ContentFeedStatusRecord, models } from '../models'
 import { Req } from '../types'
-import { Response } from 'express'
 import { success, failure } from '../utils/res'
 import { logging, sphinxLogger } from '../utils/logger'
 

src/controllers/details.ts

@@ -1,12 +1,12 @@
+import * as readLastLines from 'read-last-lines'
+import { Op } from 'sequelize'
 import * as Lightning from '../grpc/lightning'
 import { success, failure } from '../utils/res'
-import * as readLastLines from 'read-last-lines'
 import { nodeinfo } from '../utils/nodeinfo'
 import constants from '../constants'
 import { models, Contact, Chat } from '../models'
 import { loadConfig } from '../utils/config'
 import { getAppVersionsFromHub } from '../hub'
-import { Op } from 'sequelize'
 import { sphinxLogger } from '../utils/logger'
 import { Req } from '../types'
 

src/controllers/getFeeds.ts

@@ -1,10 +1,10 @@
+import { Response } from 'express'
+import fetch from 'node-fetch'
 import { ActionHistoryRecord, models } from '../models'
 import { Req } from '../types'
-import { Response } from 'express'
 import { success, failure } from '../utils/res'
 import * as feedsHelper from '../utils/feeds'
 import { loadConfig } from '../utils/config'
-import fetch from 'node-fetch'
 
 export async function getFeeds(
   req: Req,

src/controllers/index.ts

@@ -1,5 +1,13 @@
+import rateLimit from 'express-rate-limit'
 import { models, Message } from '../models'
 import { proxyAdminMiddleware } from '../auth'
+import * as gitinfo from '../utils/gitinfo'
+import * as timers from '../utils/timers'
+import * as builtInBots from '../builtin'
+import constants from '../constants'
+import { failure } from '../utils/res'
+import { Req } from '../types'
+import { initializeCronJobsForCallRecordings } from '../builtin/utill/callRecording'
 import * as chats from './chats'
 import * as chatTribes from './chatTribes'
 import * as bots from './bots'
@@ -15,22 +23,14 @@ import * as uploads from './uploads'
 import * as confirmations from './confirmations'
 import * as actions from './botapi'
 import * as queries from './queries'
-import * as gitinfo from '../utils/gitinfo'
-import * as timers from '../utils/timers'
-import * as builtInBots from '../builtin'
 import * as admin from './admin'
-import constants from '../constants'
 import * as feed from './feed'
-import { failure } from '../utils/res'
 import * as auth from './auth'
 import * as personal from './api/personal'
 import * as lsats from './lsats'
-import { Req } from '../types'
 import * as action from './actionHistory'
 import * as feeds from './getFeeds'
 import * as contentFeedStatus from './contentFeedStatus'
-import { initializeCronJobsForCallRecordings } from '../builtin/utill/callRecording'
-import rateLimit from 'express-rate-limit'
 
 const limiter = rateLimit({
   windowMs: 1000, // 15 minutes

src/controllers/invites.ts

@@ -1,12 +1,12 @@
-import { models, Invite, Contact } from '../models'
 import * as crypto from 'crypto'
+import { Response } from 'express'
+import { models, Invite, Contact } from '../models'
 import * as jsonUtils from '../utils/json'
 import { finishInviteInHub, createInviteInHub, payInviteInvoice } from '../hub'
 // import * as proxy from '../utils/proxy'
 import { failure } from '../utils/res'
 import { sphinxLogger } from '../utils/logger'
 import { Req } from '../types'
-import { Response } from 'express'
 
 export const finishInvite = async (
   req: Req,

src/controllers/invoices.ts

@@ -1,3 +1,6 @@
+import * as short from 'short-uuid'
+import * as bolt11 from '@boltz/bolt11'
+import { Response } from 'express'
 import { models, MessageRecord, ChatRecord } from '../models'
 import * as Lightning from '../grpc/lightning'
 import * as interfaces from '../grpc/interfaces'
@@ -7,16 +10,13 @@ import { decodePaymentRequest } from '../utils/decode'
 import * as helpers from '../helpers'
 import { sendNotification } from '../hub'
 import { success, failure } from '../utils/res'
-import { sendConfirmation } from './confirmations'
 import * as network from '../network'
 import { Payload } from '../network'
-import * as short from 'short-uuid'
 import constants from '../constants'
-import * as bolt11 from '@boltz/bolt11'
 import { sphinxLogger } from '../utils/logger'
 import { Req } from '../types'
-import { Response } from 'express'
 import { ChatPlusMembers } from '../network/send'
+import { sendConfirmation } from './confirmations'
 
 function stripLightningPrefix(s: string): string {
   if (s.toLowerCase().startsWith('lightning:')) return s.substring(10)

src/controllers/lsats.ts

@@ -1,9 +1,9 @@
 import { Lsat as LsatB } from 'lsat-js'
+import { Response, Request } from 'express'
 import { models, Lsat as LsatT } from '../models'
 import { logging, sphinxLogger } from '../utils/logger'
 import { failure, success } from '../utils/res'
 import * as Lightning from '../grpc/lightning'
-import { Response, Request } from 'express'
 import constants from '../constants'
 
 export interface LsatRequestBody {

src/controllers/media.ts

@@ -1,3 +1,5 @@
+import * as rp from 'request-promise'
+import * as short from 'short-uuid'
 import { models, Message, MediaKey } from '../models'
 import * as socket from '../utils/socket'
 import * as jsonUtils from '../utils/json'
@@ -5,14 +7,10 @@ import * as resUtils from '../utils/res'
 import * as helpers from '../helpers'
 import { sendNotification } from '../hub'
 import * as Lightning from '../grpc/lightning'
-import * as rp from 'request-promise'
 import { parseLDAT, tokenFromTerms, urlBase64FromBytes } from '../utils/ldat'
 import * as meme from '../utils/meme'
 import * as zbase32 from '../utils/zbase32'
-import * as schemas from './schemas'
-import { sendConfirmation } from './confirmations'
 import * as network from '../network'
-import * as short from 'short-uuid'
 import constants from '../constants'
 import { loadConfig } from '../utils/config'
 import { failure } from '../utils/res'
@@ -20,6 +18,8 @@ import { logging, sphinxLogger } from '../utils/logger'
 import { Req } from '../types'
 import { ChatPlusMembers } from '../network/send'
 import { errMsgString } from '../utils/errMsgString'
+import { sendConfirmation } from './confirmations'
+import * as schemas from './schemas'
 
 const config = loadConfig()
 

src/controllers/messages.ts

@@ -1,3 +1,7 @@
+import { Op, FindOptions } from 'sequelize'
+import { indexBy } from 'underscore'
+import * as short from 'short-uuid'
+import { CronJob } from 'cron'
 import {
   models,
   Message,
@@ -6,8 +10,6 @@ import {
   MessageRecord,
   ChatRecord,
 } from '../models'
-import { Op, FindOptions } from 'sequelize'
-import { indexBy } from 'underscore'
 import {
   sendNotification,
   resetNotifyTribeCount,
@@ -18,19 +20,17 @@ import * as jsonUtils from '../utils/json'
 import * as helpers from '../helpers'
 import { failure, success } from '../utils/res'
 import * as timers from '../utils/timers'
-import { sendConfirmation } from './confirmations'
 import * as network from '../network'
 import { Payload } from '../network'
 import type { SendMessageParams } from '../network'
-import * as short from 'short-uuid'
 import constants from '../constants'
 import { logging, sphinxLogger } from '../utils/logger'
 import { Req, Res } from '../types'
 import { ChatPlusMembers } from '../network/send'
 import { getCacheMsg } from '../utils/tribes'
-import { CronJob } from 'cron'
 import { loadConfig } from '../utils/config'
 import { onReceiveReversal } from '../utils/reversal'
+import { sendConfirmation } from './confirmations'
 
 interface ExtentedMessage extends Message {
   chat_id?: number

src/controllers/payment.ts

@@ -1,3 +1,5 @@
+import * as short from 'short-uuid'
+import { Op } from 'sequelize'
 import { Message, models } from '../models'
 import { sendNotification } from '../hub'
 import * as socket from '../utils/socket'
@@ -7,15 +9,13 @@ import { failure, success } from '../utils/res'
 import { tokenFromTerms } from '../utils/ldat'
 import * as network from '../network'
 import { Payload } from '../network'
-import * as short from 'short-uuid'
 import constants from '../constants'
-import { Op } from 'sequelize'
-import { anonymousKeysend } from './feed'
 import { sphinxLogger } from '../utils/logger'
 import { Req, Res } from '../types'
-import { sendConfirmation } from './confirmations'
 import { errMsgString } from '../utils/errMsgString'
 import { onReceiveReversal } from '../utils/reversal'
+import { anonymousKeysend } from './feed'
+import { sendConfirmation } from './confirmations'
 
 export const sendPayment = async (req: Req, res: Res): Promise<void> => {
   if (!req.owner) return failure(res, 'no owner')

src/controllers/queries.ts

@@ -1,13 +1,13 @@
+import * as short from 'short-uuid'
+import { Op } from 'sequelize'
+import fetch from 'node-fetch'
 import { success, failure } from '../utils/res'
 import { models, AccountingRecord, Accounting } from '../models'
 import * as network from '../network'
 import constants from '../constants'
-import * as short from 'short-uuid'
 import * as lightning from '../grpc/lightning'
 import { listUnspent, UTXO } from '../utils/wallet'
 import * as jsonUtils from '../utils/json'
-import { Op } from 'sequelize'
-import fetch from 'node-fetch'
 import * as helpers from '../helpers'
 import { isProxy } from '../utils/proxy'
 import { logging, sphinxLogger } from '../utils/logger'

src/controllers/subscriptions.ts

@@ -1,13 +1,13 @@
+import { CronJob } from 'cron'
+import * as moment from 'moment'
 import { models, Chat, Contact, Subscription, Message } from '../models'
 import { success, failure } from '../utils/res'
-import { CronJob } from 'cron'
 import { toCamel } from '../utils/case'
 import * as cronUtils from '../utils/cron'
 import * as socket from '../utils/socket'
 import * as jsonUtils from '../utils/json'
 import * as helpers from '../helpers'
 import * as rsa from '../crypto/rsa'
-import * as moment from 'moment'
 import * as network from '../network'
 import constants from '../constants'
 import { sphinxLogger } from '../utils/logger'

src/controllers/uploads.ts

@@ -1,8 +1,8 @@
-import { models } from '../models'
 import * as path from 'path'
+import * as multer from 'multer'
+import { models } from '../models'
 import { loadConfig } from '../utils/config'
 import { Req } from '../types'
-import * as multer from 'multer'
 
 const config = loadConfig()
 

src/grpc/greenlight.ts

@@ -1,15 +1,16 @@
 import * as fs from 'fs'
+import * as crypto from 'crypto'
 import * as grpc from '@grpc/grpc-js'
+import { loadConfig } from '../utils/config'
+import { sphinxLogger } from '../utils/logger'
 import { loadProto } from './proto'
+/* eslint-disable import/no-unresolved */
 import { NodeClient } from './types/greenlight/Node'
 import type { SchedulerClient } from './types/scheduler/Scheduler'
 import libhsmd from './libhsmd'
-import { loadConfig } from '../utils/config'
-import * as crypto from 'crypto'
 import * as interfaces from './interfaces'
 import { loadLightning } from './lightning'
 import * as Lightning from './lightning'
-import { sphinxLogger } from '../utils/logger'
 
 let GID: GreenlightIdentity
 

src/grpc/interfaces.ts

@@ -1,7 +1,7 @@
-import { loadConfig } from '../utils/config'
 import * as crypto from 'crypto'
-import { LND_KEYSEND_KEY } from './lightning'
 import * as long from 'long'
+import { loadConfig } from '../utils/config'
+import { LND_KEYSEND_KEY } from './lightning'
 import type { SendRequest } from './types/lnrpc_proxy/SendRequest'
 import type { GetinfoResponse__Output } from './types/cln/cln/GetinfoResponse'
 

src/grpc/lightning.ts

@@ -1,27 +1,33 @@
 import * as fs from 'fs'
-import * as grpc from '@grpc/grpc-js'
-import { loadProto } from './proto'
-import { LightningClient } from './types/lnrpc/Lightning'
-import { LightningClient as ProxyLightningClient } from './types/lnrpc_proxy/Lightning'
-import { NodeClient as GreenlightNodeClient } from './types/greenlight/Node'
-import { NodeClient } from './types/cln/cln/Node'
-import { RouterClient } from './types/routerrpc/Router'
-import { WalletUnlockerClient } from './types/lnrpc/WalletUnlocker'
-import { sleep } from '../helpers'
-import * as sha from 'js-sha256'
 import * as crypto from 'crypto'
+import * as grpc from '@grpc/grpc-js'
+import * as sha from 'js-sha256'
+import * as secp256k1 from 'secp256k1'
+import * as short from 'short-uuid'
+import { sleep } from '../helpers'
 import constants from '../constants'
 import { getMacaroon } from '../utils/macaroon'
 import { loadConfig } from '../utils/config'
 import { isProxy, loadProxyLightning } from '../utils/proxy'
 import { logging, sphinxLogger } from '../utils/logger'
-import * as interfaces from './interfaces'
 import * as zbase32 from '../utils/zbase32'
-import * as secp256k1 from 'secp256k1'
+import { Req } from '../types'
+import { loadProto } from './proto'
+/* eslint-disable import/no-unresolved */
+import { LightningClient } from './types/lnrpc/Lightning'
+/* eslint-disable import/no-unresolved */
+import { LightningClient as ProxyLightningClient } from './types/lnrpc_proxy/Lightning'
+/* eslint-disable import/no-unresolved */
+import { NodeClient as GreenlightNodeClient } from './types/greenlight/Node'
+/* eslint-disable import/no-unresolved */
+import { NodeClient } from './types/cln/cln/Node'
+/* eslint-disable import/no-unresolved */
+import { RouterClient } from './types/routerrpc/Router'
+/* eslint-disable import/no-unresolved */
+import { WalletUnlockerClient } from './types/lnrpc/WalletUnlocker'
+import * as interfaces from './interfaces'
 import libhsmd from './libhsmd'
 import { get_greenlight_grpc_uri } from './greenlight'
-import { Req } from '../types'
-import * as short from 'short-uuid'
 
 const config = loadConfig()
 const LND_IP = config.lnd_ip || 'localhost'

src/grpc/regular.ts

@@ -1,9 +1,9 @@
+import * as bolt11 from '@boltz/bolt11'
 import { models, Contact, Chat, Message } from '../models'
 import * as socket from '../utils/socket'
 import { sendNotification, sendInvoice } from '../hub'
 import * as jsonUtils from '../utils/json'
 import constants from '../constants'
-import * as bolt11 from '@boltz/bolt11'
 import { sphinxLogger } from '../utils/logger'
 
 const oktolog = true

src/grpc/subscribe.ts

@@ -1,10 +1,10 @@
-import { loadLightning } from './lightning'
 import * as network from '../network'
 import { tryToUnlockLND } from '../utils/unlock'
-import { receiveNonKeysend } from './regular'
-import * as interfaces from './interfaces'
 import { isProxy, getProxyRootPubkey } from '../utils/proxy'
 import { sphinxLogger, logging } from '../utils/logger'
+import { receiveNonKeysend } from './regular'
+import * as interfaces from './interfaces'
+import { loadLightning } from './lightning'
 
 const ERR_CODE_UNAVAILABLE = 14
 const ERR_CODE_STREAM_REMOVED = 2

src/grpc/types/cln/cln/CreateinvoiceResponse.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/cln/cln/DelinvoiceResponse.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/cln/cln/GetrouteRequest.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 export interface GetrouteRequest {
   id?: Buffer | Uint8Array | string

src/grpc/types/cln/cln/InvoiceRequest.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   AmountOrAny as _cln_AmountOrAny,
   AmountOrAny__Output as _cln_AmountOrAny__Output,
 } from '../cln/AmountOrAny'
-import type { Long } from '@grpc/proto-loader'
 
 export interface InvoiceRequest {
   description?: string

src/grpc/types/cln/cln/ListforwardsForwards.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/cln/cln/ListinvoicesInvoices.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/cln/cln/ListpeersPeersChannels.ts

@@ -1,5 +1,6 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   ListpeersPeersChannelsFeerate as _cln_ListpeersPeersChannelsFeerate,
   ListpeersPeersChannelsFeerate__Output as _cln_ListpeersPeersChannelsFeerate__Output,
@@ -28,7 +29,6 @@ import type {
   ListpeersPeersChannelsAlias as _cln_ListpeersPeersChannelsAlias,
   ListpeersPeersChannelsAlias__Output as _cln_ListpeersPeersChannelsAlias__Output,
 } from '../cln/ListpeersPeersChannelsAlias'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/cln/cln/ListpeersPeersChannelsHtlcs.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/cln/cln/ListsendpaysPayments.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/cln/cln/SendonionRequest.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   SendonionFirst_hop as _cln_SendonionFirst_hop,
   SendonionFirst_hop__Output as _cln_SendonionFirst_hop__Output,
@@ -8,7 +9,6 @@ import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 export interface SendonionRequest {
   onion?: Buffer | Uint8Array | string

src/grpc/types/cln/cln/SendonionResponse.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/cln/cln/SendpayRequest.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   SendpayRoute as _cln_SendpayRoute,
   SendpayRoute__Output as _cln_SendpayRoute__Output,
@@ -8,7 +9,6 @@ import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 export interface SendpayRequest {
   route?: _cln_SendpayRoute[]

src/grpc/types/cln/cln/SendpayResponse.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/cln/cln/WaitanyinvoiceResponse.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/cln/cln/WaitinvoiceResponse.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/cln/cln/WaitsendpayResponse.ts

@@ -1,10 +1,10 @@
 // Original file: proto/cln/node.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _cln_Amount,
   Amount__Output as _cln_Amount__Output,
 } from '../cln/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/cln/node.proto
 

src/grpc/types/greenlight/Feerate.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/greenlight.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   FeeratePreset as _greenlight_FeeratePreset,
   FeeratePreset__Output as _greenlight_FeeratePreset__Output,
 } from '../greenlight/FeeratePreset'
-import type { Long } from '@grpc/proto-loader'
 
 export interface Feerate {
   preset?: _greenlight_FeeratePreset

src/grpc/types/lnrpc/AMPInvoiceState.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   InvoiceHTLCState as _lnrpc_InvoiceHTLCState,
   InvoiceHTLCState__Output as _lnrpc_InvoiceHTLCState__Output,
 } from '../lnrpc/InvoiceHTLCState'
-import type { Long } from '@grpc/proto-loader'
 
 export interface AMPInvoiceState {
   state?: _lnrpc_InvoiceHTLCState

src/grpc/types/lnrpc/BakeMacaroonRequest.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   MacaroonPermission as _lnrpc_MacaroonPermission,
   MacaroonPermission__Output as _lnrpc_MacaroonPermission__Output,
 } from '../lnrpc/MacaroonPermission'
-import type { Long } from '@grpc/proto-loader'
 
 export interface BakeMacaroonRequest {
   permissions?: _lnrpc_MacaroonPermission[]

src/grpc/types/lnrpc/BatchOpenChannel.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   CommitmentType as _lnrpc_CommitmentType,
   CommitmentType__Output as _lnrpc_CommitmentType__Output,
 } from '../lnrpc/CommitmentType'
-import type { Long } from '@grpc/proto-loader'
 
 export interface BatchOpenChannel {
   node_pubkey?: Buffer | Uint8Array | string

src/grpc/types/lnrpc/BatchOpenChannelRequest.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   BatchOpenChannel as _lnrpc_BatchOpenChannel,
   BatchOpenChannel__Output as _lnrpc_BatchOpenChannel__Output,
 } from '../lnrpc/BatchOpenChannel'
-import type { Long } from '@grpc/proto-loader'
 
 export interface BatchOpenChannelRequest {
   channels?: _lnrpc_BatchOpenChannel[]

src/grpc/types/lnrpc/ChanPointShim.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   ChannelPoint as _lnrpc_ChannelPoint,
   ChannelPoint__Output as _lnrpc_ChannelPoint__Output,
@@ -8,7 +9,6 @@ import type {
   KeyDescriptor as _lnrpc_KeyDescriptor,
   KeyDescriptor__Output as _lnrpc_KeyDescriptor__Output,
 } from '../lnrpc/KeyDescriptor'
-import type { Long } from '@grpc/proto-loader'
 
 export interface ChanPointShim {
   amt?: number | string | Long

src/grpc/types/lnrpc/Channel.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   HTLC as _lnrpc_HTLC,
   HTLC__Output as _lnrpc_HTLC__Output,
@@ -12,7 +13,6 @@ import type {
   ChannelConstraints as _lnrpc_ChannelConstraints,
   ChannelConstraints__Output as _lnrpc_ChannelConstraints__Output,
 } from '../lnrpc/ChannelConstraints'
-import type { Long } from '@grpc/proto-loader'
 
 export interface Channel {
   active?: boolean

src/grpc/types/lnrpc/ChannelAcceptRequest.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   CommitmentType as _lnrpc_CommitmentType,
   CommitmentType__Output as _lnrpc_CommitmentType__Output,
 } from '../lnrpc/CommitmentType'
-import type { Long } from '@grpc/proto-loader'
 
 export interface ChannelAcceptRequest {
   node_pubkey?: Buffer | Uint8Array | string

src/grpc/types/lnrpc/ChannelBalanceResponse.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _lnrpc_Amount,
   Amount__Output as _lnrpc_Amount__Output,
 } from '../lnrpc/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 export interface ChannelBalanceResponse {
   balance?: number | string | Long

src/grpc/types/lnrpc/ChannelCloseSummary.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Initiator as _lnrpc_Initiator,
   Initiator__Output as _lnrpc_Initiator__Output,
@@ -8,7 +9,6 @@ import type {
   Resolution as _lnrpc_Resolution,
   Resolution__Output as _lnrpc_Resolution__Output,
 } from '../lnrpc/Resolution'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/lightning.proto
 

src/grpc/types/lnrpc/ChannelEdge.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   RoutingPolicy as _lnrpc_RoutingPolicy,
   RoutingPolicy__Output as _lnrpc_RoutingPolicy__Output,
 } from '../lnrpc/RoutingPolicy'
-import type { Long } from '@grpc/proto-loader'
 
 export interface ChannelEdge {
   channel_id?: number | string | Long

src/grpc/types/lnrpc/ChannelEdgeUpdate.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   ChannelPoint as _lnrpc_ChannelPoint,
   ChannelPoint__Output as _lnrpc_ChannelPoint__Output,
@@ -8,7 +9,6 @@ import type {
   RoutingPolicy as _lnrpc_RoutingPolicy,
   RoutingPolicy__Output as _lnrpc_RoutingPolicy__Output,
 } from '../lnrpc/RoutingPolicy'
-import type { Long } from '@grpc/proto-loader'
 
 export interface ChannelEdgeUpdate {
   chan_id?: number | string | Long

src/grpc/types/lnrpc/CloseChannelRequest.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   ChannelPoint as _lnrpc_ChannelPoint,
   ChannelPoint__Output as _lnrpc_ChannelPoint__Output,
 } from '../lnrpc/ChannelPoint'
-import type { Long } from '@grpc/proto-loader'
 
 export interface CloseChannelRequest {
   channel_point?: _lnrpc_ChannelPoint | null

src/grpc/types/lnrpc/ClosedChannelUpdate.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   ChannelPoint as _lnrpc_ChannelPoint,
   ChannelPoint__Output as _lnrpc_ChannelPoint__Output,
 } from '../lnrpc/ChannelPoint'
-import type { Long } from '@grpc/proto-loader'
 
 export interface ClosedChannelUpdate {
   chan_id?: number | string | Long

src/grpc/types/lnrpc/ConnectPeerRequest.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   LightningAddress as _lnrpc_LightningAddress,
   LightningAddress__Output as _lnrpc_LightningAddress__Output,
 } from '../lnrpc/LightningAddress'
-import type { Long } from '@grpc/proto-loader'
 
 export interface ConnectPeerRequest {
   addr?: _lnrpc_LightningAddress | null

src/grpc/types/lnrpc/Failure.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   ChannelUpdate as _lnrpc_ChannelUpdate,
   ChannelUpdate__Output as _lnrpc_ChannelUpdate__Output,
 } from '../lnrpc/ChannelUpdate'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/lightning.proto
 

src/grpc/types/lnrpc/FeeReportResponse.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   ChannelFeeReport as _lnrpc_ChannelFeeReport,
   ChannelFeeReport__Output as _lnrpc_ChannelFeeReport__Output,
 } from '../lnrpc/ChannelFeeReport'
-import type { Long } from '@grpc/proto-loader'
 
 export interface FeeReportResponse {
   channel_fees?: _lnrpc_ChannelFeeReport[]

src/grpc/types/lnrpc/GetInfoResponse.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Chain as _lnrpc_Chain,
   Chain__Output as _lnrpc_Chain__Output,
@@ -8,7 +9,6 @@ import type {
   Feature as _lnrpc_Feature,
   Feature__Output as _lnrpc_Feature__Output,
 } from '../lnrpc/Feature'
-import type { Long } from '@grpc/proto-loader'
 
 export interface GetInfoResponse {
   identity_pubkey?: string

src/grpc/types/lnrpc/HTLCAttempt.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Route as _lnrpc_Route,
   Route__Output as _lnrpc_Route__Output,
@@ -8,7 +9,6 @@ import type {
   Failure as _lnrpc_Failure,
   Failure__Output as _lnrpc_Failure__Output,
 } from '../lnrpc/Failure'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/lightning.proto
 

src/grpc/types/lnrpc/Hop.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   MPPRecord as _lnrpc_MPPRecord,
   MPPRecord__Output as _lnrpc_MPPRecord__Output,
@@ -8,7 +9,6 @@ import type {
   AMPRecord as _lnrpc_AMPRecord,
   AMPRecord__Output as _lnrpc_AMPRecord__Output,
 } from '../lnrpc/AMPRecord'
-import type { Long } from '@grpc/proto-loader'
 
 export interface Hop {
   chan_id?: number | string | Long

src/grpc/types/lnrpc/InitWalletRequest.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/walletunlocker.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   ChanBackupSnapshot as _lnrpc_ChanBackupSnapshot,
   ChanBackupSnapshot__Output as _lnrpc_ChanBackupSnapshot__Output,
@@ -8,7 +9,6 @@ import type {
   WatchOnly as _lnrpc_WatchOnly,
   WatchOnly__Output as _lnrpc_WatchOnly__Output,
 } from '../lnrpc/WatchOnly'
-import type { Long } from '@grpc/proto-loader'
 
 export interface InitWalletRequest {
   wallet_password?: Buffer | Uint8Array | string

src/grpc/types/lnrpc/Invoice.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   RouteHint as _lnrpc_RouteHint,
   RouteHint__Output as _lnrpc_RouteHint__Output,
@@ -16,7 +17,6 @@ import type {
   AMPInvoiceState as _lnrpc_AMPInvoiceState,
   AMPInvoiceState__Output as _lnrpc_AMPInvoiceState__Output,
 } from '../lnrpc/AMPInvoiceState'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/lightning.proto
 

src/grpc/types/lnrpc/InvoiceHTLC.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   InvoiceHTLCState as _lnrpc_InvoiceHTLCState,
   InvoiceHTLCState__Output as _lnrpc_InvoiceHTLCState__Output,
@@ -8,7 +9,6 @@ import type {
   AMP as _lnrpc_AMP,
   AMP__Output as _lnrpc_AMP__Output,
 } from '../lnrpc/AMP'
-import type { Long } from '@grpc/proto-loader'
 
 export interface InvoiceHTLC {
   chan_id?: number | string | Long

src/grpc/types/lnrpc/ListInvoiceResponse.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Invoice as _lnrpc_Invoice,
   Invoice__Output as _lnrpc_Invoice__Output,
 } from '../lnrpc/Invoice'
-import type { Long } from '@grpc/proto-loader'
 
 export interface ListInvoiceResponse {
   invoices?: _lnrpc_Invoice[]

src/grpc/types/lnrpc/ListPaymentsResponse.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Payment as _lnrpc_Payment,
   Payment__Output as _lnrpc_Payment__Output,
 } from '../lnrpc/Payment'
-import type { Long } from '@grpc/proto-loader'
 
 export interface ListPaymentsResponse {
   payments?: _lnrpc_Payment[]

src/grpc/types/lnrpc/NodeInfo.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   LightningNode as _lnrpc_LightningNode,
   LightningNode__Output as _lnrpc_LightningNode__Output,
@@ -8,7 +9,6 @@ import type {
   ChannelEdge as _lnrpc_ChannelEdge,
   ChannelEdge__Output as _lnrpc_ChannelEdge__Output,
 } from '../lnrpc/ChannelEdge'
-import type { Long } from '@grpc/proto-loader'
 
 export interface NodeInfo {
   node?: _lnrpc_LightningNode | null

src/grpc/types/lnrpc/OpenChannelRequest.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   FundingShim as _lnrpc_FundingShim,
   FundingShim__Output as _lnrpc_FundingShim__Output,
@@ -8,7 +9,6 @@ import type {
   CommitmentType as _lnrpc_CommitmentType,
   CommitmentType__Output as _lnrpc_CommitmentType__Output,
 } from '../lnrpc/CommitmentType'
-import type { Long } from '@grpc/proto-loader'
 
 export interface OpenChannelRequest {
   sat_per_vbyte?: number | string | Long

src/grpc/types/lnrpc/OutputDetail.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   OutputScriptType as _lnrpc_OutputScriptType,
   OutputScriptType__Output as _lnrpc_OutputScriptType__Output,
 } from '../lnrpc/OutputScriptType'
-import type { Long } from '@grpc/proto-loader'
 
 export interface OutputDetail {
   output_type?: _lnrpc_OutputScriptType

src/grpc/types/lnrpc/PayReq.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   RouteHint as _lnrpc_RouteHint,
   RouteHint__Output as _lnrpc_RouteHint__Output,
@@ -8,7 +9,6 @@ import type {
   Feature as _lnrpc_Feature,
   Feature__Output as _lnrpc_Feature__Output,
 } from '../lnrpc/Feature'
-import type { Long } from '@grpc/proto-loader'
 
 export interface PayReq {
   destination?: string

src/grpc/types/lnrpc/Payment.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   HTLCAttempt as _lnrpc_HTLCAttempt,
   HTLCAttempt__Output as _lnrpc_HTLCAttempt__Output,
@@ -8,7 +9,6 @@ import type {
   PaymentFailureReason as _lnrpc_PaymentFailureReason,
   PaymentFailureReason__Output as _lnrpc_PaymentFailureReason__Output,
 } from '../lnrpc/PaymentFailureReason'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/lightning.proto
 

src/grpc/types/lnrpc/Peer.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Feature as _lnrpc_Feature,
   Feature__Output as _lnrpc_Feature__Output,
@@ -8,7 +9,6 @@ import type {
   TimestampedError as _lnrpc_TimestampedError,
   TimestampedError__Output as _lnrpc_TimestampedError__Output,
 } from '../lnrpc/TimestampedError'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/lightning.proto
 

src/grpc/types/lnrpc/PendingChannelsResponse.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Initiator as _lnrpc_Initiator,
   Initiator__Output as _lnrpc_Initiator__Output,
@@ -12,7 +13,6 @@ import type {
   PendingHTLC as _lnrpc_PendingHTLC,
   PendingHTLC__Output as _lnrpc_PendingHTLC__Output,
 } from '../lnrpc/PendingHTLC'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/lightning.proto
 

src/grpc/types/lnrpc/PolicyUpdateRequest.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   ChannelPoint as _lnrpc_ChannelPoint,
   ChannelPoint__Output as _lnrpc_ChannelPoint__Output,
 } from '../lnrpc/ChannelPoint'
-import type { Long } from '@grpc/proto-loader'
 
 export interface PolicyUpdateRequest {
   global?: boolean

src/grpc/types/lnrpc/QueryRoutesRequest.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   FeeLimit as _lnrpc_FeeLimit,
   FeeLimit__Output as _lnrpc_FeeLimit__Output,
@@ -20,7 +21,6 @@ import type {
   FeatureBit as _lnrpc_FeatureBit,
   FeatureBit__Output as _lnrpc_FeatureBit__Output,
 } from '../lnrpc/FeatureBit'
-import type { Long } from '@grpc/proto-loader'
 
 export interface QueryRoutesRequest {
   pub_key?: string

src/grpc/types/lnrpc/RPCMiddlewareRequest.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   StreamAuth as _lnrpc_StreamAuth,
   StreamAuth__Output as _lnrpc_StreamAuth__Output,
@@ -8,7 +9,6 @@ import type {
   RPCMessage as _lnrpc_RPCMessage,
   RPCMessage__Output as _lnrpc_RPCMessage__Output,
 } from '../lnrpc/RPCMessage'
-import type { Long } from '@grpc/proto-loader'
 
 export interface RPCMiddlewareRequest {
   request_id?: number | string | Long

src/grpc/types/lnrpc/RPCMiddlewareResponse.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   MiddlewareRegistration as _lnrpc_MiddlewareRegistration,
   MiddlewareRegistration__Output as _lnrpc_MiddlewareRegistration__Output,
@@ -8,7 +9,6 @@ import type {
   InterceptFeedback as _lnrpc_InterceptFeedback,
   InterceptFeedback__Output as _lnrpc_InterceptFeedback__Output,
 } from '../lnrpc/InterceptFeedback'
-import type { Long } from '@grpc/proto-loader'
 
 export interface RPCMiddlewareResponse {
   ref_msg_id?: number | string | Long

src/grpc/types/lnrpc/Resolution.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   ResolutionType as _lnrpc_ResolutionType,
   ResolutionType__Output as _lnrpc_ResolutionType__Output,
@@ -12,7 +13,6 @@ import type {
   OutPoint as _lnrpc_OutPoint,
   OutPoint__Output as _lnrpc_OutPoint__Output,
 } from '../lnrpc/OutPoint'
-import type { Long } from '@grpc/proto-loader'
 
 export interface Resolution {
   resolution_type?: _lnrpc_ResolutionType

src/grpc/types/lnrpc/Route.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Hop as _lnrpc_Hop,
   Hop__Output as _lnrpc_Hop__Output,
 } from '../lnrpc/Hop'
-import type { Long } from '@grpc/proto-loader'
 
 export interface Route {
   total_time_lock?: number

src/grpc/types/lnrpc/SendRequest.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   FeeLimit as _lnrpc_FeeLimit,
   FeeLimit__Output as _lnrpc_FeeLimit__Output,
@@ -8,7 +9,6 @@ import type {
   FeatureBit as _lnrpc_FeatureBit,
   FeatureBit__Output as _lnrpc_FeatureBit__Output,
 } from '../lnrpc/FeatureBit'
-import type { Long } from '@grpc/proto-loader'
 
 export interface SendRequest {
   dest?: Buffer | Uint8Array | string

src/grpc/types/lnrpc/Transaction.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   OutputDetail as _lnrpc_OutputDetail,
   OutputDetail__Output as _lnrpc_OutputDetail__Output,
@@ -8,7 +9,6 @@ import type {
   PreviousOutPoint as _lnrpc_PreviousOutPoint,
   PreviousOutPoint__Output as _lnrpc_PreviousOutPoint__Output,
 } from '../lnrpc/PreviousOutPoint'
-import type { Long } from '@grpc/proto-loader'
 
 export interface Transaction {
   tx_hash?: string

src/grpc/types/lnrpc/Utxo.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   AddressType as _lnrpc_AddressType,
   AddressType__Output as _lnrpc_AddressType__Output,
@@ -8,7 +9,6 @@ import type {
   OutPoint as _lnrpc_OutPoint,
   OutPoint__Output as _lnrpc_OutPoint__Output,
 } from '../lnrpc/OutPoint'
-import type { Long } from '@grpc/proto-loader'
 
 export interface Utxo {
   address_type?: _lnrpc_AddressType

src/grpc/types/lnrpc/WalletBalanceResponse.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/lightning.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   WalletAccountBalance as _lnrpc_WalletAccountBalance,
   WalletAccountBalance__Output as _lnrpc_WalletAccountBalance__Output,
 } from '../lnrpc/WalletAccountBalance'
-import type { Long } from '@grpc/proto-loader'
 
 export interface WalletBalanceResponse {
   total_balance?: number | string | Long

src/grpc/types/lnrpc/WatchOnly.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/walletunlocker.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   WatchOnlyAccount as _lnrpc_WatchOnlyAccount,
   WatchOnlyAccount__Output as _lnrpc_WatchOnlyAccount__Output,
 } from '../lnrpc/WatchOnlyAccount'
-import type { Long } from '@grpc/proto-loader'
 
 export interface WatchOnly {
   master_key_birthday_timestamp?: number | string | Long

src/grpc/types/lnrpc_proxy/Channel.ts

@@ -1,5 +1,6 @@
 // Original file: proto/rpc_proxy.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   HTLC as _lnrpc_proxy_HTLC,
   HTLC__Output as _lnrpc_proxy_HTLC__Output,
@@ -12,7 +13,6 @@ import type {
   ChannelConstraints as _lnrpc_proxy_ChannelConstraints,
   ChannelConstraints__Output as _lnrpc_proxy_ChannelConstraints__Output,
 } from '../lnrpc_proxy/ChannelConstraints'
-import type { Long } from '@grpc/proto-loader'
 
 export interface Channel {
   active?: boolean

src/grpc/types/lnrpc_proxy/ChannelBalanceResponse.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/rpc_proxy.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Amount as _lnrpc_proxy_Amount,
   Amount__Output as _lnrpc_proxy_Amount__Output,
 } from '../lnrpc_proxy/Amount'
-import type { Long } from '@grpc/proto-loader'
 
 export interface ChannelBalanceResponse {
   balance?: number | string | Long

src/grpc/types/lnrpc_proxy/ChannelEdge.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/rpc_proxy.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   RoutingPolicy as _lnrpc_proxy_RoutingPolicy,
   RoutingPolicy__Output as _lnrpc_proxy_RoutingPolicy__Output,
 } from '../lnrpc_proxy/RoutingPolicy'
-import type { Long } from '@grpc/proto-loader'
 
 export interface ChannelEdge {
   channel_id?: number | string | Long

src/grpc/types/lnrpc_proxy/Failure.ts

@@ -1,10 +1,10 @@
 // Original file: proto/rpc_proxy.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   ChannelUpdate as _lnrpc_proxy_ChannelUpdate,
   ChannelUpdate__Output as _lnrpc_proxy_ChannelUpdate__Output,
 } from '../lnrpc_proxy/ChannelUpdate'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/rpc_proxy.proto
 

src/grpc/types/lnrpc_proxy/GetInfoResponse.d.ts

@@ -1,5 +1,6 @@
 // Original file: proto/rpc_proxy.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Chain as _lnrpc_proxy_Chain,
   Chain__Output as _lnrpc_proxy_Chain__Output,
@@ -8,7 +9,6 @@ import type {
   Feature as _lnrpc_proxy_Feature,
   Feature__Output as _lnrpc_proxy_Feature__Output,
 } from '../lnrpc_proxy/Feature'
-import type { Long } from '@grpc/proto-loader'
 
 export interface GetInfoResponse {
   identity_pubkey?: string

src/grpc/types/lnrpc_proxy/HTLCAttempt.ts

@@ -1,5 +1,6 @@
 // Original file: proto/rpc_proxy.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   Route as _lnrpc_proxy_Route,
   Route__Output as _lnrpc_proxy_Route__Output,
@@ -8,7 +9,6 @@ import type {
   Failure as _lnrpc_proxy_Failure,
   Failure__Output as _lnrpc_proxy_Failure__Output,
 } from '../lnrpc_proxy/Failure'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/rpc_proxy.proto
 

src/grpc/types/lnrpc_proxy/Hop.d.ts

@@ -1,10 +1,10 @@
 // Original file: proto/rpc_proxy.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   MPPRecord as _lnrpc_proxy_MPPRecord,
   MPPRecord__Output as _lnrpc_proxy_MPPRecord__Output,
 } from '../lnrpc_proxy/MPPRecord'
-import type { Long } from '@grpc/proto-loader'
 
 export interface Hop {
   chan_id?: number | string | Long

src/grpc/types/lnrpc_proxy/Invoice.ts

@@ -1,5 +1,6 @@
 // Original file: proto/rpc_proxy.proto
 
+import type { Long } from '@grpc/proto-loader'
 import type {
   RouteHint as _lnrpc_proxy_RouteHint,
   RouteHint__Output as _lnrpc_proxy_RouteHint__Output,
@@ -12,7 +13,6 @@ import type {
   Feature as _lnrpc_proxy_Feature,
   Feature__Output as _lnrpc_proxy_Feature__Output,
 } from '../lnrpc_proxy/Feature'
-import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/rpc_proxy.proto