From 2e5caa335a60b701dd184e775b6491e1491cf94c Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 13 Jan 2016 10:18:41 -0800 Subject: Old SF root is dead. Now we are just on Alice and Bob. (world update for 1.1.4) --- world/earth-2015-11-16.bin | Bin 494 -> 0 bytes world/earth-2015-11-20.bin | Bin 792 -> 0 bytes world/earth-2015-12-17.bin | Bin 732 -> 0 bytes world/earth-2016-01-13.bin | Bin 0 -> 634 bytes world/mkworld.cpp | 8 +------- world/old/earth-2015-11-16.bin | Bin 0 -> 494 bytes world/old/earth-2015-11-20.bin | Bin 0 -> 792 bytes world/old/earth-2015-12-17.bin | Bin 0 -> 732 bytes 8 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 world/earth-2015-11-16.bin delete mode 100644 world/earth-2015-11-20.bin delete mode 100644 world/earth-2015-12-17.bin create mode 100644 world/earth-2016-01-13.bin create mode 100644 world/old/earth-2015-11-16.bin create mode 100644 world/old/earth-2015-11-20.bin create mode 100644 world/old/earth-2015-12-17.bin (limited to 'world') diff --git a/world/earth-2015-11-16.bin b/world/earth-2015-11-16.bin deleted file mode 100644 index 910ff144..00000000 Binary files a/world/earth-2015-11-16.bin and /dev/null differ diff --git a/world/earth-2015-11-20.bin b/world/earth-2015-11-20.bin deleted file mode 100644 index 198682e5..00000000 Binary files a/world/earth-2015-11-20.bin and /dev/null differ diff --git a/world/earth-2015-12-17.bin b/world/earth-2015-12-17.bin deleted file mode 100644 index 20fadb56..00000000 Binary files a/world/earth-2015-12-17.bin and /dev/null differ diff --git a/world/earth-2016-01-13.bin b/world/earth-2016-01-13.bin new file mode 100644 index 00000000..5dea4d21 Binary files /dev/null and b/world/earth-2016-01-13.bin differ diff --git a/world/mkworld.cpp b/world/mkworld.cpp index 03ad92f9..061d6341 100644 --- a/world/mkworld.cpp +++ b/world/mkworld.cpp @@ -100,7 +100,7 @@ int main(int argc,char **argv) std::vector roots; const uint64_t id = ZT_WORLD_ID_EARTH; - const uint64_t ts = 1450381818269ULL; // December 17th, 2015 + const uint64_t ts = 1452708876314ULL; // January 13th, 2016 // Alice roots.push_back(World::Root()); @@ -134,12 +134,6 @@ 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, which is being kept alive for now - roots.push_back(World::Root()); - roots.back().identity = Identity("7e19876aba:0:2a6e2b2318930f60eb097f70d0f4b028b2cd6d3d0c63c014b9039ff35390e41181f216fb2e6fa8d95c1ee9667156411905c3dccfea78d8c6dfafba688170b3fa"); - roots.back().stableEndpoints.push_back(InetAddress("198.199.97.220/9993")); - roots.back().stableEndpoints.push_back(InetAddress("2604:a880:1:20::c5:f001/9993")); - // END WORLD DEFINITION // ========================================================================= diff --git a/world/old/earth-2015-11-16.bin b/world/old/earth-2015-11-16.bin new file mode 100644 index 00000000..910ff144 Binary files /dev/null and b/world/old/earth-2015-11-16.bin differ diff --git a/world/old/earth-2015-11-20.bin b/world/old/earth-2015-11-20.bin new file mode 100644 index 00000000..198682e5 Binary files /dev/null and b/world/old/earth-2015-11-20.bin differ diff --git a/world/old/earth-2015-12-17.bin b/world/old/earth-2015-12-17.bin new file mode 100644 index 00000000..20fadb56 Binary files /dev/null and b/world/old/earth-2015-12-17.bin differ -- cgit v1.2.3