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

Jump to bottom

modify action and account #48

Merged
merged 67 commits into from
Mar 1, 2019
Merged

modify action and account #48

merged 67 commits into from
Mar 1, 2019

Conversation

findbug2019
Copy link
Contributor

modify action type and account

syslink and others added 30 commits February 17, 2019 22:21
@syslink
Merge pull request #1 from fractalplatform/master
80afc58 
update code
@syslink
add bindAccountNameAddr to keystore
40a8f27
@syslink
add bind func
7485107
@syslink
add bind funcions
e9fb7bd
@syslink
Merge pull request #2 from fractalplatform/master
9099096 
merge
@syslink
modify wallet and rpc of blockchain&keystore
2861fae
@syslink
Merge branch 'master' of https://github.com/syslink/fractal
c87b11c
@peekpi
only node discover
4a2d2f9
@peekpi
fixed: LookupRandom return nil node
8e10126
@peekpi
change test listener addr
3b56369
@peekpi
add bootnodes
69434a2
@syslink
Merge pull request #3 from fractalplatform/master
5f15d71 
merge
@syslink
Merge pull request #4 from fractalplatform/master
495cb09 
merge
@syslink
add some func for wallet
7e7ecf4
@elvis88
wrong private should not mined new block & broadcast
5de1d07
@Musiczombie
change build env
19ea1a1
@elvis88
support for configuring multiple private keys for miner
ca0ed53
@erickyan86
Merge pull request #40 from syslink/master
fccce68 
add some functionality for wallet and blockchain broswer
@Musiczombie
send tx test modify
4d5dbd4
@erickyan86
replace sha3 package
75311ca
@erickyan86
Merge branch 'master' into change_env_script
ec7301c
@erickyan86
format code
313d416
@JacobDenver007
Merge pull request #42 from fractalplatform/change_env_script
935de65 
Change env script
@peekpi
Merge branch 'master' into nodefinder
d124f41
@erickyan86
Merge pull request #41 from fractalplatform/bug_miner_private_checker
5047789 
Bug miner private checker
@peekpi
p2p: add NetworkID to distinguish between different networks
930a567
@peekpi
p2p: add NetworkID flag to cmd flags
f7b688d
@peekpi
p2p: Merge branch 'master' into nodefinder
fdac994
@peekpi
ftfinder: ftfinder is only used to discover new node
725f296
@peekpi
add 'ftfinder' target to Makefile
44481d3
peekpi and others added 25 commits February 26, 2019 15:22
@peekpi
Merge pull request #44 from fractalplatform/nodefinder
a66de91 
Nodefinder
@erickyan86
update version
47657af
@erickyan86
update version
9ec3676
@peekpi
Merge branch 'master' of https://github.com/fractalplatform/fractal
050e5ec
@erickyan86
Merge pull request #45 from fractalplatform/mod_sync_log
640dac2 
Mod sync log
@peekpi
p2p: Compatible with previous version
4c144ef
@peekpi
event: fixed let P2PGetStatus=6 to compatible with pervious versions.
a975239
@peekpi
event: fixed: let P2PGetStatus=6 to compatible with pervious versions.
6cc03b5
@peekpi
Merge branch 'nodefinder' of https://github.com/fractalplatform/fractal…
f709abd 
… into nodefinder
@osoftdeveloper
p2p DDoS
b56d178
@osoftdeveloper
Merge branch 'nodefinder' of https://github.com/fractalplatform/fractal…
39cb120 
… into nodefinder
@peekpi
Merge branch 'nodefinder' of https://github.com/fractalplatform/fractal…
91a9251 
… into nodefinder
@peekpi
p2p:rlpx: fixed bug: change authMsgV4.EncodeRLP to compatible with pe…
b01ce6b 
…rvious versions.
@peekpi
p2p: modify log information to make it more readable
4062621
@osoftdeveloper
update ddos monitorType init to event
83cbd35
@osoftdeveloper
Merge branch 'nodefinder' of https://github.com/fractalplatform/fractal…
9f4620c 
… into nodefinder
@peekpi
p2p:rlpx:fixed: nodes have same net_id can not complete rlpx.encHands…
691c43f 
…hake
@peekpi
p2p: delay 10 seconds before DDOS disconnect
35bbe13
@erickyan86
Merge pull request #47 from fractalplatform/nodefinder
d1d5583 
Nodefinder
@findbug2019
modify action and acccount
83873b7
@findbug2019
modify action type
0abaa75
@findbug2019
Update test_utils.go
eaf9048
@elvis88
fix genesis_test
78eff1c
@elvis88
Merge branch 'master' into find
c3cea28
@findbug2019
Update asset.go
49b452a
@geekres geekres merged commit 9f375a1 into dev Mar 1, 2019
@findbug2019 findbug2019 deleted the find branch March 1, 2019 03:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@geekres geekres geekres approved these changes

@elvis88 elvis88 Awaiting requested review from elvis88

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@findbug2019 @geekres @syslink @peekpi @elvis88 @Musiczombie @erickyan86 @JacobDenver007 @osoftdeveloper