From 2e0ad4ea54078dece34ab3ab8362698f3a3e10e9 Mon Sep 17 00:00:00 2001
From: dpad85 <5765435+dpad85@users.noreply.github.com>
Date: Mon, 7 Sep 2020 12:54:13 +0200
Subject: [PATCH 1/2] Fix issue with Phoenix reestablish channel type

---
 .../src/main/scala/fr/acinq/eclair/channel/ChannelTypes.scala | 4 +++-
 .../src/main/scala/fr/acinq/eclair/channel/Helpers.scala      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/channel/ChannelTypes.scala b/eclair-core/src/main/scala/fr/acinq/eclair/channel/ChannelTypes.scala
index 5d480426f..3d97533c1 100644
--- a/eclair-core/src/main/scala/fr/acinq/eclair/channel/ChannelTypes.scala
+++ b/eclair-core/src/main/scala/fr/acinq/eclair/channel/ChannelTypes.scala
@@ -218,7 +218,9 @@ final case class DATA_CLOSING(commitments: Commitments,
 }
 
 final case class DATA_WAIT_FOR_REMOTE_PUBLISH_FUTURE_COMMITMENT(commitments: Commitments, remoteChannelReestablish: ChannelReestablish) extends Data with HasCommitments
-final case class DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH(data: HasCommitments, inputReconnected: INPUT_RECONNECTED) extends Data
+final case class DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH(data: HasCommitments, inputReconnected: INPUT_RECONNECTED) extends Data with HasCommitments {
+  override def commitments: Commitments = data.commitments
+}
 
 final case class LocalParams(nodeId: PublicKey,
                              fundingKeyPath: DeterministicWallet.KeyPath,
diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala b/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala
index 75741e94f..15d5a2990 100644
--- a/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala
+++ b/eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala
@@ -58,7 +58,6 @@ object Helpers {
     case d: DATA_WAIT_FOR_FUNDING_CREATED => d.temporaryChannelId
     case d: DATA_WAIT_FOR_FUNDING_SIGNED => d.channelId
     case d: HasCommitments => d.channelId
-    case d: DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH => d.data.channelId
   }
 
   /**
@@ -76,6 +75,7 @@ object Helpers {
       case d: DATA_NEGOTIATING => d.copy(commitments = commitments1)
       case d: DATA_CLOSING => d.copy(commitments = commitments1)
       case d: DATA_WAIT_FOR_REMOTE_PUBLISH_FUTURE_COMMITMENT => d.copy(commitments = commitments1)
+      case d: DATA_PHOENIX_WAIT_REMOTE_CHANNEL_REESTABLISH => d // TODO ignored
     }
   }
 

From bea1bddb564e4320f2fa6a92ffcb347b7c02e31f Mon Sep 17 00:00:00 2001
From: dpad85 <5765435+dpad85@users.noreply.github.com>
Date: Mon, 7 Sep 2020 12:56:32 +0200
Subject: [PATCH 2/2] Release v0.3.11-android-phoenix

---
 eclair-core/pom.xml | 2 +-
 eclair-node/pom.xml | 2 +-
 pom.xml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclair-core/pom.xml b/eclair-core/pom.xml
index ff9c4bc04..fe31a528d 100644
--- a/eclair-core/pom.xml
+++ b/eclair-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>fr.acinq.eclair</groupId>
         <artifactId>eclair_2.11</artifactId>
-        <version>0.3.10-android-phoenix</version>
+        <version>0.3.11-android-phoenix</version>
     </parent>
 
     <artifactId>eclair-core_2.11</artifactId>
diff --git a/eclair-node/pom.xml b/eclair-node/pom.xml
index 708ff36b7..998cdf283 100644
--- a/eclair-node/pom.xml
+++ b/eclair-node/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>fr.acinq.eclair</groupId>
         <artifactId>eclair_2.11</artifactId>
-        <version>0.3.10-android-phoenix</version>
+        <version>0.3.11-android-phoenix</version>
     </parent>
 
     <artifactId>eclair-node_2.11</artifactId>
diff --git a/pom.xml b/pom.xml
index 172dab0b9..1ad767b96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>fr.acinq.eclair</groupId>
     <artifactId>eclair_2.11</artifactId>
-    <version>0.3.10-android-phoenix</version>
+    <version>0.3.11-android-phoenix</version>
     <packaging>pom</packaging>
 
     <modules>