Changed from channel_type to commitment_type

Ride-The-Lightning · Oct 5, 2023 · 74af120 · 74af120
1 parent d478356
commit 74af120
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 12 deletions.
diff --git a/backend/controllers/lnd/channels.js b/backend/controllers/lnd/channels.js
@@ -141,8 +141,8 @@ export const postChannel = (req, res, next) => {
     else if (req.body.trans_type === '2') {
         options.form.sat_per_byte = req.body.trans_type_value;
     }
-    if (req.body.channel_type !== '') {
-        options.form.channel_type = req.body.channel_type;
+    if (req.body.commitment_type) {
+        options.form.commitment_type = req.body.commitment_type;
     }
     options.form = JSON.stringify(options.form);
     logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Channel Open Options', data: options.form });

diff --git a/frontend/636.0cbaa440d3e13b05.js b/frontend/636.0cbaa440d3e13b05.js
diff --git a/frontend/636.c605e62991998b93.js b/frontend/636.c605e62991998b93.js
diff --git a/frontend/index.html b/frontend/index.html
@@ -13,6 +13,6 @@
   <style>html{width:100%;height:99%;line-height:1.5;overflow-x:hidden;font-family:Roboto,sans-serif!important;font-size:95%}@media only screen and (max-width: 56.25em){html{font-size:90%}}@media only screen and (max-width: 37.5em){html{font-size:80%}}body{box-sizing:border-box;height:100%;margin:0;overflow:hidden}*{margin:0;padding:0}@font-face{font-family:Roboto;src:url(Roboto-Thin.f7a95c9c5999532c.woff2) format("woff2"),url(Roboto-Thin.c13c157cb81e8ebb.woff) format("woff");font-weight:100;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-ThinItalic.b0e084abf689f393.woff2) format("woff2"),url(Roboto-ThinItalic.1111028df6cea564.woff) format("woff");font-weight:100;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Light.0e01b6cd13b3857f.woff2) format("woff2"),url(Roboto-Light.603ca9a537b88428.woff) format("woff");font-weight:300;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-LightItalic.232ef4b20215f720.woff2) format("woff2"),url(Roboto-LightItalic.1b5e142f787151c8.woff) format("woff");font-weight:300;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Regular.475ba9e4e2d63456.woff2) format("woff2"),url(Roboto-Regular.bcefbfee882bc1cb.woff) format("woff");font-weight:400;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-RegularItalic.e3a9ebdaac06bbc4.woff2) format("woff2"),url(Roboto-RegularItalic.0668fae6af0cf8c2.woff) format("woff");font-weight:400;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Medium.457532032ceb0168.woff2) format("woff2"),url(Roboto-Medium.6e1ae5f0b324a0aa.woff) format("woff");font-weight:500;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-MediumItalic.872f7060602d55d2.woff2) format("woff2"),url(Roboto-MediumItalic.e06fb533801cbb08.woff) format("woff");font-weight:500;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Bold.447291a88c067396.woff2) format("woff2"),url(Roboto-Bold.fc482e6133cf5e26.woff) format("woff");font-weight:700;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-BoldItalic.1b15168ef6fa4e16.woff2) format("woff2"),url(Roboto-BoldItalic.e26ba339b06f09f7.woff) format("woff");font-weight:700;font-style:italic}@font-face{font-family:Roboto;src:url(Roboto-Black.2eaa390d458c877d.woff2) format("woff2"),url(Roboto-Black.b25f67ad8583da68.woff) format("woff");font-weight:900;font-style:normal}@font-face{font-family:Roboto;src:url(Roboto-BlackItalic.7dc03ee444552bc5.woff2) format("woff2"),url(Roboto-BlackItalic.c8dc642467cb3099.woff) format("woff");font-weight:900;font-style:italic}</style><link rel="stylesheet" href="styles.a129e1d501647e70.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.a129e1d501647e70.css"></noscript></head>
   <body>
     <rtl-app></rtl-app>
-  <script src="runtime.e59265aa5d4f55d6.js" type="module"></script><script src="polyfills.aa01d8f6b94657cb.js" type="module"></script><script src="main.726deac29ce5c56c.js" type="module"></script>
+  <script src="runtime.ac7ad551891b54ee.js" type="module"></script><script src="polyfills.aa01d8f6b94657cb.js" type="module"></script><script src="main.31a5aa400eae5089.js" type="module"></script>
 
 </body></html>
