enhance channel enable

wallet/ChannelManagement/channel.py

@@ -199,6 +199,14 @@ def toJson(self):
                "Balance":self.get_balance()}
         return jsn
 
+    def get_role_in_channel(self, url):
+        if url == self.src_addr:
+            return "Founder"
+        elif url == self.dest_addr:
+            return "Partner"
+        else:
+            return None
+
 
 
 def create_channel(founder, partner, asset_type, depoist:int, cli=True):

wallet/TransactionManagement/message.py

@@ -1018,13 +1018,23 @@ def handle_message(self):
             tx_data_sign_self = self.wallet.SignContent(tx_data)
             tx_id = self.settlement.get("originalData").get("txId")
             witness = self.settlement.get("originalData").get("witness")
+            role = ch.Channel.channel(self.channel_name).get_role_in_channel(self.wallet.url)
+            if role =="Founder":
+                sign_self = tx_data_sign_self
+                sign_other = tx_data_sign_other
+            elif role == "Partner":
+                sign_self = tx_data_sign_other
+                sign_other = tx_data_sign_self
+            else:
+                raise Exception("Not Find the url")
             raw_data = witness.format(signSelf=tx_data_sign_self, signOther=tx_data_sign_other)
             TrinityTransaction.sendrawtransaction(TrinityTransaction.genarate_raw_data(tx_data, raw_data))
             register_monitor(tx_id,monitor_founding,self.channel_name, EnumChannelState.CLOSED.name)
 
     def verify(self):
         return True, None
 
+
 def monitor_founding(height, channel_name, state):
     channel = ch.Channel.channel(channel_name)
     deposit = channel.get_deposit()
@@ -1036,6 +1046,7 @@ def monitor_founding(height, channel_name, state):
 def monitor_height(height, txdata, signother, signself):
     register_block(str(int(height)+1000),send_rsmcr_transaction,height,txdata,signother, signself)
 
+
 def send_rsmcr_transaction(height,txdata,signother, signself):
     height_script = blockheight_to_script(height)
     rawdata = txdata.format(blockheight_script=height_script,signOther=signother,signSelf=signself)