diff --git a/src/grpc/types/cln/cln/CreateinvoiceResponse.ts b/src/grpc/types/cln/cln/CreateinvoiceResponse.ts
index 57130be61..d73e85601 100644
--- a/src/grpc/types/cln/cln/CreateinvoiceResponse.ts
+++ b/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
 
diff --git a/src/grpc/types/cln/cln/DelinvoiceResponse.ts b/src/grpc/types/cln/cln/DelinvoiceResponse.ts
index 0365947ac..0621f2299 100644
--- a/src/grpc/types/cln/cln/DelinvoiceResponse.ts
+++ b/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
 
diff --git a/src/grpc/types/cln/cln/GetrouteRequest.d.ts b/src/grpc/types/cln/cln/GetrouteRequest.d.ts
index 20b766575..00979ea1c 100644
--- a/src/grpc/types/cln/cln/GetrouteRequest.d.ts
+++ b/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
diff --git a/src/grpc/types/cln/cln/InvoiceRequest.d.ts b/src/grpc/types/cln/cln/InvoiceRequest.d.ts
index c852f6030..5e884c10b 100644
--- a/src/grpc/types/cln/cln/InvoiceRequest.d.ts
+++ b/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
diff --git a/src/grpc/types/cln/cln/ListforwardsForwards.ts b/src/grpc/types/cln/cln/ListforwardsForwards.ts
index 084ba51df..d6c81479a 100644
--- a/src/grpc/types/cln/cln/ListforwardsForwards.ts
+++ b/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
 
diff --git a/src/grpc/types/cln/cln/ListinvoicesInvoices.ts b/src/grpc/types/cln/cln/ListinvoicesInvoices.ts
index 3cd95e645..ccb0a5341 100644
--- a/src/grpc/types/cln/cln/ListinvoicesInvoices.ts
+++ b/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
 
diff --git a/src/grpc/types/cln/cln/ListpeersPeersChannels.ts b/src/grpc/types/cln/cln/ListpeersPeersChannels.ts
index 442c5c1a2..ced5ca3d5 100644
--- a/src/grpc/types/cln/cln/ListpeersPeersChannels.ts
+++ b/src/grpc/types/cln/cln/ListpeersPeersChannels.ts
@@ -1,6 +1,5 @@
 // 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,
@@ -29,6 +28,7 @@ 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
 
diff --git a/src/grpc/types/cln/cln/ListpeersPeersChannelsHtlcs.ts b/src/grpc/types/cln/cln/ListpeersPeersChannelsHtlcs.ts
index eb6220f5d..79ed64b61 100644
--- a/src/grpc/types/cln/cln/ListpeersPeersChannelsHtlcs.ts
+++ b/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
 
diff --git a/src/grpc/types/cln/cln/ListsendpaysPayments.ts b/src/grpc/types/cln/cln/ListsendpaysPayments.ts
index 5daf6d578..ab83ab631 100644
--- a/src/grpc/types/cln/cln/ListsendpaysPayments.ts
+++ b/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
 
diff --git a/src/grpc/types/cln/cln/SendonionRequest.d.ts b/src/grpc/types/cln/cln/SendonionRequest.d.ts
index e9b5d79c1..04a0a0685 100644
--- a/src/grpc/types/cln/cln/SendonionRequest.d.ts
+++ b/src/grpc/types/cln/cln/SendonionRequest.d.ts
@@ -1,6 +1,5 @@
 // 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,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/cln/cln/SendonionResponse.ts b/src/grpc/types/cln/cln/SendonionResponse.ts
index 14cb87cbf..0548e40e1 100644
--- a/src/grpc/types/cln/cln/SendonionResponse.ts
+++ b/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
 
diff --git a/src/grpc/types/cln/cln/SendpayRequest.d.ts b/src/grpc/types/cln/cln/SendpayRequest.d.ts
index af7821677..1eb903d07 100644
--- a/src/grpc/types/cln/cln/SendpayRequest.d.ts
+++ b/src/grpc/types/cln/cln/SendpayRequest.d.ts
@@ -1,6 +1,5 @@
 // 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,
@@ -9,6 +8,7 @@ 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[]
diff --git a/src/grpc/types/cln/cln/SendpayResponse.ts b/src/grpc/types/cln/cln/SendpayResponse.ts
index 5014692d9..50235f694 100644
--- a/src/grpc/types/cln/cln/SendpayResponse.ts
+++ b/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
 
diff --git a/src/grpc/types/cln/cln/WaitanyinvoiceResponse.ts b/src/grpc/types/cln/cln/WaitanyinvoiceResponse.ts
index 8c4bc7a23..c8a852a23 100644
--- a/src/grpc/types/cln/cln/WaitanyinvoiceResponse.ts
+++ b/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
 
