Danny Ryan
|
759185632f
|
Merge branch 'dev' into phase1-validator
|
2020-06-16 16:07:20 -06:00 |
Hsiao-Wei Wang
|
5e5a951c6f
|
Fix conflicts
|
2020-06-16 23:49:41 +08:00 |
|
Danny Ryan
|
a0175ca1b3
|
Merge branch 'dankrad-custody-256bit' into dankrad-custody-0.01bit
|
2020-06-16 07:15:00 -06:00 |
|
Hsiao-Wei Wang
|
458d343497
|
Fix configs and put domain types to the same table
|
2020-06-15 21:15:11 +08:00 |
|
Hsiao-Wei Wang
|
8697b30eea
|
Fix configuration
|
2020-06-15 15:30:32 +08:00 |
|
Hsiao-Wei Wang
|
e80f6727dc
|
Merge branch 'dev' into dankrad-custody-256bit
|
2020-06-15 15:13:45 +08:00 |
|
Hsiao-Wei Wang
|
aa75fb0b69
|
Fix `MAX_SHARDS` and move config files to `configs/{network}/{fork}`
|
2020-06-12 00:47:36 +08:00 |