Skip to content

Commit a81b615

Browse files
ShahanaFarooquiShahanaFarooqui
committed
Updated for cln msat migration (v23.05)
1 parent dc07e38 commit a81b615

20 files changed

+85
-56
lines changed

‎apps/backend/dist/controllers/shared.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class SharedController {
3131
try {
3232
logger.info('Getting Connection Settings');
3333
let macaroon = '';
34-
let packageData = '{ version: "0.0.2" }';
34+
let packageData = '{ version: "0.0.3" }';
3535
if (fs.existsSync(APP_CONSTANTS.MACAROON_PATH)) {
3636
logger.info('Getting REST Access Macaroon from ' + process.env.APP_CORE_LIGHTNING_REST_CERT_DIR);
3737
macaroon = Buffer.from(fs.readFileSync(APP_CONSTANTS.MACAROON_PATH)).toString('hex');

‎apps/backend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cln-application-backend",
3-
"version": "0.0.2",
3+
"version": "0.0.3",
44
"description": "Core lightning application backend",
55
"private": true,
66
"license": "MIT",

‎apps/backend/source/controllers/shared.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class SharedController {
3838
try {
3939
logger.info('Getting Connection Settings');
4040
let macaroon = '';
41-
let packageData = '{ version: "0.0.2" }';
41+
let packageData = '{ version: "0.0.3" }';
4242

4343
if (fs.existsSync(APP_CONSTANTS.MACAROON_PATH)) {
4444
logger.info(

‎apps/frontend/build/asset-manifest.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"files": {
33
"main.css": "/static/css/main.76dfbe10.css",
4-
"main.js": "/static/js/main.5cb1d6e3.js",
4+
"main.js": "/static/js/main.696ce8d0.js",
55
"static/media/Inter-Bold.ttf": "/static/media/Inter-Bold.88fa7ae373b07b41ecce.ttf",
66
"static/media/Inter-SemiBold.ttf": "/static/media/Inter-SemiBold.4d56bb21f2399db8ad48.ttf",
77
"static/media/Inter-Medium.ttf": "/static/media/Inter-Medium.6dcbc9bed1ec438907ee.ttf",
88
"static/media/Inter-Thin.ttf": "/static/media/Inter-Thin.f341ca512063c66296d1.ttf",
99
"index.html": "/index.html",
1010
"static/media/radio-button.svg": "/static/media/radio-button.69aa1495d8439f869898.svg",
1111
"main.76dfbe10.css.map": "/static/css/main.76dfbe10.css.map",
12-
"main.5cb1d6e3.js.map": "/static/js/main.5cb1d6e3.js.map"
12+
"main.696ce8d0.js.map": "/static/js/main.696ce8d0.js.map"
1313
},
1414
"entrypoints": [
1515
"static/css/main.76dfbe10.css",
16-
"static/js/main.5cb1d6e3.js"
16+
"static/js/main.696ce8d0.js"
1717
]
1818
}

‎apps/frontend/build/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./images/cln-favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="color-scheme" content="light dark"><meta name="description" content="Core lightning application"/><link rel="apple-touch-icon" href="./images/cln-logo-dark.png"/><title>Core Lightning</title><script defer="defer" src="/static/js/main.5cb1d6e3.js"></script><link href="/static/css/main.76dfbe10.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./images/cln-favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="color-scheme" content="light dark"><meta name="description" content="Core lightning application"/><link rel="apple-touch-icon" href="./images/cln-logo-dark.png"/><title>Core Lightning</title><script defer="defer" src="/static/js/main.696ce8d0.js"></script><link href="/static/css/main.76dfbe10.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

‎apps/frontend/build/static/js/main.5cb1d6e3.js

-3
This file was deleted.

‎apps/frontend/build/static/js/main.5cb1d6e3.js.map

-1
This file was deleted.

‎apps/frontend/build/static/js/main.696ce8d0.js

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/frontend/build/static/js/main.5cb1d6e3.js.LICENSE.txt renamed to ‎apps/frontend/build/static/js/main.696ce8d0.js.LICENSE.txt

File renamed without changes.

‎apps/frontend/build/static/js/main.696ce8d0.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apps/frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cln-application-frontend",
3-
"version": "0.0.2",
3+
"version": "0.0.3",
44
"description": "Core lightning application frontend",
55
"private": true,
66
"license": "MIT",

‎apps/frontend/src/components/cln/CLNSend/CLNSend.tsx

+10-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Spinner from 'react-bootstrap/Spinner';
1111
import logger from '../../../services/logger.service';
1212
import useInput from '../../../hooks/use-input';
1313
import useHttp from '../../../hooks/use-http';
14-
import { formatCurrency } from '../../../utilities/data-formatters';
14+
import { formatCurrency, isCompatibleVersion } from '../../../utilities/data-formatters';
1515
import { CallStatus, CLEAR_STATUS_ALERT_DELAY, PaymentType, SATS_MSAT, Units } from '../../../utilities/constants';
1616
import { AppContext } from '../../../store/AppContext';
1717
import { ActionSVG } from '../../../svgs/Action';
@@ -105,7 +105,12 @@ const CLNSend = (props) => {
105105
amount: ('Open Offer')
106106
});
107107
} else {
108-
const amountmSats = +(decodeRes.data.offer_amount_msat.substring(0, (decodeRes.data.offer_amount_msat.length - 4))) || 0;
108+
let amountmSats = 0;
109+
if (isCompatibleVersion((appCtx.nodeInfo.version || ''), '23.02')) {
110+
amountmSats = decodeRes.data.offer_amount_msat || 0;
111+
} else {
112+
amountmSats = +(decodeRes.data.offer_amount_msat.substring(0, (decodeRes.data.offer_amount_msat.length - 4))) || 0;
113+
}
109114
amountChangeHandler({target: {value: (amountmSats / SATS_MSAT).toString()}});
110115
setDecodeResponse({
111116
description: (decodeRes.data.offer_description),
@@ -114,17 +119,17 @@ const CLNSend = (props) => {
114119
}
115120
} else {
116121
if (decodeRes && decodeRes.data) {
117-
if (!decodeRes.data.msatoshi) {
122+
if (!decodeRes.data.msatoshi && !decodeRes.data.amount_msat) {
118123
setEmptyInvoice(true);
119124
setDecodeResponse({
120125
description: (decodeRes.data.description),
121126
amount: ('Open Invoice')
122127
});
123128
} else {
124-
amountChangeHandler({target: {value: (decodeRes.data.msatoshi / SATS_MSAT).toString()}});
129+
amountChangeHandler({target: {value: ((decodeRes.data.msatoshi || decodeRes.data.amount_msat) / SATS_MSAT).toString()}});
125130
setDecodeResponse({
126131
description: (decodeRes.data.description),
127-
amount: (formatCurrency((decodeRes.data.msatoshi || 0), Units.MSATS, appCtx.appConfig.unit, false, 0, 'string') + ' Sats')
132+
amount: (formatCurrency((decodeRes.data.msatoshi || decodeRes.data.amount_msat || 0), Units.MSATS, appCtx.appConfig.unit, false, 0, 'string') + ' Sats')
128133
});
129134
}
130135
}

‎apps/frontend/src/components/cln/CLNTransaction/CLNTransaction.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ const TODAY = Math.floor(Date.now() / 1000);
1616
const Payment = ({payment, copyHandler}) => {
1717
return (
1818
<>
19-
{payment.msatoshi ?
19+
{payment.msatoshi || payment.amount_msat ?
2020
<Row className='cln-transaction-detail'>
2121
<Col xs={12} className='fs-7 text-light'>Transaction Fee (mSats)</Col>
2222
<Col xs={11} className='fs-7 overflow-x-ellipsis'>
23-
{payment.msatoshi_sent ?
24-
formatCurrency((payment.msatoshi_sent - payment.msatoshi), Units.MSATS, Units.MSATS, false, 0, 'string')
23+
{payment.msatoshi_sent || payment.amount_sent_msat ?
24+
formatCurrency(((payment.msatoshi_sent || payment.amount_sent_msat) - (payment.msatoshi || payment.amount_msat)), Units.MSATS, Units.MSATS, false, 0, 'string')
2525
:
2626
0
2727
}

‎apps/frontend/src/components/cln/CLNTransactionsList/CLNTransactionsList.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const PaymentHeader = ({payment, appConfig, fiatConfig}) => {
3232
</Col>
3333
<Col xs={5} className='ps-0 d-flex align-items-center justify-content-end fw-bold text-darker-blue'>
3434
{ payment.status === 'complete' ?
35-
'-' + (formatCurrency((payment.msatoshi_sent || 0), Units.MSATS, appConfig.unit, false, 0, 'string'))
35+
'-' + (formatCurrency((payment.msatoshi_sent || payment.amount_sent_msat || 0), Units.MSATS, appConfig.unit, false, 0, 'string'))
3636
:
3737
0
3838
}
@@ -44,7 +44,7 @@ const PaymentHeader = ({payment, appConfig, fiatConfig}) => {
4444
<DateBox dataValue={payment.created_at} dataType={'Created At'} showTooltip={false} />
4545
</Col>
4646
<Col xs={4} className='ps-0 fs-7 text-light d-flex align-items-center justify-content-end'>
47-
<FiatBox value={(payment.msatoshi_sent || 0)} fromUnit={Units.MSATS} symbol={fiatConfig.symbol} rate={fiatConfig.rate} />
47+
<FiatBox value={(payment.msatoshi_sent || payment.amount_sent_msat || 0)} fromUnit={Units.MSATS} symbol={fiatConfig.symbol} rate={fiatConfig.rate} />
4848
</Col>
4949
</Row>
5050
</Col>
@@ -65,9 +65,9 @@ const InvoiceHeader = ({invoice, appConfig, fiatConfig}) => {
6565
</Col>
6666
<Col xs={5} className='ps-0 d-flex align-items-center justify-content-end fw-bold text-darker-blue'>
6767
{invoice.paid_at ?
68-
<span>{'+' + (formatCurrency((invoice.msatoshi_received || 0), Units.MSATS, appConfig.unit, false, 8, 'string'))}</span>
68+
<span>{'+' + (formatCurrency((invoice.msatoshi_received || invoice.amount_received_msat || 0), Units.MSATS, appConfig.unit, false, 8, 'string'))}</span>
6969
:
70-
(formatCurrency((invoice.msatoshi || 0), Units.MSATS, appConfig.unit, false, 8, 'string'))
70+
(formatCurrency((invoice.msatoshi || invoice.amount_msat || 0), Units.MSATS, appConfig.unit, false, 8, 'string'))
7171
}
7272
</Col>
7373
</Row>
@@ -82,7 +82,7 @@ const InvoiceHeader = ({invoice, appConfig, fiatConfig}) => {
8282
<DateBox dataValue={invoice.paid_at ? invoice.paid_at : invoice.expires_at} dataType={''} showTooltip={false} />
8383
</Col>
8484
<Col xs={4} className='ps-0 fs-7 text-light d-flex align-items-center justify-content-end'>
85-
<FiatBox value={(invoice.paid_at ? invoice.msatoshi_received : invoice.msatoshi)} fromUnit={Units.MSATS} symbol={fiatConfig.symbol} rate={fiatConfig.rate} />
85+
<FiatBox value={(invoice.paid_at ? (invoice.msatoshi_received || invoice.amount_received_msat) : (invoice.msatoshi || invoice.amount_msat))} fromUnit={Units.MSATS} symbol={fiatConfig.symbol} rate={fiatConfig.rate} />
8686
</Col>
8787
</Row>
8888
</Col>

‎apps/frontend/src/components/cln/ChannelDetails/ChannelDetails.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -163,19 +163,19 @@ const ChannelDetails = (props) => {
163163
<Row className='mt-12px'>
164164
<Col xs={12} className='fs-7 text-light'>Dust Limit</Col>
165165
<Col xs={12} className='pe-1 overflow-x-ellipsis fw-bold'>
166-
{formatCurrency(props.selChannel.dust_limit_satoshis, Units.SATS, appCtx.appConfig.unit, false, 8, 'string')} {appCtx.appConfig.unit}
166+
{formatCurrency((props.selChannel.dust_limit_satoshis || props.selChannel.dust_limit_msat), (props.selChannel.dust_limit_satoshis ? Units.SATS : Units.MSATS), appCtx.appConfig.unit, false, 8, 'string')} {appCtx.appConfig.unit}
167167
</Col>
168168
</Row>
169169
<Row className='mt-12px'>
170170
<Col xs={12} className='fs-7 text-light'>Spendable</Col>
171171
<Col xs={12} className='pe-1 overflow-x-ellipsis fw-bold'>
172-
{formatCurrency(props.selChannel.spendable_msatoshi, Units.MSATS, appCtx.appConfig.unit, false, 8, 'string')} {appCtx.appConfig.unit}
172+
{formatCurrency((props.selChannel.spendable_msatoshi || props.selChannel.spendable_msat), Units.MSATS, appCtx.appConfig.unit, false, 8, 'string')} {appCtx.appConfig.unit}
173173
</Col>
174174
</Row>
175175
<Row className='mt-12px'>
176176
<Col xs={12} className='fs-7 text-light'>Receivable</Col>
177177
<Col xs={12} className='pe-1 overflow-x-ellipsis fw-bold'>
178-
{formatCurrency(props.selChannel.receivable_msatoshi, Units.MSATS, appCtx.appConfig.unit, false, 8, 'string')} {appCtx.appConfig.unit}
178+
{formatCurrency((props.selChannel.receivable_msatoshi || props.selChannel.receivable_msat), Units.MSATS, appCtx.appConfig.unit, false, 8, 'string')} {appCtx.appConfig.unit}
179179
</Col>
180180
</Row>
181181
<Row className='mt-12px'>

0 commit comments

Comments
 (0)