diff --git a/src/grpc/types/cln/cln/WaitinvoiceResponse.ts b/src/grpc/types/cln/cln/WaitinvoiceResponse.ts
index 65c6714a8..c397650b2 100644
--- a/src/grpc/types/cln/cln/WaitinvoiceResponse.ts
+++ b/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
 
diff --git a/src/grpc/types/cln/cln/WaitsendpayResponse.ts b/src/grpc/types/cln/cln/WaitsendpayResponse.ts
index 2e9916812..d34b53f39 100644
--- a/src/grpc/types/cln/cln/WaitsendpayResponse.ts
+++ b/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
 
diff --git a/src/grpc/types/greenlight/Feerate.d.ts b/src/grpc/types/greenlight/Feerate.d.ts
index 7b201bf69..d8d0adcd4 100644
--- a/src/grpc/types/greenlight/Feerate.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/AMPInvoiceState.d.ts b/src/grpc/types/lnrpc/AMPInvoiceState.d.ts
index 645d3caf3..5b0e74927 100644
--- a/src/grpc/types/lnrpc/AMPInvoiceState.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/BakeMacaroonRequest.d.ts b/src/grpc/types/lnrpc/BakeMacaroonRequest.d.ts
index 241570f72..1e2e873eb 100644
--- a/src/grpc/types/lnrpc/BakeMacaroonRequest.d.ts
+++ b/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[]
diff --git a/src/grpc/types/lnrpc/BatchOpenChannel.d.ts b/src/grpc/types/lnrpc/BatchOpenChannel.d.ts
index 5f52f618c..f8c6d9b4f 100644
--- a/src/grpc/types/lnrpc/BatchOpenChannel.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/BatchOpenChannelRequest.d.ts b/src/grpc/types/lnrpc/BatchOpenChannelRequest.d.ts
index 43a8ed51c..0f9e9da0d 100644
--- a/src/grpc/types/lnrpc/BatchOpenChannelRequest.d.ts
+++ b/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[]
diff --git a/src/grpc/types/lnrpc/ChanPointShim.d.ts b/src/grpc/types/lnrpc/ChanPointShim.d.ts
index e588220a5..dd085b3a1 100644
--- a/src/grpc/types/lnrpc/ChanPointShim.d.ts
+++ b/src/grpc/types/lnrpc/ChanPointShim.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   ChannelPoint as _lnrpc_ChannelPoint,
   ChannelPoint__Output as _lnrpc_ChannelPoint__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/Channel.ts b/src/grpc/types/lnrpc/Channel.ts
index fa394623b..e05aee4b2 100644
--- a/src/grpc/types/lnrpc/Channel.ts
+++ b/src/grpc/types/lnrpc/Channel.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   HTLC as _lnrpc_HTLC,
   HTLC__Output as _lnrpc_HTLC__Output,
@@ -13,6 +12,7 @@ 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
diff --git a/src/grpc/types/lnrpc/ChannelAcceptRequest.d.ts b/src/grpc/types/lnrpc/ChannelAcceptRequest.d.ts
index d02a3d1ab..f70c677ff 100644
--- a/src/grpc/types/lnrpc/ChannelAcceptRequest.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/ChannelBalanceResponse.d.ts b/src/grpc/types/lnrpc/ChannelBalanceResponse.d.ts
index 5e3c440d2..a35eec22e 100644
--- a/src/grpc/types/lnrpc/ChannelBalanceResponse.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/ChannelCloseSummary.ts b/src/grpc/types/lnrpc/ChannelCloseSummary.ts
index 211047f2c..5b0bd8a8b 100644
--- a/src/grpc/types/lnrpc/ChannelCloseSummary.ts
+++ b/src/grpc/types/lnrpc/ChannelCloseSummary.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   Initiator as _lnrpc_Initiator,
   Initiator__Output as _lnrpc_Initiator__Output,
@@ -9,6 +8,7 @@ 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
 
diff --git a/src/grpc/types/lnrpc/ChannelEdge.d.ts b/src/grpc/types/lnrpc/ChannelEdge.d.ts
index d2384edfe..d9a96a08c 100644
--- a/src/grpc/types/lnrpc/ChannelEdge.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/ChannelEdgeUpdate.d.ts b/src/grpc/types/lnrpc/ChannelEdgeUpdate.d.ts
index bd259c311..c4407c23d 100644
--- a/src/grpc/types/lnrpc/ChannelEdgeUpdate.d.ts
+++ b/src/grpc/types/lnrpc/ChannelEdgeUpdate.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   ChannelPoint as _lnrpc_ChannelPoint,
   ChannelPoint__Output as _lnrpc_ChannelPoint__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/CloseChannelRequest.d.ts b/src/grpc/types/lnrpc/CloseChannelRequest.d.ts
