diff options
Diffstat (limited to 'world')
| -rw-r--r-- | world/earth-2015-11-20.bin | bin | 0 -> 792 bytes | |||
| -rw-r--r-- | world/mkworld.cpp | 16 |
2 files changed, 3 insertions, 13 deletions
diff --git a/world/earth-2015-11-20.bin b/world/earth-2015-11-20.bin Binary files differnew file mode 100644 index 00000000..198682e5 --- /dev/null +++ b/world/earth-2015-11-20.bin diff --git a/world/mkworld.cpp b/world/mkworld.cpp index 551ba2fd..a14aa55c 100644 --- a/world/mkworld.cpp +++ b/world/mkworld.cpp @@ -108,18 +108,8 @@ int main(int argc,char **argv) std::vector<World::Root> roots; - // - // The initial version of the World uses the old root server infrastructure. - // The new "Alice and Bob" infrastructure will replace this gradually, with - // Paris probably being the first node to be taken over and clusterized. - // - // ZeroTier does actual World generation on an air-gapped machine by copying - // this code over, building it there and running, then saving the results - // onto a USB key. - // - const uint64_t id = ZT_WORLD_ID_EARTH; - const uint64_t ts = 1447696577275ULL; // November 16th, 2015 ~9:56AM + const uint64_t ts = 1448048819338ULL; // November 20th, 2015 ~11:47AM // Alice roots.push_back(World::Root()); @@ -153,12 +143,12 @@ int main(int argc,char **argv) roots.back().stableEndpoints.push_back(InetAddress("159.203.2.154/9993")); // Toronto roots.back().stableEndpoints.push_back(InetAddress("2604:a880:cad:d0::26:7001/9993")); // Toronto - // old US-SFO + // old US-SFO -- we will keep these around for a little while roots.push_back(World::Root()); roots.back().identity = Identity("7e19876aba:0:2a6e2b2318930f60eb097f70d0f4b028b2cd6d3d0c63c014b9039ff35390e41181f216fb2e6fa8d95c1ee9667156411905c3dccfea78d8c6dfafba688170b3fa"); roots.back().stableEndpoints.push_back(InetAddress("198.199.97.220/9993")); - // old US-NYC + // old US-NYC -- we will keep these around for a little while roots.push_back(World::Root()); roots.back().identity = Identity("8acf059fe3:0:482f6ee5dfe902319b419de5bdc765209c0ecda38c4d6e4fcf0d33658398b4527dcd22f93112fb9befd02fd78bf7261b333fc105d192a623ca9e50fc60b374a5"); roots.back().stableEndpoints.push_back(InetAddress("162.243.77.111/9993")); |