diff --git a/frontend/main.31a5aa400eae5089.js b/frontend/main.31a5aa400eae5089.js
diff --git a/frontend/main.726deac29ce5c56c.js b/frontend/main.726deac29ce5c56c.js
diff --git a/frontend/runtime.ac7ad551891b54ee.js b/frontend/runtime.ac7ad551891b54ee.js
diff --git a/frontend/runtime.e59265aa5d4f55d6.js b/frontend/runtime.e59265aa5d4f55d6.js
diff --git a/server/controllers/lnd/channels.ts b/server/controllers/lnd/channels.ts
@@ -140,8 +140,8 @@ export const postChannel = (req, res, next) => {
   } else if (req.body.trans_type === '2') {
     options.form.sat_per_byte = req.body.trans_type_value;
   }
-  if (req.body.channel_type !== '') {
-    options.form.channel_type = req.body.channel_type;
+  if (req.body.commitment_type) {
+    options.form.commitment_type = req.body.commitment_type;
   }
   options.form = JSON.stringify(options.form);
   logger.log({ selectedNode: req.session.selectedNode, level: 'DEBUG', fileName: 'Channels', msg: 'Channel Open Options', data: options.form });

diff --git a/src/app/lnd/peers-channels/channels/open-channel-modal/open-channel.component.ts b/src/app/lnd/peers-channels/channels/open-channel-modal/open-channel.component.ts
@@ -141,10 +141,11 @@ export class OpenChannelComponent implements OnInit, OnDestroy {
     if ((!this.peer && !this.selectedPubkey) || (!this.fundingAmount || ((this.totalBalance - this.fundingAmount) < 0) || ((this.selTransType === '1' || this.selTransType === '2') && !this.transTypeValue))) {
       return true;
     }
+    // Taproot channel's commitment type is 5
     this.store.dispatch(saveNewChannel({
       payload: {
         selectedPeerPubkey: ((!this.peer || !this.peer.pub_key) ? this.selectedPubkey : this.peer.pub_key), fundingAmount: this.fundingAmount, private: this.isPrivate,
-        transType: this.selTransType, transTypeValue: this.transTypeValue, spendUnconfirmed: this.spendUnconfirmed, channelType: (this.taprootChannel ? 'taproot' : '')
+        transType: this.selTransType, transTypeValue: this.transTypeValue, spendUnconfirmed: this.spendUnconfirmed, commitmentType: (this.taprootChannel ? 5 : null)
       }
     }));
   }

diff --git a/src/app/lnd/peers-channels/connect-peer/connect-peer.component.ts b/src/app/lnd/peers-channels/connect-peer/connect-peer.component.ts
@@ -145,10 +145,11 @@ export class ConnectPeerComponent implements OnInit, OnDestroy {
       return true;
     }
     this.channelConnectionError = '';
+    // Taproot channel's commitment type is 5
     this.store.dispatch(saveNewChannel({
       payload: {
         selectedPeerPubkey: this.newlyAddedPeer?.pub_key!, fundingAmount: this.channelFormGroup.controls.fundingAmount.value, private: this.channelFormGroup.controls.isPrivate.value,
-        transType: this.channelFormGroup.controls.selTransType.value, transTypeValue: this.channelFormGroup.controls.transTypeValue.value, spendUnconfirmed: this.channelFormGroup.controls.spendUnconfirmed.value, channelType: (!!this.channelFormGroup.controls.taprootChannel.value ? 'taproot' : '')
+        transType: this.channelFormGroup.controls.selTransType.value, transTypeValue: this.channelFormGroup.controls.transTypeValue.value, spendUnconfirmed: this.channelFormGroup.controls.spendUnconfirmed.value, commitmentType: (!!this.channelFormGroup.controls.taprootChannel.value ? 5 : null)
       }
     }));
   }

diff --git a/src/app/lnd/store/lnd.effects.ts b/src/app/lnd/store/lnd.effects.ts
@@ -286,7 +286,7 @@ export class LNDEffects implements OnDestroy {
       return this.httpClient.post(this.CHILD_API_URL + API_END_POINTS.CHANNELS_API, {
         node_pubkey: action.payload.selectedPeerPubkey, local_funding_amount: action.payload.fundingAmount, private: action.payload.private,
         trans_type: action.payload.transType, trans_type_value: action.payload.transTypeValue, spend_unconfirmed: action.payload.spendUnconfirmed,
-        channel_type: action.payload.channelType
+        commitment_type: action.payload.commitmentType
       }).pipe(
         map((postRes: any) => {
           this.logger.info(postRes);

diff --git a/src/app/shared/models/lndModels.ts b/src/app/shared/models/lndModels.ts
@@ -527,7 +527,7 @@ export interface SaveChannel {
   transType: string;
   transTypeValue: string;
   spendUnconfirmed: boolean;
-  channelType: string;
+  commitmentType: number;
 }
 
 export interface CloseChannel {