index 4f20325b9..4acb70617 100644
--- a/src/grpc/types/lnrpc/CloseChannelRequest.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/ClosedChannelUpdate.d.ts b/src/grpc/types/lnrpc/ClosedChannelUpdate.d.ts
index bee5c5731..ba54545ba 100644
--- a/src/grpc/types/lnrpc/ClosedChannelUpdate.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/ConnectPeerRequest.d.ts b/src/grpc/types/lnrpc/ConnectPeerRequest.d.ts
index c3465b57b..7e6cba0f0 100644
--- a/src/grpc/types/lnrpc/ConnectPeerRequest.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/Failure.ts b/src/grpc/types/lnrpc/Failure.ts
index 12d7c1496..de244f02a 100644
--- a/src/grpc/types/lnrpc/Failure.ts
+++ b/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
 
diff --git a/src/grpc/types/lnrpc/FeeReportResponse.d.ts b/src/grpc/types/lnrpc/FeeReportResponse.d.ts
index 0ccce99e7..e02f69e4b 100644
--- a/src/grpc/types/lnrpc/FeeReportResponse.d.ts
+++ b/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[]
diff --git a/src/grpc/types/lnrpc/GetInfoResponse.d.ts b/src/grpc/types/lnrpc/GetInfoResponse.d.ts
index 0b150627d..ffdfab42a 100644
--- a/src/grpc/types/lnrpc/GetInfoResponse.d.ts
+++ b/src/grpc/types/lnrpc/GetInfoResponse.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   Chain as _lnrpc_Chain,
   Chain__Output as _lnrpc_Chain__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/HTLCAttempt.ts b/src/grpc/types/lnrpc/HTLCAttempt.ts
index 63c7b68fb..b3a132016 100644
--- a/src/grpc/types/lnrpc/HTLCAttempt.ts
+++ b/src/grpc/types/lnrpc/HTLCAttempt.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   Route as _lnrpc_Route,
   Route__Output as _lnrpc_Route__Output,
@@ -9,6 +8,7 @@ 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
 
diff --git a/src/grpc/types/lnrpc/Hop.d.ts b/src/grpc/types/lnrpc/Hop.d.ts
index 4cc00e8fe..0e70752ef 100644
--- a/src/grpc/types/lnrpc/Hop.d.ts
+++ b/src/grpc/types/lnrpc/Hop.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   MPPRecord as _lnrpc_MPPRecord,
   MPPRecord__Output as _lnrpc_MPPRecord__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/InitWalletRequest.d.ts b/src/grpc/types/lnrpc/InitWalletRequest.d.ts
index e3906c489..09379e76d 100644
--- a/src/grpc/types/lnrpc/InitWalletRequest.d.ts
+++ b/src/grpc/types/lnrpc/InitWalletRequest.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/walletunlocker.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   ChanBackupSnapshot as _lnrpc_ChanBackupSnapshot,
   ChanBackupSnapshot__Output as _lnrpc_ChanBackupSnapshot__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/Invoice.ts b/src/grpc/types/lnrpc/Invoice.ts
index c8977ec20..351c40b70 100644
--- a/src/grpc/types/lnrpc/Invoice.ts
+++ b/src/grpc/types/lnrpc/Invoice.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   RouteHint as _lnrpc_RouteHint,
   RouteHint__Output as _lnrpc_RouteHint__Output,
@@ -17,6 +16,7 @@ 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
 
diff --git a/src/grpc/types/lnrpc/InvoiceHTLC.d.ts b/src/grpc/types/lnrpc/InvoiceHTLC.d.ts
index d0ec17a7c..5bd9c77f3 100644
--- a/src/grpc/types/lnrpc/InvoiceHTLC.d.ts
+++ b/src/grpc/types/lnrpc/InvoiceHTLC.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   InvoiceHTLCState as _lnrpc_InvoiceHTLCState,
   InvoiceHTLCState__Output as _lnrpc_InvoiceHTLCState__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/ListInvoiceResponse.d.ts b/src/grpc/types/lnrpc/ListInvoiceResponse.d.ts
