Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tdev #32

Merged
merged 27 commits into from
Apr 17, 2018
Merged

Tdev #32

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e189a25
add rcp utils
pigxo Apr 16, 2018
36d884f
rename thin wallet
pigxo Apr 16, 2018
1864c82
import lightwallet setting
pigxo Apr 16, 2018
308240a
set prompt token
pigxo Apr 16, 2018
66435ac
set prompt token
pigxo Apr 16, 2018
8baaadf
fix can not import dispatcher
pigxo Apr 16, 2018
ea01af7
change the command open to enable
pigxo Apr 16, 2018
96e0f5c
change light wallet
pigxo Apr 16, 2018
9a92e6b
add pythonpath
pigxo Apr 17, 2018
1757d11
remove block info log
pigxo Apr 17, 2018
fff0647
fix write wallet error
pigxo Apr 17, 2018
99b6a0c
add fast settlement
pigxo Apr 17, 2018
a5d5450
Merge branch 'trunk' of github.com:trinity-project/trinity into tdev
pigxo Apr 17, 2018
ebd660b
fix close channel
pigxo Apr 17, 2018
44c744e
fix close channel
pigxo Apr 17, 2018
6702750
fix close channel
pigxo Apr 17, 2018
a75d4fd
fix message type
pigxo Apr 17, 2018
d281df8
fix format
pigxo Apr 17, 2018
c855629
fix raw data
pigxo Apr 17, 2018
2ac55b7
fix get peer
pigxo Apr 17, 2018
1bbcacc
fix get peer
pigxo Apr 17, 2018
7e53d80
fix get peer
pigxo Apr 17, 2018
c03100f
fix wallet
pigxo Apr 17, 2018
baf6eee
fix monitor log
pigxo Apr 17, 2018
3f222f7
enhance channel enable
pigxo Apr 17, 2018
8713ff6
enhance channel enable
pigxo Apr 17, 2018
556455d
enhance channel enable
pigxo Apr 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix close channel
  • Loading branch information
@pigxo
pigxo committed Apr 17, 2018
commit 44c744e682592405a60e16f8fbbaa0bef46a56eb
4 changes: 3 additions & 1 deletion wallet/ChannelManagement/channel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,14 @@ def chose_channel(channels, publick_key, tx_count, asset_type):
else:
continue


def close_channel(channel_name, wallet):
ch = Channel.channel(channel_name)
peer = ch.get_peer(wallet.url)
tx = trans.TrinityTransaction(channel_name, wallet)
tx.realse_transaction()
mg.SettleMessage.create(channel_name,wallet,wallet.url, peer)
mg.SettleMessage.create(channel_name,wallet,wallet.url, peer, "TNC") #ToDo


def sync_channel_info_to_gateway(channel_name, type):
LOG.info("Debug sync_channel_info_to_gateway channelname {} type {}".format(channel_name, type))
Expand Down