Skip to content

Commit 0e92070

Browse files
authored
Update channels-db test and update electrum servers list (#766)
* clean up test and remove obsolete channel tests * Add test for channels-db similar to payments The test purpose is only to read the sql file in v1, not to test the channels data serialization. * Update the list of mainnet electrum servers
1 parent bfec3e0 commit 0e92070

15 files changed

Lines changed: 154 additions & 333 deletions

phoenix-android/src/main/res/values-vi/important_strings.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
~
2828
~ Most technical resource strings should stay in the default `strings.xml` file.
2929
-->
30-
<resources>
30+
<resources xmlns:tools="http://schemas.android.com/tools">
3131

3232
<!-- system notifications -->
3333

@@ -410,7 +410,7 @@
410410
<string name="liquidityads_estimate_details_duration">Thời hạn</string>
411411
<string name="liquidityads_estimate_details_duration_value">1 năm</string>
412412
<string name="liquidityads_estimate_details_duration_help">Dung lượng bổ sung sẽ được duy trì trong thời hạn này.</string>
413-
<string name="liquidityads_estimate_above_25">Tổng phí cao hơn 25% so với khoản thanh khoản đã yêu cầu.</string>
413+
<string name="liquidityads_estimate_above_25" tools:ignore="StringFormatInvalid">Tổng phí cao hơn 25% so với khoản thanh khoản đã yêu cầu.</string>
414414
<string name="liquidityads_over_balance">Tổng phí vượt quá số dư của bạn.</string>
415415

416416
<string name="liquidityads_review_button">Xem lại yêu cầu</string>

phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/data/ElectrumServers.kt

Lines changed: 70 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@ private fun electrumServerOnion(host: String, port: Int = 50002): ServerAddress
1515

1616
val mainnetElectrumServers = listOf(
1717
electrumServer(host = "electrum.acinq.co"),
18-
electrumServer(
19-
host = "E-X.not.fyi", publicKey =
20-
"MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA8wmp3hyau0aAOjszUUJY" +
21-
"YcMlDqlQ0/Gi7xYf0id1CG+e0yjU2pHuPXgnEmtXdsLIF5GleU7LP5L1xPrzGQD3" +
22-
"LZb8CGKcl7Ve9H167wt5kiehJ/AaF4xcL96uaGQ8ykZMxZrz01AD72mT7u9S7IJt" +
23-
"ypdHbiSq9YiTQj/lscYw318woRV/VLf9qaPfANileffEDRuOJB4OT6FizB+1CDoD" +
24-
"ayI8J7sEiPPYuV7/ttNIEGH6wQCQLxQHQAP6fkAAQ+WMuwl2UeG7NvDocHZJp5hA" +
25-
"L0LJkgquH4LaoFzzA2Yh61Ep1uWeRH7KKlXQnhPRUkgUKfrgovhT5kyszIIpkZiZ" +
26-
"Z2g15fXTRVp2WBxJSa9qPEgg310T37KFXwaV08XdnEEa7pz5oHYUcUPGlRWuYDVQ" +
27-
"X7HAUYvwT84eRvEj+E6L3FhsI0EulzvaHUO8SvKjSK94yoG6FepFi95eNdAwIUXg" +
28-
"LgOWKu/zsdCoDWbaA9nihIJw9ZPESbb8q1WDAOV+M6YLcAyE0hLWDzra3euxUAuB" +
29-
"vIc/tP8RkJ1tzrHE+3KosNAO7y8mP4XlnPvkY5ZS01VXL6a+NoPcDL3+tZr1jjb4" +
30-
"XBjxhaQKn4EhlvwTURL9VOoZADOnVU+DmGiTRJbKNIL84yio/nIubKrD4eONggUh" +
31-
"QDEcaySiP9R+yKz5C9o/WlUCAwEAAQ=="
32-
),
3318
electrumServer(
3419
host = "btc.cihar.com", publicKey =
3520
"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs0gd2ZsghxUZNwjY6cAD" +
@@ -40,7 +25,6 @@ val mainnetElectrumServers = listOf(
4025
"2n62mHT9vfKhTGIoOXR989v6FA+EIYAklIL2ptX3vLqqvOnRjB122b9eT5ZpZhNi" +
4126
"uwIDAQAB"
4227
),
43-
electrumServer(host = "e.keff.org"), // certificate has expired
4428
electrumServer(
4529
host = "tardis.bauerj.eu", publicKey =
4630
"MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxLHijYCSNS9SDOgcMPo3" +
@@ -98,17 +82,22 @@ val mainnetElectrumServers = listOf(
9882
),
9983
electrumServer(
10084
host = "ecdsa.net", port = 110, publicKey =
101-
"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzGHtaM37N0tgS7xcWmSq" +
102-
"S2eOHBOtsZIGkkccbQbdmkgSpMGZSJgr23OofrlhmcdzFIzlqK2nXii7+5KW3Lgs" +
103-
"zHKt9pArroFRRRFvoWHp5ijWYRATo7GKVPCngCPbg4fl4wxPYp9yg14BPe7BJfSN" +
104-
"Stz6gV+akcCmKMVfqN5JFqPuuzOmSib270TgHCtIUccgDqHdP1muPQWZjCCxjePT" +
105-
"f6e6J478Bh+Eop4lqvpEiLGeU/6Qj2oZ2tmO7j09J6Ycp0FHBISuCWWUCuZmIEk/" +
106-
"NGOIUagggRU2tVFeW6wjSm1T3Q/z/b6G5oIaldZnklqo//79d3B4Fjj+C8lnFhpP" +
107-
"/wIDAQAB"
85+
"MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAu1H7Mbtz/YJKdmCaKeaK" +
86+
"VUJ6G2VoWOo9yHZkJZHncc5mz/pN7f5QK3mJDakwaXTw64RY3w2P3SLhnujQDYtS" +
87+
"oVX9K278xv8yrJBNg6ts0UsORkdzqjxJ2FcoLB4r1HcYxaPYEw8hM4h7nGsZ7gHk" +
88+
"StTtaqIAmBNb4dv/kDPQ2HpdXTzJLIABkFL+BFW3nYrcKxYpZZDgn1kTMQhEIZYb" +
89+
"t5azXqVUVgR/ZRfu+2BliN5nPTLns0XrGS4tVPa00U68lOVje/wXv0HESdAbyl5h" +
90+
"sSTcb81djECD2uLk1oQo2N+/KAPaJnwPCLxpSolr8RUNXYDdwKdPz7vNngTw55GO" +
91+
"R+AIaeLXDFBZzHv+bsYOtyFhc5PUjhldaMIG72CbF6uTc1nEhLQdpJ0WTuDTT29D" +
92+
"uP4AI7D+nS5wJ9OSW7GA3gPUB5sKv/AWEhRgqqgJDQDw+zKYx++P9VZ0Ebk/chXK" +
93+
"j8IdusF8UsEkRy4TAONpgssIMVfb793lXnFP4/vEzUmxHEglLJ63r9eUtA7kph4f" +
94+
"KqIwnSPGFQ2NB37AqsXSdLeb0zcBPJ+rZK7TO9aUfG3toLcoQ1moi0k6J6dreTis" +
95+
"By3WGCPnSVAnq3vVJyvABfcJQuhXoQ+nF48e3XbfQ1Gnj1Gy6ZB7ikTMOU1KTYzL" +
96+
"A8FCjlZR1zNWRA+jHppqMcsCAwEAAQ=="
10897
),
109-
electrumServer(host = "electrum.hodlister.co"),
110-
electrumServer(host = "electrum3.hodlister.co"),
111-
electrumServer(host = "electrum5.hodlister.co"),
98+
// electrumServer(host = "electrum.hodlister.co"), too slow
99+
// electrumServer(host = "electrum3.hodlister.co"), too slow
100+
// electrumServer(host = "electrum5.hodlister.co"), too slow
112101
electrumServer(
113102
host = "fortress.qtornado.com", publicKey =
114103
"MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAy7xI+hVU3rUSAyMMX8OI" +
@@ -125,7 +114,61 @@ val mainnetElectrumServers = listOf(
125114
"Gcc9FdI7SUP85+RR9XnyL9cCAwEAAQ=="
126115
),
127116
electrumServer(host = "electrum.blockstream.info"),
128-
electrumServer(host = "blockstream.info", port = 700)
117+
electrumServer(host = "blockstream.info", port = 700),
118+
electrumServer(host = "alviss.coinjoined.com",
119+
publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr8Bmk8+FLFdI9IF+6jZW" +
120+
"pQ2He/8XuWvHgkI7gBylsLtprca+mRvs2ejZef/s6daffy70faQM4ub6NZx+Mg53" +
121+
"l/R3TAjQwPvu/3fVJfrUG9JvLvYBuBBoB/uKsFHXoa6OyEy8qd81Lvnx3vOb+DFA" +
122+
"JD2snJ110yjF4XmXXukdptmO/MsjVVEn1VX0kPORVrP6JC/W79+zskaulbOpeFC6" +
123+
"0j3Ss0a5blglUhVyJ49LZy+TvxXhss37VGkZak33Cz3oDEWMnvNWWMUmTdyDMDHH" +
124+
"z4hjsP6ltTWbfci6d99YmtW4fxMmcO7TlBka69Oq0QGhMxRtrwEUjDr6OUsI7GtL" +
125+
"vwIDAQAB"),
126+
electrumServer(host = "bitcoin.aranguren.org",
127+
publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9IpKA+SdtQIQRcXPFBp0" +
128+
"XxgqOYWW6U1u7e/fOPrz+NF5gzwvhrmH7arRUrlztkhLGtUr2NmhbG6trBiQ95Ye" +
129+
"+VnGfgU3IXfnpsvXMOA5PCR3tJGpf40jD1fMYtF7gjdDYQlDYOxvuZg1KkZSJK76" +
130+
"Td8bGhrsDRkNMUi77dc0v+1ooTSL8Ha71aRgJzHRv4bOulxsZNteQW9nFeHnGklK" +
131+
"hm5xW+uDyo+gf5+1376c2sMupFOjPTzQT3EU3NAskTrNUNqJM/aXTzU9+pKw7DZU" +
132+
"e6g6ovN+mKTecFEcmLOnZOrwFDOmTP+x17gfKr/ECMgZzPhY0PiLLJKfDdEdoIiq" +
133+
"gQIDAQAB"),
134+
electrumServer(host = "bitcoins.sk", port = 56002,
135+
publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtJBnSJ2+KWS5lwrnP0mC" +
136+
"zDcTwFozzGiLgrf72JupKBHFl2nuZUA98INgBlWljtpF8k6StBysTiYS5LFJ7u37" +
137+
"6oqlRTFjMT0oy8431y7mBq2QEgPzSJ9VqxM24FPnUEL/EyHB7JgzU77ACKGYa/Jz" +
138+
"X/S1W9ip0J9Rauc6/f/3c7mB6vlrbt3uREdEKOjJhQkLouDQgNSYw9ZKr7iS6Ruw" +
139+
"RzbAmT/MPg9zwFrPmh3KhlGRXnQowddY9z7M/a9CZ0JwjaG3abDBH5IdkMDIWY85" +
140+
"8pNjz3dTQUSfOimH/uRehee6x4xLFFMUxtpdkQCq8SEWlLhGBr6MRxkQZeoTR+F8" +
141+
"NwIDAQAB"),
142+
electrumServer(host = "btc.electroncash.dk", port = 60002,
143+
publicKey = "MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAv76pDl+g6Bo6kEXs6a94" +
144+
"1KTF4jTqXSTdy8XbZ83KeFsH9yOd6mj/x0JjOjmvvcygLnf3ka5PJIKZnbAv6tu0" +
145+
"oi2WJ8IgYmKxwkvoHjXF5Fcuow35t6pNqRxrc6K4kmI/t0CeJCb/oNjWV1n86vua" +
146+
"glrFBL/IvWptldmXXyXOsssd1Bh/GTILAX+CzaFtBlNZ/Z7AjhqH9g9ltlNddPc1" +
147+
"QYn1w/aUWTLXyXmOoOGKveScr3ioUQbDu1L2Llp6zGQbi0LRHKPEdtNeIyaoWMhE" +
148+
"rdBKlbHMDhsyXas1iDjFBP06Cd7oJeHI0oc5XIMSArJKB7NFfAswvmE2HB+H/gWK" +
149+
"Dot/nrHRZyZUB7DT3D/GK+ONfIQYCxgGd+SZ8RLC4/wVEN6rkyMFHaoHmXYmpCSR" +
150+
"uLz8LOf04Bjy9J0IFgVP7hvGC05l00lNopMiZ69AkOq1+PgfAlW+0zQLlo/88v0a" +
151+
"moxLby5+VrPs5MUMBEBDUjQFfFyJMX5PfZWtrMOdNQMFEnJ5NCSztJdyXXpPqvEf" +
152+
"5SD0NEC2qR+YUPqWS/vg0uccjoIrGJXMW2r2d/9jVATMTlx50djlhy+dF6j3iTRj" +
153+
"ti/pZHDJmeLcTw8JSKxvtPpds6dd0uWnFGI4BkzlYpIOTsjqKhWlHLDzrSGlWr5e" +
154+
"Z2JEj+rj0OqRAdpjDjWsNqECAwEAAQ=="),
155+
electrumServer(host = "electrum.bitaroo.net", publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsvNavM/O2kDINV+iADAc" +
156+
"Y6HVFmxtr7yQlXKjET/a7Lor/Ih5LQ2Xp/2AUADqBtmxFJwBkkq2uYtmCdzRDwce" +
157+
"n37b4jMxaiE7hgnDfs5HvYavuDPIL/n00cFqy6+50yAt2xc53bNQFRRouT1lF0/E" +
158+
"rftC8wYQS3XXfZeNDQCrXhpJHHm356NDC2VtFnZJPDiZOl5BZr2WTUvRRkaV0Hrs" +
159+
"XUs1vF8xNJPmbtzd4tak4xqVUPpQbXDVEyM6QsJA8cDVZ3bsRS9uN8yzHMBX3cps" +
160+
"MrM+59dxPzh7JIdEdEJM8RsePqCT7fJB3RO5CyaqqdbI8HaoHbSK2flF68Tq2x16" +
161+
"RwIDAQAB"),
162+
electrumServer(host = "electrum.diynodes.com", port = 50022),
163+
electrumServer(host = "fulcrum.grey.pw", port = 51002),
164+
electrumServer(host = "fulcrum.sethforprivacy.com", port = 50002,
165+
publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyHfrzqvuz0nrDCFfVRMx" +
166+
"E8XXG8a5rSyTqZx/rA3OmqFv4IAP8/j+CzWvgXyvuzjN0eloPouXqQGjXpBacspc" +
167+
"wZ35coJhGOHwHJVeGL94tE8ELwP0GhiPX3/HOyPy5YjCo7c1HzN7YFc0Epf32kfp" +
168+
"x8G/eMP9m321VYG9LaErk/aNikrfSRAmA+8rGetGRXoft2yU7I4WS7q6SdhW1Dvh" +
169+
"xhgF4PviVW8JT9eEBoedyjybNjhiTx+/AaBuYagtnUiHK+Mm3GjfMv8iqvxgLxef" +
170+
"LMlLJ0H5y3mByO1xFGXGHKckT9G/yu9nSiYe+SmXI+T6BpAlvXwKfb1suZLT3gXv" +
171+
"vwIDAQAB"),
129172
)
130173

131174
val testnetElectrumServers = listOf(

phoenix-shared/src/commonTest/kotlin/fr/acinq/phoenix/TestConstants.kt

Lines changed: 0 additions & 231 deletions
This file was deleted.

0 commit comments

Comments
 (0)