Merge branch 'update-utxoset'

contrib/FastSync/load-utxo-set.sh

@@ -31,7 +31,7 @@ fi
 TAR_FILE="$1"
 
 if ! [[ "$UTXO_DOWNLOAD_LINK" ]]; then
-    [[ $NBITCOIN_NETWORK == "mainnet" ]] && UTXO_DOWNLOAD_LINK="http://utxosets.blob.core.windows.net/public/utxo-snapshot-bitcoin-mainnet-565305.tar"
+    [[ $NBITCOIN_NETWORK == "mainnet" ]] && UTXO_DOWNLOAD_LINK="http://utxosets.blob.core.windows.net/public/utxo-snapshot-bitcoin-mainnet-585333.tar"
     [[ $NBITCOIN_NETWORK == "testnet" ]] && UTXO_DOWNLOAD_LINK="http://utxosets.blob.core.windows.net/public/utxo-snapshot-bitcoin-testnet-1445586.tar"
 fi
 
@@ -82,7 +82,7 @@ if [[ $NBITCOIN_NETWORK == "testnet" ]]; then
 fi
 
 NETWORK_DIRECTORY="$BITCOIN_DATA_DIR/$NETWORK_DIRECTORY"
-[ -d "$NETWORK_DIRECTORY/blocks" ] && rm -rf "$NETWORK_DIRECTORY/blocks"
+[ -d "$NETWORK_DIRECTORY/blocks" ] && ( rm -rf "$NETWORK_DIRECTORY/blocks" || rm -rf $NETWORK_DIRECTORY/blocks/* )
 [ -d "$NETWORK_DIRECTORY/chainstate" ] && rm -rf "$NETWORK_DIRECTORY/chainstate"
 [ ! -d "$NETWORK_DIRECTORY" ] && mkdir "$NETWORK_DIRECTORY"
 

contrib/FastSync/sigs/NicolasDorier.utxo-sets.asc

@@ -4,19 +4,20 @@ Hash: SHA256
 fab994299273080bf7124c8c45c4ada867974ca747900178496a69e450cf713f  utxo-snapshot-bitcoin-mainnet-551636.tar
 eabaaa717bb8eeaf603e383dd8642d9d34df8e767fccbd208b0c936b79c82742  utxo-snapshot-bitcoin-testnet-1445586.tar
 8e18176138be351707aee95f349dd1debc714cc2cc4f0c76d6a7380988bf0d22  utxo-snapshot-bitcoin-mainnet-565305.tar
+58f65fc3e2abc367602c07ab0e7ae4a042e6acf2bc026623c7322d1886f52098  utxo-snapshot-bitcoin-mainnet-585333.tar
 -----BEGIN PGP SIGNATURE-----
 
-wsFcBAEBCAAQBQJcfMXICRBmGHY+8JGG/gAA3u4QALOWNroLjaLsX6WqF6eqYEL0
-PUZe7EFq/+ADGHuERFfew0Y8M2kySCUNbgh3+ih0Qp8+IUoSpx1KAxLfQrvzOLRC
-N0O01OWtFJVBvb+JKqjwYFipmAoxBqSW1RvHJ6ZXPGzlGiHmOqLiW7XjegQ0ZHSJ
-3dK+F9EIvFnglpawqrUtFuqEaYzBoi/dI2b9LCScnOZ/VLfsuIRfR8ffpdzE42ch
-Tudr7pi0kf52UDGky9nm3kqbYI2T7Wrqu761fLqKhDDpIjq1IIPij1XEaFzVqb6/
-Z+uo/FOa69DIsY1ijUBvFuBK3ep4Ge6AiAIiyuzjy1CoFAq7kPozhOLpveLeZR/m
-NULTTJ3ZuD4avh4MLzrLqBuyvsXPI66/kHBgS64bF/NbQ3sfsfAdFceLWP2txL6A
-M7OYcjrYATD1ivgAWde1LG6X0tZVI4jaic9JG4HszB49UieaJOSqjw4s8VLlI6e+
-f+oPSNE5JEZeRX/+P43GjHv2xZEU0aWGcrOdumL/LisfPuahnWbntrhvVM/7xlum
-CZWyiH8XOCNLgwUX+mfcxqseu4t/C57I8XT/SuFNVDWRiEYBBNJ9cb+ThoIKgjMi
-TTltY28Ko/vDqivlacPiyBguSoD8KgNOEvYs2CBEdO/1MK8VlLcaopx2TMRpDoYC
-eppW98Av+MZp03l4PbFi
-=jUwt
+wsFcBAEBCAAQBQJdLdR7CRDWQ44flNBSkgAAYBYQADglysaarrjnmeCOQdIBxb6z
+M6TxIQcNHeUJTGT35B8TRzrwldf0WPw8ILFEeyBoG4O5vjJdIa6cjdYtCEELT7Aj
+y6jRbF8jf81yUafo1Az2+em1JkyYUcioloO7hdF0X+QjYZ7PGK2H106DdZ+k/sQ2
+o9CRtUgSYMeMmKWM1J/RahFKpoDwzTZ4j/pQwnwENaWlmmB+3tKVDn2NYiBK7dh2
+UwD/o+mvCfAQNkAR5WWNjfKR051nRNK9PO/nQY9rtV2lmX8acRCrvH/VvD/4pFJS
+7fZNVhH4/VOCj9IuuGVPr1gwyWz6BEzxTRCh1EJzmEq4lMAquwJjM8FHojiWuAa1
+LG5teV8gQYS+0tPqZ1gYhhNjxc8gMiDkMg2r0fLpLwXwKam3hj7T1R0vwsRj31Wl
+UUZPnzpYpAEnMzox5nC21muLsgqmmYrErmiUjeoThDMJC2rPD25CLT7320jsETOu
+2KGawMdkvZQrLviT6pyr43Gbjn74k3YxQ9hk+1DoH5gXs5lut/PFqnBbhKoKoqqx
+0pDFS8wg0ToTI2fUajRQaQn5jEPvUwXxKUb0jmurVvPknuPldbewFuQnG+5HQmo2
+biHsnnptwt6k7sGxUe/6ipcR8igaUbyCV8GoFN3BbwvOhKeXt7ZilOi3mbfsPxBE
+R3j75diaJRlab4j/GemS
+=fQOO
 -----END PGP SIGNATURE-----

contrib/FastSync/utxo-sets

@@ -1,3 +1,4 @@
 fab994299273080bf7124c8c45c4ada867974ca747900178496a69e450cf713f  utxo-snapshot-bitcoin-mainnet-551636.tar
 eabaaa717bb8eeaf603e383dd8642d9d34df8e767fccbd208b0c936b79c82742  utxo-snapshot-bitcoin-testnet-1445586.tar
 8e18176138be351707aee95f349dd1debc714cc2cc4f0c76d6a7380988bf0d22  utxo-snapshot-bitcoin-mainnet-565305.tar
+58f65fc3e2abc367602c07ab0e7ae4a042e6acf2bc026623c7322d1886f52098  utxo-snapshot-bitcoin-mainnet-585333.tar