diff --git a/backends/CoreLightningRestApi.ts b/backends/CLNRest.ts similarity index 99% rename from backends/CoreLightningRestApi.ts rename to backends/CLNRest.ts index 7e0bc1f8f5..139d6a18d0 100644 --- a/backends/CoreLightningRestApi.ts +++ b/backends/CLNRest.ts @@ -12,7 +12,7 @@ import { listPeers } from './CoreLightningRequestHandler'; -export default class CoreLightningRestApi extends LND { +export default class CLNRest extends LND { getHeaders = (rune: string): any => { return { Rune: rune diff --git a/backends/CoreLightningRequestHandler.ts b/backends/CoreLightningRequestHandler.ts index fd5ba25415..f42058e748 100644 --- a/backends/CoreLightningRequestHandler.ts +++ b/backends/CoreLightningRequestHandler.ts @@ -1,6 +1,6 @@ -import CoreLightningRestApi from './CoreLightningRestApi'; +import CLNRest from './CLNRest'; -const api = new CoreLightningRestApi(); +const api = new CLNRest(); // Returns onchain balance of core-lightning node export const getBalance = (data: any) => { diff --git a/components/SetFeesForm.tsx b/components/SetFeesForm.tsx index e882f28043..4b3032b437 100644 --- a/components/SetFeesForm.tsx +++ b/components/SetFeesForm.tsx @@ -124,7 +124,7 @@ export default class SetFeesForm extends React.Component< > {`${localeString('components.SetFeesForm.feeRate')} (${ implementation === 'c-lightning-REST' || - implementation === 'core-lightning-rest-api' + implementation === 'cln-rest' ? localeString( 'components.SetFeesForm.ppmMilliMsat' ) @@ -136,7 +136,7 @@ export default class SetFeesForm extends React.Component< placeholder={ feeRate || implementation === 'c-lightning-REST' || - implementation === 'core-lightning-rest-api' + implementation === 'cln-rest' ? '1' : '0.001' } diff --git a/stores/ChannelsStore.ts b/stores/ChannelsStore.ts index ec8613f03e..46158746aa 100644 --- a/stores/ChannelsStore.ts +++ b/stores/ChannelsStore.ts @@ -461,7 +461,7 @@ export default class ChannelsStore { if ( implementation === 'c-lightning-REST' || - implementation === 'core-lightning-rest-api' || + implementation === 'cln-rest' || implementation === 'eclair' || implementation === 'spark' ) { diff --git a/stores/SettingsStore.ts b/stores/SettingsStore.ts index a06428ede2..3934a4f968 100644 --- a/stores/SettingsStore.ts +++ b/stores/SettingsStore.ts @@ -206,7 +206,7 @@ export const INTERFACE_KEYS = [ { key: 'Embedded LND', value: 'embedded-lnd' }, { key: 'LND (REST)', value: 'lnd' }, { key: 'LND (Lightning Node Connect)', value: 'lightning-node-connect' }, - { key: 'Core Lightning REST API', value: 'core-lightning-rest-api' }, + { key: 'Core Lightning (CLNRest)', value: 'cln-rest' }, { key: 'LNDHub', value: 'lndhub' }, { key: '[DEPRECATED] Core Lightning (c-lightning-REST)', @@ -220,7 +220,7 @@ export type Implementations = | 'embedded-lnd' | 'lnd' | 'lightning-node-connect' - | 'core-lightning-rest-api' + | 'cln-rest' | 'lndhub' | 'c-lightning-REST' | 'spark' diff --git a/stores/TransactionsStore.ts b/stores/TransactionsStore.ts index e21d23dd8c..6f2151ba4f 100644 --- a/stores/TransactionsStore.ts +++ b/stores/TransactionsStore.ts @@ -460,8 +460,7 @@ export default class TransactionsStore { const payFunc = (this.settingsStore.implementation === 'c-lightning-REST' || - this.settingsStore.implementation === - 'core-lightning-rest-api' || + this.settingsStore.implementation === 'cln-rest' || this.settingsStore.implementation === 'embedded-lnd') && pubkey ? BackendUtils.sendKeysend diff --git a/utils/BackendUtils.ts b/utils/BackendUtils.ts index 1a26eb44f2..f0c80fc679 100644 --- a/utils/BackendUtils.ts +++ b/utils/BackendUtils.ts @@ -5,7 +5,7 @@ import LightningNodeConnect from '../backends/LightningNodeConnect'; import EmbeddedLND from '../backends/EmbeddedLND'; // Core Lightning import CLightningREST from '../backends/CLightningREST'; -import CoreLightningRestApi from '../backends/CoreLightningRestApi'; +import CLNRest from '../backends/CLNRest'; import Spark from '../backends/Spark'; // Eclair import Eclair from '../backends/Eclair'; @@ -17,7 +17,7 @@ class BackendUtils { lightningNodeConnect: LightningNodeConnect; embeddedLND: EmbeddedLND; clightningREST: CLightningREST; - coreLightningRestApi: CoreLightningRestApi; + clnRest: CLNRest; spark: Spark; eclair: Eclair; lndHub: LndHub; @@ -26,7 +26,7 @@ class BackendUtils { this.lightningNodeConnect = new LightningNodeConnect(); this.embeddedLND = new EmbeddedLND(); this.clightningREST = new CLightningREST(); - this.coreLightningRestApi = new CoreLightningRestApi(); + this.clnRest = new CLNRest(); this.spark = new Spark(); this.eclair = new Eclair(); this.lndHub = new LndHub(); @@ -43,8 +43,8 @@ class BackendUtils { return this.embeddedLND; case 'c-lightning-REST': return this.clightningREST; - case 'core-lightning-rest-api': - return this.coreLightningRestApi; + case 'cln-rest': + return this.clnRest; case 'spark': return this.spark; case 'eclair': diff --git a/views/Settings/NodeConfiguration.tsx b/views/Settings/NodeConfiguration.tsx index 79256c8528..d90ba79f19 100644 --- a/views/Settings/NodeConfiguration.tsx +++ b/views/Settings/NodeConfiguration.tsx @@ -1352,7 +1352,7 @@ export default class NodeConfiguration extends React.Component< )} )} - {implementation === 'core-lightning-rest-api' && ( + {implementation === 'cln-rest' && ( <>