feat(images): add support for Eclair v0.10.0

README.md

@@ -39,7 +39,7 @@ Supported Network Node Versions:
 
 - [LND](https://github.com/lightningnetwork/lnd) - v0.17.4, v0.17.3, v0.17.2, v0.17.1, v0.17.0, v0.16.4, v0.16.2, v0.16.1, v0.16.0, v0.15.5, v0.14.3, v0.13.1
 - [Core Lightning](https://github.com/ElementsProject/lightning) - v23.05.2, v23.02.2, v22.11, v0.12.0, v0.11.2, v0.10.2
-- [Eclair](https://github.com/ACINQ/eclair/) - v0.9.0, v0.8.0, v0.7.0, v0.6.2, v0.5.0
+- [Eclair](https://github.com/ACINQ/eclair/) - v0.10.0, v0.9.0, v0.8.0, v0.7.0, v0.6.2, v0.5.0
 - [Bitcoin Core](https://github.com/bitcoin/bitcoin) - v26.0, v25.0, v24.0, v23.0, v22.0, v0.21.1
 - [Taproot Assets](https://github.com/lightninglabs/taproot-assets) - v0.3.0
 

docker/README.md

@@ -135,6 +135,7 @@ Replace `<version>` with the desired c-lightning version (ex: `0.8.0`).
 
 ### Tags
 
+- `0.10.0` ([eclair/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/eclair/Dockerfile))
 - `0.9.0` ([eclair/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/eclair/Dockerfile))
 - `0.8.0` ([eclair/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/eclair/Dockerfile))
 - `0.7.0` ([eclair/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/eclair/Dockerfile))

docker/nodes.json

@@ -37,8 +37,8 @@
       "versions": ["23.05.2", "23.02.2", "22.11", "0.12.0", "0.11.2", "0.10.2"]
     },
     "eclair": {
-      "latest": "0.9.0",
-      "versions": ["0.9.0", "0.8.0", "0.7.0", "0.6.2", "0.5.0"]
+      "latest": "0.10.0",
+      "versions": ["0.10.0", "0.9.0", "0.8.0", "0.7.0", "0.6.2", "0.5.0"]
     },
     "bitcoind": {
       "latest": "26.0",

src/lib/lightning/eclair/eclairService.spec.ts

@@ -68,7 +68,7 @@ describe('EclairService', () => {
   });
 
   it('should get a list of channels for v0.7.0', async () => {
-    node.version = '0.7.0';
+    const node7 = { ...node, version: '0.7.0' };
     const chanResponse: ELN.ChannelResponse = {
       nodeId: 'abcdef',
       channelId: '65sdfd7',
@@ -117,12 +117,12 @@ describe('EclairService', () => {
     };
     eclairApiMock.httpPost.mockResolvedValue([chanResponse]);
     const expected = [expect.objectContaining({ pubkey: 'abcdef' })];
-    const actual = await eclairService.getChannels(node);
+    const actual = await eclairService.getChannels(node7);
     expect(actual).toEqual(expected);
   });
 
   it('should get a list of channels for v0.8.0', async () => {
-    node.version = '0.8.0';
+    const node8 = { ...node, version: '0.8.0' };
     const chanResponse: ELN.ChannelResponse = {
       nodeId: 'abcdef',
       channelId: '65sdfd7',
@@ -171,12 +171,12 @@ describe('EclairService', () => {
     };
     eclairApiMock.httpPost.mockResolvedValue([chanResponse]);
     const expected = [expect.objectContaining({ pubkey: 'abcdef' })];
-    const actual = await eclairService.getChannels(node);
+    const actual = await eclairService.getChannels(node8);
     expect(actual).toEqual(expected);
   });
 
   it('should get a list of channels for >= v0.9.0', async () => {
-    node.version = '0.9.0';
+    const node9 = { ...node, version: '0.9.0' };
     const chanResponse: ELN.ChannelResponse = {
       nodeId: 'abcdef',
       channelId: '65sdfd7',
@@ -225,7 +225,7 @@ describe('EclairService', () => {
     };
     eclairApiMock.httpPost.mockResolvedValue([chanResponse]);
     const expected = [expect.objectContaining({ pubkey: 'abcdef' })];
-    const actual = await eclairService.getChannels(node);
+    const actual = await eclairService.getChannels(node9);
     expect(actual).toEqual(expected);
   });
 
@@ -313,7 +313,12 @@ describe('EclairService', () => {
         version: defaultRepoState.images.eclair.latest,
       },
       'open',
-      { channelFlags: 0, fundingSatoshis: 100000, nodeId: 'abc' },
+      {
+        channelFlags: 0,
+        fundingSatoshis: 100000,
+        fundingFeeBudgetSatoshis: 50000,
+        nodeId: 'abc',
+      },
     );
   });
 

src/lib/lightning/eclair/eclairService.ts

@@ -148,9 +148,12 @@ class EclairService implements LightningService {
     const [toPubKey] = toRpcUrl.split('@');
 
     // open the channel
+    const capacity = parseInt(amount);
     const body: ELN.OpenChannelRequest = {
       nodeId: toPubKey,
-      fundingSatoshis: parseInt(amount),
+      fundingSatoshis: capacity,
+      // regtest fee estimation is unusually high so increase the budget to 50% of capacity
+      fundingFeeBudgetSatoshis: Math.round(capacity * 0.5),
       channelFlags: isPrivate ? 0 : 1, // 0 is private, 1 is public: https://acinq.github.io/eclair/#open-2
     };
     const res = await httpPost<string>(from, 'open', body);

src/lib/lightning/eclair/types.ts

@@ -106,6 +106,7 @@ export interface OpenChannelRequest {
   fundingSatoshis: number;
   pushMsat?: number;
   fundingFeerateSatByte?: number;
+  fundingFeeBudgetSatoshis: number;
   channelFlags?: ChannelFlags;
   openTimeoutSeconds?: number;
 }

src/utils/constants.ts

@@ -294,8 +294,8 @@ export const defaultRepoState: DockerRepoState = {
       versions: ['23.05.2', '23.02.2', '22.11', '0.12.0', '0.11.2', '0.10.2'],
     },
     eclair: {
-      latest: '0.9.0',
-      versions: ['0.9.0', '0.8.0', '0.7.0', '0.6.2', '0.5.0'],
+      latest: '0.10.0',
+      versions: ['0.10.0', '0.9.0', '0.8.0', '0.7.0', '0.6.2', '0.5.0'],
     },
     bitcoind: {
       latest: '26.0',

src/utils/tests/helpers.ts

@@ -134,8 +134,8 @@ export const testRepoState: DockerRepoState = {
       versions: ['23.05.2', '23.02.2', '22.11', '0.12.0', '0.11.2', '0.10.2'],
     },
     eclair: {
-      latest: '0.9.0',
-      versions: ['0.9.0', '0.8.0', '0.7.0', '0.6.2', '0.5.0'],
+      latest: '0.10.0',
+      versions: ['0.10.0', '0.9.0', '0.8.0', '0.7.0', '0.6.2', '0.5.0'],
     },
     bitcoind: {
       latest: '26.0',