index 02b5f52a7..d5ce5f614 100644
--- a/src/grpc/types/lnrpc/ListInvoiceResponse.d.ts
+++ b/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[]
diff --git a/src/grpc/types/lnrpc/ListPaymentsResponse.d.ts b/src/grpc/types/lnrpc/ListPaymentsResponse.d.ts
index 271e215dc..2317081db 100644
--- a/src/grpc/types/lnrpc/ListPaymentsResponse.d.ts
+++ b/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[]
diff --git a/src/grpc/types/lnrpc/NodeInfo.d.ts b/src/grpc/types/lnrpc/NodeInfo.d.ts
index 31129e623..1251f6aa1 100644
--- a/src/grpc/types/lnrpc/NodeInfo.d.ts
+++ b/src/grpc/types/lnrpc/NodeInfo.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   LightningNode as _lnrpc_LightningNode,
   LightningNode__Output as _lnrpc_LightningNode__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/OpenChannelRequest.d.ts b/src/grpc/types/lnrpc/OpenChannelRequest.d.ts
index 421d622de..12a2a0720 100644
--- a/src/grpc/types/lnrpc/OpenChannelRequest.d.ts
+++ b/src/grpc/types/lnrpc/OpenChannelRequest.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   FundingShim as _lnrpc_FundingShim,
   FundingShim__Output as _lnrpc_FundingShim__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/OutputDetail.d.ts b/src/grpc/types/lnrpc/OutputDetail.d.ts
index 8bfbaadc8..f97773238 100644
--- a/src/grpc/types/lnrpc/OutputDetail.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/PayReq.d.ts b/src/grpc/types/lnrpc/PayReq.d.ts
index 4334047fa..864bedf0d 100644
--- a/src/grpc/types/lnrpc/PayReq.d.ts
+++ b/src/grpc/types/lnrpc/PayReq.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   RouteHint as _lnrpc_RouteHint,
   RouteHint__Output as _lnrpc_RouteHint__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/Payment.ts b/src/grpc/types/lnrpc/Payment.ts
index fedcedd53..d98361e04 100644
--- a/src/grpc/types/lnrpc/Payment.ts
+++ b/src/grpc/types/lnrpc/Payment.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   HTLCAttempt as _lnrpc_HTLCAttempt,
   HTLCAttempt__Output as _lnrpc_HTLCAttempt__Output,
@@ -9,6 +8,7 @@ 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
 
diff --git a/src/grpc/types/lnrpc/Peer.ts b/src/grpc/types/lnrpc/Peer.ts
index 010252cee..b0d9691fc 100644
--- a/src/grpc/types/lnrpc/Peer.ts
+++ b/src/grpc/types/lnrpc/Peer.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   Feature as _lnrpc_Feature,
   Feature__Output as _lnrpc_Feature__Output,
@@ -9,6 +8,7 @@ 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
 
diff --git a/src/grpc/types/lnrpc/PendingChannelsResponse.ts b/src/grpc/types/lnrpc/PendingChannelsResponse.ts
index c2dd5d0c1..1cfaeee55 100644
--- a/src/grpc/types/lnrpc/PendingChannelsResponse.ts
+++ b/src/grpc/types/lnrpc/PendingChannelsResponse.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   Initiator as _lnrpc_Initiator,
   Initiator__Output as _lnrpc_Initiator__Output,
@@ -13,6 +12,7 @@ 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
 
diff --git a/src/grpc/types/lnrpc/PolicyUpdateRequest.d.ts b/src/grpc/types/lnrpc/PolicyUpdateRequest.d.ts
index b2991d2ad..3c8da411d 100644
--- a/src/grpc/types/lnrpc/PolicyUpdateRequest.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/QueryRoutesRequest.d.ts b/src/grpc/types/lnrpc/QueryRoutesRequest.d.ts
index d729e8fa5..3a92f24ae 100644
--- a/src/grpc/types/lnrpc/QueryRoutesRequest.d.ts
+++ b/src/grpc/types/lnrpc/QueryRoutesRequest.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   FeeLimit as _lnrpc_FeeLimit,
   FeeLimit__Output as _lnrpc_FeeLimit__Output,
@@ -21,6 +20,7 @@ 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
diff --git a/src/grpc/types/lnrpc/RPCMiddlewareRequest.d.ts b/src/grpc/types/lnrpc/RPCMiddlewareRequest.d.ts
index fa75975c4..2b1840389 100644
--- a/src/grpc/types/lnrpc/RPCMiddlewareRequest.d.ts
+++ b/src/grpc/types/lnrpc/RPCMiddlewareRequest.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   StreamAuth as _lnrpc_StreamAuth,
   StreamAuth__Output as _lnrpc_StreamAuth__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/RPCMiddlewareResponse.d.ts b/src/grpc/types/lnrpc/RPCMiddlewareResponse.d.ts
