diff --git a/backends/CLightningREST.ts b/backends/CLightningREST.ts index 668d266d4..b14cd0155 100644 --- a/backends/CLightningREST.ts +++ b/backends/CLightningREST.ts @@ -5,6 +5,7 @@ import OpenChannelRequest from './../models/OpenChannelRequest'; import VersionUtils from './../utils/VersionUtils'; import Base64Utils from './../utils/Base64Utils'; import { Hash as sha256Hash } from 'fast-sha256'; +import BigNumber from 'bignumber.js'; export default class CLightningREST extends LND { getHeaders = (macaroonHex: string): any => { @@ -169,11 +170,14 @@ export default class CLightningREST extends LND { getNewAddress = () => this.getRequest('/v1/newaddr?addrType=bech32'); openChannel = (data: OpenChannelRequest) => { let request: any; + const feeRate = `${new BigNumber(data.sat_per_vbyte) + .times(1000) + .toString()}perkb`; if (data.utxos && data.utxos.length > 0) { request = { id: data.id, satoshis: data.satoshis, - feeRate: data.sat_per_vbyte, + feeRate, announce: !data.privateChannel ? 'true' : 'false', minfConf: data.min_confs, utxos: data.utxos @@ -182,7 +186,7 @@ export default class CLightningREST extends LND { request = { id: data.id, satoshis: data.satoshis, - feeRate: data.sat_per_vbyte, + feeRate, announce: !data.privateChannel ? 'true' : 'false', minfConf: data.min_confs }; diff --git a/views/Channels/Channel.tsx b/views/Channels/Channel.tsx index c724e1915..c1cccc5da 100644 --- a/views/Channels/Channel.tsx +++ b/views/Channels/Channel.tsx @@ -376,7 +376,10 @@ export default class ChannelView extends React.Component< } /> )} - {(pendingOpen || pendingClose || closing) && + {(pendingOpen || + pendingClose || + closing || + !BackendUtils.isLNDBased()) && channel_point && (