Merge pull request #174 from QuickMythril/fix-unit-tests

Update ElectrumX servers & fix unit tests

src/main/java/org/qortal/crosschain/Bitcoin.java

@@ -46,74 +46,62 @@ public class Bitcoin extends Bitcoiny {
 				return Arrays.asList(
 					// Servers chosen on NO BASIS WHATSOEVER from various sources!
 					// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=btc
-					new Server("104.248.139.211", Server.ConnectionType.SSL, 50002),
+					new Server("104.198.149.61", Server.ConnectionType.SSL, 50002),
 					new Server("128.0.190.26", Server.ConnectionType.SSL, 50002),
-					new Server("142.93.6.38", Server.ConnectionType.SSL, 50002),
 					new Server("157.245.172.236", Server.ConnectionType.SSL, 50002),
-					new Server("167.172.226.175", Server.ConnectionType.SSL, 50002),
+					new Server("260.whyza.net", Server.ConnectionType.SSL, 50002),
-					new Server("167.172.42.31", Server.ConnectionType.SSL, 50002),
+					new Server("34.136.93.37", Server.ConnectionType.SSL, 50002),
-					new Server("178.62.80.20", Server.ConnectionType.SSL, 50002),
+					new Server("34.67.22.216", Server.ConnectionType.SSL, 50002),
-					new Server("185.64.116.15", Server.ConnectionType.SSL, 50002),
+					new Server("34.68.133.78", Server.ConnectionType.SSL, 50002),
-					new Server("188.165.206.215", Server.ConnectionType.SSL, 50002),
+					new Server("alviss.coinjoined.com", Server.ConnectionType.SSL, 50002),
-					new Server("188.165.211.112", Server.ConnectionType.SSL, 50002),
-					new Server("2azzarita.hopto.org", Server.ConnectionType.SSL, 50002),
-					new Server("2electrumx.hopto.me", Server.ConnectionType.SSL, 56022),
-					new Server("2ex.digitaleveryware.com", Server.ConnectionType.SSL, 50002),
-					new Server("65.39.140.37", Server.ConnectionType.SSL, 50002),
-					new Server("68.183.188.105", Server.ConnectionType.SSL, 50002),
-					new Server("71.73.14.254", Server.ConnectionType.SSL, 50002),
-					new Server("94.23.247.135", Server.ConnectionType.SSL, 50002),
-					new Server("assuredly.not.fyi", Server.ConnectionType.SSL, 50002),
-					new Server("ax101.blockeng.ch", Server.ConnectionType.SSL, 50002),
-					new Server("ax102.blockeng.ch", Server.ConnectionType.SSL, 50002),
 					new Server("b.1209k.com", Server.ConnectionType.SSL, 50002),
 					new Server("b6.1209k.com", Server.ConnectionType.SSL, 50002),
 					new Server("bitcoin.dermichi.com", Server.ConnectionType.SSL, 50002),
 					new Server("bitcoin.lu.ke", Server.ConnectionType.SSL, 50002),
 					new Server("bitcoin.lukechilds.co", Server.ConnectionType.SSL, 50002),
 					new Server("blkhub.net", Server.ConnectionType.SSL, 50002),
-					new Server("btc.electroncash.dk", Server.ConnectionType.SSL, 60002),
+					new Server("btc.aftrek.org", Server.ConnectionType.SSL, 50002),
+					new Server("btc.hodler.ninja", Server.ConnectionType.SSL, 50002),
 					new Server("btc.ocf.sh", Server.ConnectionType.SSL, 50002),
 					new Server("btce.iiiiiii.biz", Server.ConnectionType.SSL, 50002),
 					new Server("caleb.vegas", Server.ConnectionType.SSL, 50002),
+					new Server("d762li0k0g.d.firewalla.org", Server.ConnectionType.SSL, 50002),
+					new Server("de.poiuty.com", Server.ConnectionType.SSL, 50002),
+					new Server("dijon.anties.org", Server.ConnectionType.SSL, 50002),
 					new Server("eai.coincited.net", Server.ConnectionType.SSL, 50002),
-					new Server("electrum.bhoovd.com", Server.ConnectionType.SSL, 50002),
 					new Server("electrum.bitaroo.net", Server.ConnectionType.SSL, 50002),
-					new Server("electrum.bitcoinlizard.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.bitrefill.com", Server.ConnectionType.SSL, 50002),
-					new Server("electrum.blockstream.info", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.brainshome.de", Server.ConnectionType.SSL, 50002),
 					new Server("electrum.emzy.de", Server.ConnectionType.SSL, 50002),
-					new Server("electrum.exan.tech", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.kcicom.net", Server.ConnectionType.SSL, 50002),
 					new Server("electrum.kendigisland.xyz", Server.ConnectionType.SSL, 50002),
-					new Server("electrum.mmitech.info", Server.ConnectionType.SSL, 50002),
-					new Server("electrum.petrkr.net", Server.ConnectionType.SSL, 50002),
-					new Server("electrum.stippy.com", Server.ConnectionType.SSL, 50002),
 					new Server("electrum.thomasfischbach.de", Server.ConnectionType.SSL, 50002),
+					new Server("electrum-btc.leblancnet.us", Server.ConnectionType.SSL, 50002),
 					new Server("electrum0.snel.it", Server.ConnectionType.SSL, 50002),
-					new Server("electrum1.cipig.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrum1.cipig.net", Server.ConnectionType.SSL, 20000),
-					new Server("electrum2.cipig.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrum2.cipig.net", Server.ConnectionType.SSL, 20000),
-					new Server("electrum3.cipig.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrum3.cipig.net", Server.ConnectionType.SSL, 20000),
-					new Server("electrumx.alexridevski.net", Server.ConnectionType.SSL, 50002),
+					new Server("electrumx.blockfinance-eco.li", Server.ConnectionType.SSL, 50002),
+					new Server("electrumx.indoor.app", Server.ConnectionType.SSL, 50002),
+					new Server("electrumx.iodata.org", Server.ConnectionType.SSL, 50002),
 					new Server("electrumx-core.1209k.com", Server.ConnectionType.SSL, 50002),
 					new Server("elx.bitske.com", Server.ConnectionType.SSL, 50002),
-					new Server("ex03.axalgo.com", Server.ConnectionType.SSL, 50002),
+					new Server("exs.dyshek.org", Server.ConnectionType.SSL, 50002),
-					new Server("ex05.axalgo.com", Server.ConnectionType.SSL, 50002),
-					new Server("ex07.axalgo.com", Server.ConnectionType.SSL, 50002),
 					new Server("fortress.qtornado.com", Server.ConnectionType.SSL, 50002),
-					new Server("fulcrum.grey.pw", Server.ConnectionType.SSL, 50002),
-					new Server("fulcrum.sethforprivacy.com", Server.ConnectionType.SSL, 51002),
 					new Server("guichet.centure.cc", Server.ConnectionType.SSL, 50002),
+					new Server("hodl.artyomk13.me", Server.ConnectionType.SSL, 50002),
 					new Server("hodlers.beer", Server.ConnectionType.SSL, 50002),
 					new Server("kareoke.qoppa.org", Server.ConnectionType.SSL, 50002),
 					new Server("kirsche.emzy.de", Server.ConnectionType.SSL, 50002),
+					new Server("kittyserver.ddnsfree.com", Server.ConnectionType.SSL, 50002),
+					new Server("lille.anties.org", Server.ConnectionType.SSL, 50002),
+					new Server("marseille.anties.org", Server.ConnectionType.SSL, 50002),
 					new Server("node1.btccuracao.com", Server.ConnectionType.SSL, 50002),
 					new Server("osr1ex1.compumundohipermegared.one", Server.ConnectionType.SSL, 50002),
-					new Server("smmalis37.ddns.net", Server.ConnectionType.SSL, 50002),
+					new Server("paris.anties.org", Server.ConnectionType.SSL, 50002),
-					new Server("ulrichard.ch", Server.ConnectionType.SSL, 50002),
+					new Server("ragtor.duckdns.org", Server.ConnectionType.SSL, 50002),
-					new Server("vmd104012.contaboserver.net", Server.ConnectionType.SSL, 50002),
+					new Server("stavver.dyshek.org", Server.ConnectionType.SSL, 50002),
-					new Server("vmd104014.contaboserver.net", Server.ConnectionType.SSL, 50002),
 					new Server("vmd63185.contaboserver.net", Server.ConnectionType.SSL, 50002),
-					new Server("vmd71287.contaboserver.net", Server.ConnectionType.SSL, 50002),
-					new Server("vmd84592.contaboserver.net", Server.ConnectionType.SSL, 50002),
 					new Server("xtrum.com", Server.ConnectionType.SSL, 50002)
 				);
 			}
@@ -141,12 +129,17 @@ public class Bitcoin extends Bitcoiny {
 			@Override
 			public Collection<ElectrumX.Server> getServers() {
 				return Arrays.asList(
-					new Server("tn.not.fyi", Server.ConnectionType.SSL, 55002),
+					new Server("bitcoin.devmole.eu", Server.ConnectionType.TCP, 5000),
-					new Server("electrumx-test.1209k.com", Server.ConnectionType.SSL, 50002),
+					new Server("bitcoin.stagemole.eu", Server.ConnectionType.TCP, 5000),
-					new Server("testnet.qtornado.com", Server.ConnectionType.SSL, 51002),
+					new Server("blockstream.info", Server.ConnectionType.SSL, 993),
-					new Server("testnet.aranguren.org", Server.ConnectionType.TCP, 51001),
+					new Server("electrum.blockstream.info", Server.ConnectionType.SSL, 60002),
+					new Server("electrum1.cipig.net", Server.ConnectionType.TCP, 10068),
+					new Server("electrum2.cipig.net", Server.ConnectionType.TCP, 10068),
+					new Server("electrum3.cipig.net", Server.ConnectionType.TCP, 10068),
 					new Server("testnet.aranguren.org", Server.ConnectionType.SSL, 51002),
-					new Server("testnet.hsmiths.com", Server.ConnectionType.SSL, 53012)
+					new Server("testnet.hsmiths.com", Server.ConnectionType.SSL, 53012),
+					new Server("testnet.qtornado.com", Server.ConnectionType.SSL, 51002),
+					new Server("v22019051929289916.bestsrv.de", Server.ConnectionType.SSL, 50002)
 				);
 			}
 

src/main/java/org/qortal/crosschain/Dogecoin.java

@@ -45,6 +45,7 @@ public class Dogecoin extends Bitcoiny {
 				return Arrays.asList(
 					// Servers chosen on NO BASIS WHATSOEVER from various sources!
 					// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=doge
+					new Server("dogecoin.stackwallet.com", Server.ConnectionType.SSL, 50022),
 					new Server("electrum.qortal.link", Server.ConnectionType.SSL, 54002),
 					new Server("electrum1.cipig.net", Server.ConnectionType.SSL, 20060),
 					new Server("electrum2.cipig.net", Server.ConnectionType.SSL, 20060),

src/main/java/org/qortal/crosschain/Litecoin.java

@@ -45,9 +45,9 @@ public class Litecoin extends Bitcoiny {
 				return Arrays.asList(
 					// Servers chosen on NO BASIS WHATSOEVER from various sources!
 					// Status verified at https://1209k.com/bitcoin-eye/ele.php?chain=ltc
-					new Server("electrum.qortal.link", Server.ConnectionType.SSL, 50002),
 					new Server("backup.electrum-ltc.org", Server.ConnectionType.SSL, 443),
 					new Server("electrum.ltc.xurious.com", Server.ConnectionType.SSL, 50002),
+					new Server("electrum.qortal.link", Server.ConnectionType.SSL, 50002),
 					new Server("electrum-ltc.petrkr.net", Server.ConnectionType.SSL, 60002),
 					new Server("electrum1.cipig.net", Server.ConnectionType.SSL, 20063),
 					new Server("electrum2.cipig.net", Server.ConnectionType.SSL, 20063),
@@ -76,9 +76,7 @@ public class Litecoin extends Bitcoiny {
 			@Override
 			public Collection<ElectrumX.Server> getServers() {
 				return Arrays.asList(
-					new Server("electrum-ltc.bysh.me", Server.ConnectionType.TCP, 51001),
 					new Server("electrum-ltc.bysh.me", Server.ConnectionType.SSL, 51002),
-					new Server("electrum.ltc.xurious.com", Server.ConnectionType.TCP, 51001),
 					new Server("electrum.ltc.xurious.com", Server.ConnectionType.SSL, 51002)
 				);
 			}

src/test/java/org/qortal/test/crosschain/BitcoinTests.java

@@ -41,24 +41,4 @@ public class BitcoinTests extends BitcoinyTests {
 	protected String getRecipient() {
 		return "2N8WCg52ULCtDSMjkgVTm5mtPdCsUptkHWE";
 	}
-
-	@Test
-	@Ignore("Often fails due to unreliable BTC testnet ElectrumX servers")
-	public void testGetMedianBlockTime() {}
-
-	@Test
-	@Ignore("Often fails due to unreliable BTC testnet ElectrumX servers")
-	public void testFindHtlcSecret() {}
-
-	@Test
-	@Ignore("Often fails due to unreliable BTC testnet ElectrumX servers")
-	public void testBuildSpend() {}
-
-	@Test
-	@Ignore("Often fails due to unreliable BTC testnet ElectrumX servers")
-	public void testGetWalletBalance() {}
-
-	@Test
-	@Ignore("Often fails due to unreliable BTC testnet ElectrumX servers")
-	public void testGetUnusedReceiveAddress() {}
 }

src/test/java/org/qortal/test/crosschain/DigibyteTests.java

@@ -29,17 +29,17 @@ public class DigibyteTests extends BitcoinyTests {
 
 	@Override
 	protected String getDeterministicKey58() {
-		return "xpub661MyMwAqRbcEnabTLX5uebYcsE3uG5y7ve9jn1VK8iY1MaU3YLoLJEe8sTu2YVav5Zka5qf2dmMssfxmXJTqZnazZL2kL7M2tNKwEoC34R";
+		return "xprv9z8QpS7vxwMC2fCnG1oZc6c4aFRLgsqSF86yWrJBKEzMY3T3ySCo85x8Uv5FxTavAQwgEDy1g3iLRT5kdtFjoNNBKukLTMzKwCUn1Abwoxg";
 	}
 
 	@Override
 	protected String getDeterministicPublicKey58() {
-		return "xpub661MyMwAqRbcEnabTLX5uebYcsE3uG5y7ve9jn1VK8iY1MaU3YLoLJEe8sTu2YVav5Zka5qf2dmMssfxmXJTqZnazZL2kL7M2tNKwEoC34R";
+		return "xpub6D7mDwepoJuVF9HFN3LZyEYo8HFq6LZHcM2aKEhnsaXLQqnCWyX3ftGcLDcjYmiPCc9GNX4VjfT32hwvYQnh9H5Z5diAvMsXRrxFmckyNoR";
 	}
 
 	@Override
 	protected String getRecipient() {
-		return "2N8WCg52ULCtDSMjkgVTm5mtPdCsUptkHWE";
+		return null;
 	}
 
 	@Test

src/test/java/org/qortal/test/crosschain/PirateChainTests.java

@@ -259,4 +259,8 @@ public class PirateChainTests extends BitcoinyTests {
 	@Test
 	@Ignore(value = "Needs adapting for Pirate Chain")
 	public void testWalletSpendingCandidateAddresses() throws ForeignBlockchainException {}
+
+	@Test
+	@Ignore(value = "Needs adapting for Pirate Chain")
+	public void testRepair() throws ForeignBlockchainException {}
 }

src/test/java/org/qortal/test/crosschain/RavencoinTests.java

@@ -29,12 +29,12 @@ public class RavencoinTests extends BitcoinyTests {
 
 	@Override
 	protected String getDeterministicKey58() {
-		return "xpub661MyMwAqRbcEt3Ge1wNmkagyb1J7yTQu4Kquvy77Ycg2iPoh7Urg8s9Jdwp7YmrqGkDKJpUVjsZXSSsQgmAVUC17ZVQQeoWMzm7vDTt1y7";
+		return "xprv9z8QpS7vxwMC2fCnG1oZc6c4aFRLgsqSF86yWrJBKEzMY3T3ySCo85x8Uv5FxTavAQwgEDy1g3iLRT5kdtFjoNNBKukLTMzKwCUn1Abwoxg";
 	}
 
 	@Override
 	protected String getDeterministicPublicKey58() {
-		return "xpub661MyMwAqRbcEt3Ge1wNmkagyb1J7yTQu4Kquvy77Ycg2iPoh7Urg8s9Jdwp7YmrqGkDKJpUVjsZXSSsQgmAVUC17ZVQQeoWMzm7vDTt1y7";
+		return "xpub6D7mDwepoJuVF9HFN3LZyEYo8HFq6LZHcM2aKEhnsaXLQqnCWyX3ftGcLDcjYmiPCc9GNX4VjfT32hwvYQnh9H5Z5diAvMsXRrxFmckyNoR";
 	}
 
 	@Override