index 5e2c44d47..6ef263be1 100644
--- a/src/grpc/types/lnrpc/RPCMiddlewareResponse.d.ts
+++ b/src/grpc/types/lnrpc/RPCMiddlewareResponse.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   MiddlewareRegistration as _lnrpc_MiddlewareRegistration,
   MiddlewareRegistration__Output as _lnrpc_MiddlewareRegistration__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/Resolution.d.ts b/src/grpc/types/lnrpc/Resolution.d.ts
index cf8d4b11a..c5d6f1ae2 100644
--- a/src/grpc/types/lnrpc/Resolution.d.ts
+++ b/src/grpc/types/lnrpc/Resolution.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   ResolutionType as _lnrpc_ResolutionType,
   ResolutionType__Output as _lnrpc_ResolutionType__Output,
@@ -13,6 +12,7 @@ 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
diff --git a/src/grpc/types/lnrpc/Route.d.ts b/src/grpc/types/lnrpc/Route.d.ts
index ab20e38c8..4a1aab0d6 100644
--- a/src/grpc/types/lnrpc/Route.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/SendRequest.d.ts b/src/grpc/types/lnrpc/SendRequest.d.ts
index 011fd0cab..efd6a516a 100644
--- a/src/grpc/types/lnrpc/SendRequest.d.ts
+++ b/src/grpc/types/lnrpc/SendRequest.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   FeeLimit as _lnrpc_FeeLimit,
   FeeLimit__Output as _lnrpc_FeeLimit__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/Transaction.d.ts b/src/grpc/types/lnrpc/Transaction.d.ts
index 01e272083..b91d9efd1 100644
--- a/src/grpc/types/lnrpc/Transaction.d.ts
+++ b/src/grpc/types/lnrpc/Transaction.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   OutputDetail as _lnrpc_OutputDetail,
   OutputDetail__Output as _lnrpc_OutputDetail__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/Utxo.d.ts b/src/grpc/types/lnrpc/Utxo.d.ts
index 003062f8b..a1b40c400 100644
--- a/src/grpc/types/lnrpc/Utxo.d.ts
+++ b/src/grpc/types/lnrpc/Utxo.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/lightning.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   AddressType as _lnrpc_AddressType,
   AddressType__Output as _lnrpc_AddressType__Output,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc/WalletBalanceResponse.d.ts b/src/grpc/types/lnrpc/WalletBalanceResponse.d.ts
index 54d796720..9f0f4eaff 100644
--- a/src/grpc/types/lnrpc/WalletBalanceResponse.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc/WatchOnly.d.ts b/src/grpc/types/lnrpc/WatchOnly.d.ts
index 220316cfa..9d396c65b 100644
--- a/src/grpc/types/lnrpc/WatchOnly.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc_proxy/Channel.ts b/src/grpc/types/lnrpc_proxy/Channel.ts
index 9bd3baf06..efe7877d3 100644
--- a/src/grpc/types/lnrpc_proxy/Channel.ts
+++ b/src/grpc/types/lnrpc_proxy/Channel.ts
@@ -1,6 +1,5 @@
 // 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,
@@ -13,6 +12,7 @@ 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
diff --git a/src/grpc/types/lnrpc_proxy/ChannelBalanceResponse.d.ts b/src/grpc/types/lnrpc_proxy/ChannelBalanceResponse.d.ts
index 22d16ff38..84182c954 100644
--- a/src/grpc/types/lnrpc_proxy/ChannelBalanceResponse.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc_proxy/ChannelEdge.d.ts b/src/grpc/types/lnrpc_proxy/ChannelEdge.d.ts
index 0f2a0940c..76f72dfe7 100644
--- a/src/grpc/types/lnrpc_proxy/ChannelEdge.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc_proxy/Failure.ts b/src/grpc/types/lnrpc_proxy/Failure.ts
index caa4aeb09..5a39b26a9 100644
--- a/src/grpc/types/lnrpc_proxy/Failure.ts
+++ b/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
 
diff --git a/src/grpc/types/lnrpc_proxy/GetInfoResponse.d.ts b/src/grpc/types/lnrpc_proxy/GetInfoResponse.d.ts
index 8264cf62e..97aed7489 100644
--- a/src/grpc/types/lnrpc_proxy/GetInfoResponse.d.ts
+++ b/src/grpc/types/lnrpc_proxy/GetInfoResponse.d.ts
@@ -1,6 +1,5 @@
 // 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,
@@ -9,6 +8,7 @@ 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
diff --git a/src/grpc/types/lnrpc_proxy/HTLCAttempt.ts b/src/grpc/types/lnrpc_proxy/HTLCAttempt.ts
index efd3e6492..ddb30300c 100644
--- a/src/grpc/types/lnrpc_proxy/HTLCAttempt.ts
+++ b/src/grpc/types/lnrpc_proxy/HTLCAttempt.ts
@@ -1,6 +1,5 @@
 // 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,
