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.

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

Allow Initial Sync to Work with Simulator #669

Merged
merged 62 commits into from
Nov 21, 2018
Merged
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
58a321f
polling interval
nisdas Oct 17, 2018
8f8a0d3
Merge branch 'master' into syncFix
Oct 20, 2018
6f8ea72
Merge branch 'master' into syncFix
rauljordan Oct 22, 2018
3d5687b
Merge branch 'master' into syncFix
nisdas Nov 8, 2018
98a2add
Merge branch 'syncFix' of https://github.com/nisdas/geth-sharding int…
nisdas Nov 8, 2018
c6dcab4
adding proto message
nisdas Nov 8, 2018
77420a8
changing proto messages
nisdas Nov 8, 2018
6d62432
changing naming
nisdas Nov 8, 2018
2c43fdf
adding slot functionality
nisdas Nov 8, 2018
b6b9931
initial sync working
nisdas Nov 8, 2018
e12b56b
new changes
nisdas Nov 11, 2018
45b5f8b
Merge branch 'master' of https://github.com/prysmaticlabs/geth-shardi…
nisdas Nov 11, 2018
d26d3d1
more sync fixes
nisdas Nov 11, 2018
cf2ae40
its working now
nisdas Nov 11, 2018
f84c9b9
finally working
nisdas Nov 11, 2018
efd6c98
Merge branch 'master' of https://github.com/prysmaticlabs/geth-shardi…
nisdas Nov 11, 2018
3aff690
Merge branch 'master' into syncFix
rauljordan Nov 11, 2018
42d689f
add tests
nisdas Nov 12, 2018
4690a17
Merge branch 'master' of https://github.com/prysmaticlabs/geth-shardi…
nisdas Nov 12, 2018
ce41a64
Merge branch 'syncFix' of https://github.com/nisdas/geth-sharding int…
nisdas Nov 12, 2018
81de6f8
fix tests
nisdas Nov 12, 2018
f9a6970
tests
nisdas Nov 12, 2018
c65d4ea
adding tests
nisdas Nov 12, 2018
0e70c12
lint
nisdas Nov 12, 2018
4ac7d8a
log checks
nisdas Nov 12, 2018
5d88dca
making changes to simulator
nisdas Nov 14, 2018
da7bf34
update logs
nisdas Nov 14, 2018
2a0b2fa
fix tests
nisdas Nov 14, 2018
ae6755f
get sync to work with crystallized state
nisdas Nov 14, 2018
c19a3e6
Merge branch 'master' of https://github.com/prysmaticlabs/geth-shardi…
nisdas Nov 14, 2018
13f06a6
fixing race
nisdas Nov 14, 2018
ac33f65
Merge branch 'master' into syncFix
prestonvanloon Nov 15, 2018
728aecb
making requested changes
nisdas Nov 15, 2018
3b0c839
Merge branch 'syncFix' of https://github.com/nisdas/geth-sharding int…
nisdas Nov 15, 2018
a25d6e9
Merge branch 'master' of https://github.com/prysmaticlabs/geth-shardi…
nisdas Nov 15, 2018
29a843e
unexport
nisdas Nov 15, 2018
19dde62
documentation
nisdas Nov 15, 2018
451cf4c
Merge branch 'master' into syncFix
rauljordan Nov 15, 2018
35fdc86
Merge branch 'master' into syncFix
terencechain Nov 15, 2018
a919010
Merge branch 'master' into syncFix
rauljordan Nov 15, 2018
e79e8fa
Merge branch 'master' into syncFix
Nov 16, 2018
435fb20
Merge branch 'master' of https://github.com/prysmaticlabs/geth-shardi…
nisdas Nov 19, 2018
d19b383
Merge branch 'syncFix' of https://github.com/nisdas/geth-sharding int…
nisdas Nov 19, 2018
619ca77
gazelle and fix merge conflicts
nisdas Nov 19, 2018
b61a306
adding repeated requests
nisdas Nov 19, 2018
b095bdb
Merge branch 'master' of https://github.com/prysmaticlabs/geth-shardi…
nisdas Nov 19, 2018
3e9912b
Merge branch 'master' into syncFix
rauljordan Nov 20, 2018
bc3e16c
Merge branch 'master' into syncFix
rauljordan Nov 20, 2018
d7a3b16
fix lint
rauljordan Nov 20, 2018
8be20cb
Merge branch 'master' of https://github.com/prysmaticlabs/geth-shardi…
nisdas Nov 21, 2018
d627b0c
adding new clock , db methods, and util func
nisdas Nov 21, 2018
4c849d5
Merge branch 'syncFix' of https://github.com/nisdas/geth-sharding int…
nisdas Nov 21, 2018
2255845
revert change to test
nisdas Nov 21, 2018
d858f97
Merge branch 'master' of https://github.com/prysmaticlabs/geth-shardi…
nisdas Nov 21, 2018
93ec114
gazelle
nisdas Nov 21, 2018
e095372
add in test
nisdas Nov 21, 2018
02b1317
gazelle
nisdas Nov 21, 2018
8095263
finally working
nisdas Nov 21, 2018
0033c3a
save slot
nisdas Nov 21, 2018
fb9b9cc
Merge branch 'master' of https://github.com/prysmaticlabs/geth-shardi…
nisdas Nov 21, 2018
09d5c62
Merge branch 'master' into syncFix
terencechain Nov 21, 2018
f52abe7
fix lint and constant
rauljordan Nov 21, 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
… into syncFix
  • Loading branch information
nisdas committed Nov 21, 2018
commit 8be20cbdd8eee212a2918d62cf50db0a0d1669c7
Loading
Oops, something went wrong.
You are viewing a condensed version of this merge commit. You can view the full changes here.