Skip to content

Commit b45299b

Browse files
authored
Merge pull request #37 from tronprotocol/revert-36-dev-evan-base58check
Revert "Dev evan base58check"
2 parents eaba58c + fb3cab6 commit b45299b

31 files changed

+319
-772
lines changed

City.txt

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -48,33 +48,13 @@
4848
35.200.155.204|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
4949
35.201.162.55|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
5050
35.200.155.199|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
51-
35.195.128.142|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
52-
35.204.19.79|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
53-
35.204.23.149|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
54-
35.195.150.85|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
55-
35.197.218.89|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
56-
35.204.8.243|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
57-
35.204.9.178|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
58-
35.204.19.83|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
59-
35.204.20.176|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
60-
35.204.26.165|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
61-
35.204.36.148|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
62-
35.204.0.122|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
63-
35.204.20.171|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
64-
35.204.24.7|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
65-
35.204.21.240|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
66-
35.204.25.221|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
67-
35.204.13.185|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
68-
35.201.167.15|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
69-
35.201.197.121|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
70-
35.200.154.160|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
71-
35.204.7.6|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
72-
35.204.0.221|||""country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
73-
35.200.137.1|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
74-
35.204.12.95|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
75-
35.200.130.74|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
76-
35.204.3.221|||"country":"United States","city":"Ann Arbor","longitude":-83.7133,"latitude":42.2734
7751
37.15.62.16|||"country":"Spain","city":"Sant Cugat del Vallès","longitude":2.0833,"latitude":41.4667
52+
35.204.7.6|||"country":"Spain","city":"Sant Cugat del Vallès","longitude":2.0833,"latitude":41.4667
53+
35.204.0.221|||"country":"Spain","city":"Sant Cugat del Vallès","longitude":2.0833,"latitude":41.4667
54+
35.200.137.1|||"country":"Spain","city":"Sant Cugat del Vallès","longitude":2.0833,"latitude":41.4667
55+
35.204.12.95|||"country":"Spain","city":"Sant Cugat del Vallès","longitude":2.0833,"latitude":41.4667
56+
35.200.130.74|||"country":"Spain","city":"Sant Cugat del Vallès","longitude":2.0833,"latitude":41.4667
57+
35.204.3.221|||"country":"Spain","city":"Sant Cugat del Vallès","longitude":2.0833,"latitude":41.4667
7858
175.142.24.22|||"country":"Malaysia","city":"Shah Alam","longitude":101.5304,"latitude":3.0538
7959
35.190.177.167|||"country":"United States","city":"Mountain View","longitude":-122.0574,"latitude":37.419200000000004
8060
116.14.48.200|||"country":"Singapore","city":"Singapore","longitude":103.8558,"latitude":1.2931
@@ -395,15 +375,3 @@
395375
35.197.34.68|||"country":"United States","city":"Mountain View","longitude":-122.0574,"latitude":37.419200000000004
396376
92.192.243.124|||"country":"Germany","city":"Germany","longitude":9.491,"latitude":51.2993
397377
82.253.45.57|||"country":"France","city":"Paris","longitude":2.3487999999999998,"latitude":48.8534
398-
35.185.146.17|||"country":"United States","city":"Mountain View","longitude":-122.0574,"latitude":37.419200000000004
399-
120.9.200.107|||"country":"China","city":"Hebei","longitude":115.275,"latitude":39.8897
400-
179.247.251.91|||"country":"Brazil","city":"Americana","longitude":-47.3301,"latitude":-22.7528
401-
35.169.113.187|||"country":"United States","city":"Ashburn","longitude":-77.6452,"latitude":39.0853
402-
47.254.18.49|||"country":"United States","city":"San Mateo","longitude":-122.3558,"latitude":37.526
403-
95.97.227.101|||"country":"Netherlands","city":"Andelst","longitude":5.7267,"latitude":51.9091
404-
47.74.190.150|||"country":"Singapore","city":"Singapore","longitude":103.8558,"latitude":1.2931
405-
159.65.153.60|||"country":"India","city":"Bengaluru","longitude":77.5833,"latitude":12.9833
406-
35.189.121.65|||"country":"United States","city":"Mountain View","longitude":-122.0574,"latitude":37.419200000000004
407-
217.121.194.239|||"country":"Netherlands","city":"Den Helder","longitude":4.742,"latitude":52.8896
408-
37.187.124.30|||"country":"France","city":"France","longitude":2.3387000000000002,"latitude":48.8582
409-
98.228.233.55|||"country":"United States","city":"Arlington Heights","longitude":-87.9807,"latitude":42.113

Wallet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ff7f73b854845fc02aa13b777ac090fb045ed0ec89eaec33d359b0632624b299d1174ee2aec5a625a3ce9145dd2ba4e48e049327d454fbf7ec700a9464f87dc4b73a592e27fd0d6d1fe7faf302e9f6330681a33613c3def0e1e06f78e174b5795ee4c06e1535caae744252266df96cdc82
1+
7905f239049a7574f8ac2088bb26998d04abd3d56db29702177ad316fd3bc0d267620395eb6bb3fe389ef5c0437f882576ac25f7ddb021efb2c8ff3148c6ac3ff24f3be5ced49a768d512acbf77267c74808dcb7c27ff1813bcefd2f57391a677265161404b055521e13ce43f549602bf7

src/main/java/org/tron/common/utils/Base58.java

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

0 commit comments

Comments
 (0)