@@ -9,6 +8,7 @@ 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
 
diff --git a/src/grpc/types/lnrpc_proxy/Hop.d.ts b/src/grpc/types/lnrpc_proxy/Hop.d.ts
index c6293156d..af9ebc8fd 100644
--- a/src/grpc/types/lnrpc_proxy/Hop.d.ts
+++ b/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
diff --git a/src/grpc/types/lnrpc_proxy/Invoice.ts b/src/grpc/types/lnrpc_proxy/Invoice.ts
index 070654b73..db995c40c 100644
--- a/src/grpc/types/lnrpc_proxy/Invoice.ts
+++ b/src/grpc/types/lnrpc_proxy/Invoice.ts
@@ -1,6 +1,5 @@
 // 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,
@@ -13,6 +12,7 @@ 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
 
diff --git a/src/grpc/types/lnrpc_proxy/InvoiceHTLC.d.ts b/src/grpc/types/lnrpc_proxy/InvoiceHTLC.d.ts
index f6a79e7dd..c2d385786 100644
--- a/src/grpc/types/lnrpc_proxy/InvoiceHTLC.d.ts
+++ b/src/grpc/types/lnrpc_proxy/InvoiceHTLC.d.ts
@@ -1,10 +1,10 @@
 // Original file: proto/rpc_proxy.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   InvoiceHTLCState as _lnrpc_proxy_InvoiceHTLCState,
   InvoiceHTLCState__Output as _lnrpc_proxy_InvoiceHTLCState__Output,
 } from '../lnrpc_proxy/InvoiceHTLCState'
