From 62d7192a5059626396d6f0aa6b65380fde79db69 Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Fri, 10 Sep 2021 19:38:32 -0300
Subject: [PATCH] Add mainnet/testnet bootstrap files into repo

We use them everywhere now (include the debs) so it makes sense to have
them bundled here rather than needing a download during package build
(in particular for debs that's considered a bad thing).
---
 .gitattributes                   |   1 +
 .gitignore                       |   2 ++
 cmake/win32_installer_deps.cmake |   9 ++-------
 contrib/bootstrap/mainnet.signed | Bin 0 -> 923 bytes
 contrib/bootstrap/testnet.signed |   1 +
 daemon/CMakeLists.txt            |   3 +--
 6 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 contrib/bootstrap/mainnet.signed
 create mode 100644 contrib/bootstrap/testnet.signed

diff --git a/.gitattributes b/.gitattributes
index 9a5991388..40b418198 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,4 @@ external/date/test export-ignore
 external/nlohmann/doc export-ignore
 external/nlohmann/test export-ignore
 external/nlohmann/benchmarks/data export-ignore
+*.signed binary
diff --git a/.gitignore b/.gitignore
index 27e57ba86..d0dfc9844 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,8 @@ callgrind.*
 
 *.sig
 *.signed
+!/contrib/bootstrap/mainnet.signed
+!/contrib/bootstrap/testnet.signed
 *.key
 
 shadow.data
diff --git a/cmake/win32_installer_deps.cmake b/cmake/win32_installer_deps.cmake
index f928a5e60..95ea1aedf 100644
--- a/cmake/win32_installer_deps.cmake
+++ b/cmake/win32_installer_deps.cmake
@@ -5,17 +5,12 @@ endif()
 
 set(TUNTAP_URL "https://build.openvpn.net/downloads/releases/latest/tap-windows-latest-stable.exe")
 set(TUNTAP_EXE "${CMAKE_BINARY_DIR}/tuntap-install.exe")
-set(BOOTSTRAP_URL "https://seed.lokinet.org/lokinet.signed")
-set(BOOTSTRAP_FILE "${CMAKE_BINARY_DIR}/bootstrap.signed")
+set(BOOTSTRAP_FILE "${PROJECT_SOURCE_DIR}/contrib/bootstrap/mainnet.signed")
 
 file(DOWNLOAD
     ${TUNTAP_URL}
     ${TUNTAP_EXE})
 
-file(DOWNLOAD
-    ${BOOTSTRAP_URL}
-    ${BOOTSTRAP_FILE})
-
 file(DOWNLOAD
     ${GUI_ZIP_URL}
     ${CMAKE_BINARY_DIR}/lokinet-gui.zip
@@ -26,7 +21,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf ${CMAKE_BINARY_DIR}/lokinet-g
 
 install(DIRECTORY ${CMAKE_BINARY_DIR}/gui DESTINATION share COMPONENT gui)
 install(PROGRAMS ${TUNTAP_EXE} DESTINATION bin COMPONENT tuntap)
-install(FILES ${BOOTSTRAP_FILE} DESTINATION share COMPONENT lokinet)
+install(FILES ${BOOTSTRAP_FILE} DESTINATION share COMPONENT lokinet RENAME bootstrap.signed)
 
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Lokinet")
 set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/win32-setup/lokinet.ico")
diff --git a/contrib/bootstrap/mainnet.signed b/contrib/bootstrap/mainnet.signed
new file mode 100644
index 0000000000000000000000000000000000000000..4dabc8e935a4f3af369132bd655b91e44f6e5119
GIT binary patch
literal 923
zcmc~vF|<m|0TRiXMyZBYDaKZr<pqXTsm4ZDYpe3ltu+4byHK<I;Nef7zeZ{W1nXJy
zIbPdyy~2oV7EpDjk%5(!RT>ajnHuUD85!xB80i@qni*OZWEvV+8W;f8lw}&Erh?R(
zTjk_uXXd4r7+PfmO_x{T_pp!s`Ss6C&UJi=Zf*1DMmKJcIlXZ6>|Lwp@^)MSngLX$
zaEecB)As3lQ`bDY5U<`6k@liu!hGRA(M55k{*qfx3mRG#<p3=JA&b;Z6OcuvnLr0v
zm|B>bS(uv`8bh66XjPE|WLBA(Smn*!ecF(<<>f&${q83ZOit?`5?}x2$#FiDg<_NM
zKlT2YQ1Z==-^6{E+7TK3Kjq=P-}iIpy#Ah+eWTKD&%sH5SW<BZSykR71~b(U*Vq1Z
zb95_+5HC@lThZ&_dLyMIH1biHD==U)jSOKyW@uufXKtovXl9~kWB?Q<BFq^0IhSv!
z(73Z*>-$-;)`Eb8JWP8d)^B*+DEK?)mi&82n4OmXq`U3fwK<BR_o__9ijrnE%S0d1
zTDQmRPr%_cX8~K(Ff&34Gh<^5GgDAP07V;8m@!_N=Gv||_uI_g+Y=t1&3}E*=en2X
zr=H`tb^fRrwq_Q6<wz<#BcuE>sH(R0&)mZ?8<zhUUJ~#r|I7Rn_mck9v*QV~t7$yW
zYN4%G3Xg==aL;GWvzgm}%S(K{R?@>)K5ftbu>!-)&=MYImX>;kM&^2E271J$vH*VZ
z>ot-^7rMB9AC3;~*0EGiiddVj;H7SESDVFm77}9WQ~Ay@UMqb4M5Z;9seMCg@7g$_
z`MYegL~cw|Te=}u3N^$~Qkk)-xv7PLC1!}FU)Q^v=_B)zMeml8VE?<4D~}90G+(NA
w#r`-iVy<PAQg0~4-TzBQBQhr7Md#E~saWp4TfTTsOXdhlIJ@pn5o2m90B@jU>i_@%

literal 0
HcmV?d00001

diff --git a/contrib/bootstrap/testnet.signed b/contrib/bootstrap/testnet.signed
new file mode 100644
index 000000000..9ad107115
--- /dev/null
+++ b/contrib/bootstrap/testnet.signed
@@ -0,0 +1 @@
+d1:ald1:ci2e1:d3:iwp1:e32:9ãxÚsX«l%ìû€ê<,sØ›”•©÷ïå_1:i21:::ffff:144.76.164.2021:pi1666e1:vi0eee1:i5:gamma1:k32:ÞÊðòm=o›„ZÐ1ÿßmcŒ%»¸ÿû¾™SĹ1:p32:!E
Ïâéz˜ý:Š‹úý…/0¡Ú„Ãݪ„µNçB1:rli0ei0ei8ei3ee1:ui1614788310454e1:vi0e1:xle1:z64:Œ¤u G¿”D“=Œxµ¢{ïÌ51þ`í߀ùEâwm)q2Øg¯±˜øš ï³À)˜TÑP•´ò³ö—Á1e
\ No newline at end of file
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index 877887b81..1eea3132a 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -88,10 +88,9 @@ if(APPLE)
     DEPENDS ${PROJECT_SOURCE_DIR}/contrib/lokinet.svg ${PROJECT_SOURCE_DIR}/contrib/macos/mk-icns.sh)
   add_custom_target(icons DEPENDS ${mac_icon})
   add_dependencies(lokinet icons lokinet-extension)
-  file(DOWNLOAD "https://seed.lokinet.org/lokinet.signed" ${CMAKE_CURRENT_BINARY_DIR}/bootstrap.signed)
   add_custom_command(TARGET lokinet
     POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/bootstrap.signed 
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/contrib/bootstrap/mainnet.signed
         $<TARGET_BUNDLE_DIR:lokinet-extension>/Contents/Resources/bootstrap.signed
     COMMAND mkdir -p $<TARGET_BUNDLE_DIR:lokinet>/Contents/PlugIns
     COMMAND cp -a $<TARGET_BUNDLE_DIR:lokinet-extension> $<TARGET_BUNDLE_DIR:lokinet>/Contents/PlugIns/