+import type { Long } from '@grpc/proto-loader'
 
 export interface InvoiceHTLC {
   chan_id?: number | string | Long
diff --git a/src/grpc/types/lnrpc_proxy/PayReq.d.ts b/src/grpc/types/lnrpc_proxy/PayReq.d.ts
index 1819d1ad7..6b35f606e 100644
--- a/src/grpc/types/lnrpc_proxy/PayReq.d.ts
+++ b/src/grpc/types/lnrpc_proxy/PayReq.d.ts
@@ -1,6 +1,5 @@
 // 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,
@@ -9,6 +8,7 @@ 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 PayReq {
   destination?: string
diff --git a/src/grpc/types/lnrpc_proxy/Payment.ts b/src/grpc/types/lnrpc_proxy/Payment.ts
index dfe51afe3..f2ecccb59 100644
--- a/src/grpc/types/lnrpc_proxy/Payment.ts
+++ b/src/grpc/types/lnrpc_proxy/Payment.ts
@@ -1,6 +1,5 @@
 // Original file: proto/rpc_proxy.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   HTLCAttempt as _lnrpc_proxy_HTLCAttempt,
   HTLCAttempt__Output as _lnrpc_proxy_HTLCAttempt__Output,
@@ -9,6 +8,7 @@ import type {
   PaymentFailureReason as _lnrpc_proxy_PaymentFailureReason,
   PaymentFailureReason__Output as _lnrpc_proxy_PaymentFailureReason__Output,
 } from '../lnrpc_proxy/PaymentFailureReason'
+import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/rpc_proxy.proto
 
diff --git a/src/grpc/types/lnrpc_proxy/QueryRoutesRequest.d.ts b/src/grpc/types/lnrpc_proxy/QueryRoutesRequest.d.ts
index baf1e390e..cb1ae5c46 100644
--- a/src/grpc/types/lnrpc_proxy/QueryRoutesRequest.d.ts
+++ b/src/grpc/types/lnrpc_proxy/QueryRoutesRequest.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/rpc_proxy.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   FeeLimit as _lnrpc_proxy_FeeLimit,
   FeeLimit__Output as _lnrpc_proxy_FeeLimit__Output,
@@ -21,6 +20,7 @@ import type {
   FeatureBit as _lnrpc_proxy_FeatureBit,
   FeatureBit__Output as _lnrpc_proxy_FeatureBit__Output,
 } from '../lnrpc_proxy/FeatureBit'
+import type { Long } from '@grpc/proto-loader'
 
 export interface QueryRoutesRequest {
   pub_key?: string
diff --git a/src/grpc/types/lnrpc_proxy/Route.d.ts b/src/grpc/types/lnrpc_proxy/Route.d.ts
index f6471177d..b807d3e3e 100644
--- a/src/grpc/types/lnrpc_proxy/Route.d.ts
+++ b/src/grpc/types/lnrpc_proxy/Route.d.ts
@@ -1,10 +1,10 @@
 // Original file: proto/rpc_proxy.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   Hop as _lnrpc_proxy_Hop,
   Hop__Output as _lnrpc_proxy_Hop__Output,
 } from '../lnrpc_proxy/Hop'
+import type { Long } from '@grpc/proto-loader'
 
 export interface Route {
   total_time_lock?: number
diff --git a/src/grpc/types/lnrpc_proxy/SendRequest.d.ts b/src/grpc/types/lnrpc_proxy/SendRequest.d.ts
index 949251e6f..692207dce 100644
--- a/src/grpc/types/lnrpc_proxy/SendRequest.d.ts
+++ b/src/grpc/types/lnrpc_proxy/SendRequest.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/rpc_proxy.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   FeeLimit as _lnrpc_proxy_FeeLimit,
   FeeLimit__Output as _lnrpc_proxy_FeeLimit__Output,
@@ -13,6 +12,7 @@ import type {
   RouteHint as _lnrpc_proxy_RouteHint,
   RouteHint__Output as _lnrpc_proxy_RouteHint__Output,
 } from '../lnrpc_proxy/RouteHint'
+import type { Long } from '@grpc/proto-loader'
 
 export interface SendRequest {
   dest?: Buffer | Uint8Array | string
diff --git a/src/grpc/types/routerrpc/ForwardHtlcInterceptRequest.d.ts b/src/grpc/types/routerrpc/ForwardHtlcInterceptRequest.d.ts
index e59c51857..32904ab2a 100644
--- a/src/grpc/types/routerrpc/ForwardHtlcInterceptRequest.d.ts
+++ b/src/grpc/types/routerrpc/ForwardHtlcInterceptRequest.d.ts
@@ -1,10 +1,10 @@
 // Original file: proto/router.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   CircuitKey as _routerrpc_CircuitKey,
   CircuitKey__Output as _routerrpc_CircuitKey__Output,
 } from '../routerrpc/CircuitKey'
+import type { Long } from '@grpc/proto-loader'
 
 export interface ForwardHtlcInterceptRequest {
   incoming_circuit_key?: _routerrpc_CircuitKey | null
diff --git a/src/grpc/types/routerrpc/HtlcEvent.ts b/src/grpc/types/routerrpc/HtlcEvent.ts
index 1c3f41e97..26988818c 100644
--- a/src/grpc/types/routerrpc/HtlcEvent.ts
+++ b/src/grpc/types/routerrpc/HtlcEvent.ts
@@ -1,6 +1,5 @@
 // Original file: proto/router.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   ForwardEvent as _routerrpc_ForwardEvent,
   ForwardEvent__Output as _routerrpc_ForwardEvent__Output,
@@ -25,6 +24,7 @@ import type {
   FinalHtlcEvent as _routerrpc_FinalHtlcEvent,
   FinalHtlcEvent__Output as _routerrpc_FinalHtlcEvent__Output,
 } from '../routerrpc/FinalHtlcEvent'
+import type { Long } from '@grpc/proto-loader'
 
 // Original file: proto/router.proto
 
diff --git a/src/grpc/types/routerrpc/SendPaymentRequest.d.ts b/src/grpc/types/routerrpc/SendPaymentRequest.d.ts
index a859a3411..d9f825b88 100644
--- a/src/grpc/types/routerrpc/SendPaymentRequest.d.ts
+++ b/src/grpc/types/routerrpc/SendPaymentRequest.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/router.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   RouteHint as _lnrpc_RouteHint,
   RouteHint__Output as _lnrpc_RouteHint__Output,
@@ -9,6 +8,7 @@ import type {
   FeatureBit as _lnrpc_FeatureBit,
   FeatureBit__Output as _lnrpc_FeatureBit__Output,
 } from '../lnrpc/FeatureBit'
+import type { Long } from '@grpc/proto-loader'
 
 export interface SendPaymentRequest {
   dest?: Buffer | Uint8Array | string
diff --git a/src/grpc/types/walletrpc/BumpFeeRequest.d.ts b/src/grpc/types/walletrpc/BumpFeeRequest.d.ts
index 13cc94a4b..318766f41 100644
--- a/src/grpc/types/walletrpc/BumpFeeRequest.d.ts
+++ b/src/grpc/types/walletrpc/BumpFeeRequest.d.ts
@@ -1,10 +1,10 @@
 // Original file: proto/walletkit.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   OutPoint as _lnrpc_OutPoint,
   OutPoint__Output as _lnrpc_OutPoint__Output,
 } from '../lnrpc/OutPoint'
+import type { Long } from '@grpc/proto-loader'
 
 export interface BumpFeeRequest {
   outpoint?: _lnrpc_OutPoint | null
diff --git a/src/grpc/types/walletrpc/FundPsbtRequest.d.ts b/src/grpc/types/walletrpc/FundPsbtRequest.d.ts
index ae03d9a01..ac9753594 100644
--- a/src/grpc/types/walletrpc/FundPsbtRequest.d.ts
+++ b/src/grpc/types/walletrpc/FundPsbtRequest.d.ts
@@ -1,10 +1,10 @@
 // Original file: proto/walletkit.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   TxTemplate as _walletrpc_TxTemplate,
   TxTemplate__Output as _walletrpc_TxTemplate__Output,
 } from '../walletrpc/TxTemplate'
+import type { Long } from '@grpc/proto-loader'
 
 export interface FundPsbtRequest {
   psbt?: Buffer | Uint8Array | string
diff --git a/src/grpc/types/walletrpc/LeaseOutputRequest.d.ts b/src/grpc/types/walletrpc/LeaseOutputRequest.d.ts
index 746828d83..170a7c38c 100644
--- a/src/grpc/types/walletrpc/LeaseOutputRequest.d.ts
+++ b/src/grpc/types/walletrpc/LeaseOutputRequest.d.ts
@@ -1,10 +1,10 @@
 // Original file: proto/walletkit.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   OutPoint as _lnrpc_OutPoint,
   OutPoint__Output as _lnrpc_OutPoint__Output,
 } from '../lnrpc/OutPoint'
+import type { Long } from '@grpc/proto-loader'
 
 export interface LeaseOutputRequest {
   id?: Buffer | Uint8Array | string
diff --git a/src/grpc/types/walletrpc/PendingSweep.d.ts b/src/grpc/types/walletrpc/PendingSweep.d.ts
index 3f4180daf..fa88a5e7b 100644
--- a/src/grpc/types/walletrpc/PendingSweep.d.ts
+++ b/src/grpc/types/walletrpc/PendingSweep.d.ts
@@ -1,6 +1,5 @@
 // Original file: proto/walletkit.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   OutPoint as _lnrpc_OutPoint,
   OutPoint__Output as _lnrpc_OutPoint__Output,
@@ -9,6 +8,7 @@ import type {
   WitnessType as _walletrpc_WitnessType,
   WitnessType__Output as _walletrpc_WitnessType__Output,
 } from '../walletrpc/WitnessType'
+import type { Long } from '@grpc/proto-loader'
 
 export interface PendingSweep {
   outpoint?: _lnrpc_OutPoint | null
diff --git a/src/grpc/types/walletrpc/SendOutputsRequest.d.ts b/src/grpc/types/walletrpc/SendOutputsRequest.d.ts
index ae7c8e823..661c5259f 100644
--- a/src/grpc/types/walletrpc/SendOutputsRequest.d.ts
+++ b/src/grpc/types/walletrpc/SendOutputsRequest.d.ts
@@ -1,10 +1,10 @@
 // Original file: proto/walletkit.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   TxOut as _signrpc_TxOut,
   TxOut__Output as _signrpc_TxOut__Output,
 } from '../signrpc/TxOut'
+import type { Long } from '@grpc/proto-loader'
 
 export interface SendOutputsRequest {
   sat_per_kw?: number | string | Long
diff --git a/src/grpc/types/walletrpc/TxTemplate.d.ts b/src/grpc/types/walletrpc/TxTemplate.d.ts
index 47279dc78..f7c09fd59 100644
--- a/src/grpc/types/walletrpc/TxTemplate.d.ts
+++ b/src/grpc/types/walletrpc/TxTemplate.d.ts
@@ -1,10 +1,10 @@
 // Original file: proto/walletkit.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   OutPoint as _lnrpc_OutPoint,
   OutPoint__Output as _lnrpc_OutPoint__Output,
 } from '../lnrpc/OutPoint'
+import type { Long } from '@grpc/proto-loader'
 
 export interface TxTemplate {
   inputs?: _lnrpc_OutPoint[]
diff --git a/src/grpc/types/walletrpc/UtxoLease.d.ts b/src/grpc/types/walletrpc/UtxoLease.d.ts
index ffc4b3976..4365f43e6 100644
--- a/src/grpc/types/walletrpc/UtxoLease.d.ts
+++ b/src/grpc/types/walletrpc/UtxoLease.d.ts
@@ -1,10 +1,10 @@
 // Original file: proto/walletkit.proto
 
-import type { Long } from '@grpc/proto-loader'
 import type {
   OutPoint as _lnrpc_OutPoint,
   OutPoint__Output as _lnrpc_OutPoint__Output,
 } from '../lnrpc/OutPoint'
+import type { Long } from '@grpc/proto-loader'
 
 export interface UtxoLease {
   id?: Buffer | Uint8Array | string