From 4ceea602fe168b0ce7f8a2459ff7f57f280940b5 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Mon, 30 Jan 2023 18:36:29 +0100 Subject: [PATCH] Bump version to 2.3.0 --- CMakeLists.txt | 2 +- contrib/guix/guix-build | 2 +- src/assets/ack.txt | 4 + src/assets/restore_heights_monero_mainnet.txt | 163 ++++++++++++++++++ .../restore_heights_monero_stagenet.txt | 161 +++++++++++++++++ src/widgets/XMRigWidget.h | 2 +- 6 files changed, 331 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d0143615..36872484 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.18) project(feather - VERSION "2.2.3" + VERSION "2.3.0" DESCRIPTION "A free Monero desktop wallet" LANGUAGES CXX C ASM ) diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index 543e7159..fd30777a 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -231,7 +231,7 @@ host_to_commonname() { esac } -SOURCE_DATE_EPOCH="1672070414" +SOURCE_DATE_EPOCH="1675093785" # Precious directories are those which should not be cleaned between successive # guix builds diff --git a/src/assets/ack.txt b/src/assets/ack.txt index fcb91218..5182bd01 100644 --- a/src/assets/ack.txt +++ b/src/assets/ack.txt @@ -21,6 +21,7 @@ boldsuck boogerlad bruh btsfav +chaserene csd Csilla Brimer CzarekNakamoto @@ -39,10 +40,12 @@ js kayabaNerve kico kinghat +Lovera lozbek Lyza lza_menace MajesticBank +maltfield Matt Smith MoneroArbo moneromooo @@ -53,6 +56,7 @@ nikg83 nioc noobmaximus n-peugnet +ofrnxmr onionltd Paris plowsof diff --git a/src/assets/restore_heights_monero_mainnet.txt b/src/assets/restore_heights_monero_mainnet.txt index de59ba3f..283bffbf 100644 --- a/src/assets/restore_heights_monero_mainnet.txt +++ b/src/assets/restore_heights_monero_mainnet.txt @@ -1710,3 +1710,166 @@ 1645343680:2563500 1645523163:2565000 1645709914:2566500 +1645887452:2568000 +1646067928:2569500 +1646252401:2571000 +1646429156:2572500 +1646606159:2574000 +1646793185:2575500 +1646970346:2577000 +1647149909:2578500 +1647331058:2580000 +1647509530:2581500 +1647693203:2583000 +1647872441:2584500 +1648051909:2586000 +1648229094:2587500 +1648409194:2589000 +1648591293:2590500 +1648772713:2592000 +1648950533:2593500 +1649128800:2595000 +1649314007:2596500 +1649491260:2598000 +1649673895:2599500 +1649853673:2601000 +1650034382:2602500 +1650208443:2604000 +1650386538:2605500 +1650570295:2607000 +1650748391:2608500 +1650930600:2610000 +1651116275:2611500 +1651293647:2613000 +1651474980:2614500 +1651654726:2616000 +1651836320:2617500 +1652016633:2619000 +1652199261:2620500 +1652378115:2622000 +1652557512:2623500 +1652740303:2625000 +1652914859:2626500 +1653103009:2628000 +1653280741:2629500 +1653458303:2631000 +1653638492:2632500 +1653820038:2634000 +1653997910:2635500 +1654179465:2637000 +1654361588:2638500 +1654539762:2640000 +1654721123:2641500 +1654900181:2643000 +1655080362:2644500 +1655268778:2646000 +1655448451:2647500 +1655625512:2649000 +1655807297:2650500 +1655986931:2652000 +1656168042:2653500 +1656344640:2655000 +1656519860:2656500 +1656706088:2658000 +1656884735:2659500 +1657063114:2661000 +1657247250:2662500 +1657426156:2664000 +1657607115:2665500 +1657789217:2667000 +1657971060:2668500 +1658150587:2670000 +1658328722:2671500 +1658508192:2673000 +1658687681:2674500 +1658873966:2676000 +1659052002:2677500 +1659231934:2679000 +1659415196:2680500 +1659588708:2682000 +1659769201:2683500 +1659949194:2685000 +1660133140:2686500 +1660312458:2688000 +1660494175:2689500 +1660671803:2691000 +1660854812:2692500 +1661036266:2694000 +1661214719:2695500 +1661392998:2697000 +1661574191:2698500 +1661752700:2700000 +1661931275:2701500 +1662110809:2703000 +1662289299:2704500 +1662471947:2706000 +1662653798:2707500 +1662828535:2709000 +1663010340:2710500 +1663188116:2712000 +1663371300:2713500 +1663548406:2715000 +1663732689:2716500 +1663911395:2718000 +1664094829:2719500 +1664276558:2721000 +1664453507:2722500 +1664632427:2724000 +1664810502:2725500 +1664992727:2727000 +1665169069:2728500 +1665357200:2730000 +1665538043:2731500 +1665720255:2733000 +1665896325:2734500 +1666078266:2736000 +1666256001:2737500 +1666437855:2739000 +1666616804:2740500 +1666796208:2742000 +1666978127:2743500 +1667156593:2745000 +1667333596:2746500 +1667518171:2748000 +1667695786:2749500 +1667881355:2751000 +1668057239:2752500 +1668245355:2754000 +1668419520:2755500 +1668599867:2757000 +1668780395:2758500 +1668963041:2760000 +1669144736:2761500 +1669322237:2763000 +1669501420:2764500 +1669678392:2766000 +1669859589:2767500 +1670044115:2769000 +1670224100:2770500 +1670411968:2772000 +1670586961:2773500 +1670761599:2775000 +1670945731:2776500 +1671129986:2778000 +1671306627:2779500 +1671489233:2781000 +1671669134:2782500 +1671847091:2784000 +1672027912:2785500 +1672207414:2787000 +1672386356:2788500 +1672562400:2790000 +1672747630:2791500 +1672927593:2793000 +1673109309:2794500 +1673289550:2796000 +1673472002:2797500 +1673652861:2799000 +1673831513:2800500 +1674010445:2802000 +1674191525:2803500 +1674365515:2805000 +1674548378:2806500 +1674733794:2808000 +1674913445:2809500 +1675089389:2811000 \ No newline at end of file diff --git a/src/assets/restore_heights_monero_stagenet.txt b/src/assets/restore_heights_monero_stagenet.txt index 43294671..ac19aba8 100644 --- a/src/assets/restore_heights_monero_stagenet.txt +++ b/src/assets/restore_heights_monero_stagenet.txt @@ -690,3 +690,164 @@ 1645370373:1033500 1645545113:1035000 1645725417:1036500 +1645906813:1038000 +1646085673:1039500 +1646269677:1041000 +1646452215:1042500 +1646627450:1044000 +1646814838:1045500 +1646990208:1047000 +1647175130:1048500 +1647328794:1050000 +1647523616:1051500 +1647718163:1053000 +1647909340:1054500 +1648049761:1056000 +1648296723:1057500 +1648474405:1059000 +1648632059:1060500 +1648821845:1062000 +1648992540:1063500 +1649157581:1065000 +1649369959:1066500 +1649565225:1068000 +1649723125:1069500 +1649905854:1071000 +1650092610:1072500 +1650288577:1074000 +1650468049:1075500 +1650636976:1077000 +1650831292:1078500 +1651018135:1080000 +1651202622:1081500 +1651394344:1083000 +1651554017:1084500 +1651722392:1086000 +1651924938:1087500 +1652107797:1089000 +1652283883:1090500 +1652489383:1092000 +1652675526:1093500 +1652868191:1095000 +1653046275:1096500 +1653264952:1098000 +1653437269:1099500 +1653585860:1101000 +1653823730:1102500 +1653997640:1104000 +1654174150:1105500 +1654379590:1107000 +1654536556:1108500 +1654739084:1110000 +1654925962:1111500 +1655106287:1113000 +1655286440:1114500 +1655455668:1116000 +1655616240:1117500 +1655802192:1119000 +1655978963:1120500 +1656161798:1122000 +1656337865:1123500 +1656523934:1125000 +1656702155:1126500 +1656879820:1128000 +1657056215:1129500 +1657236747:1131000 +1657427038:1132500 +1657596242:1134000 +1657779828:1135500 +1657957607:1137000 +1658144669:1138500 +1658353983:1140000 +1658519584:1141500 +1658695013:1143000 +1658879844:1144500 +1659062473:1146000 +1659242524:1147500 +1659424122:1149000 +1659603771:1150500 +1659838979:1152000 +1660018908:1153500 +1660196307:1155000 +1660383627:1156500 +1660556075:1158000 +1660741437:1159500 +1660897439:1161000 +1661109647:1162500 +1661289945:1164000 +1661468479:1165500 +1661646372:1167000 +1661816034:1168500 +1662007109:1170000 +1662181060:1171500 +1662365074:1173000 +1662542978:1174500 +1662726322:1176000 +1662907756:1177500 +1663091775:1179000 +1663267977:1180500 +1663446246:1182000 +1663628911:1183500 +1663780602:1185000 +1664006431:1186500 +1664186957:1188000 +1664365544:1189500 +1664543419:1191000 +1664710187:1192500 +1664911885:1194000 +1665091315:1195500 +1665274656:1197000 +1665450351:1198500 +1665634485:1200000 +1665812395:1201500 +1665990823:1203000 +1666167725:1204500 +1666353155:1206000 +1666534806:1207500 +1666713204:1209000 +1666879974:1210500 +1667074835:1212000 +1667252815:1213500 +1667436516:1215000 +1667618792:1216500 +1667797013:1218000 +1667980098:1219500 +1668203499:1221000 +1668360440:1222500 +1668528924:1224000 +1668708459:1225500 +1668888667:1227000 +1669069587:1228500 +1669250178:1230000 +1669428317:1231500 +1669584555:1233000 +1669773297:1234500 +1669944746:1236000 +1670137686:1237500 +1670311179:1239000 +1670504544:1240500 +1670688113:1242000 +1670848168:1243500 +1671010306:1245000 +1671228794:1246500 +1671405276:1248000 +1671582561:1249500 +1671764669:1251000 +1671942568:1252500 +1672120054:1254000 +1672310681:1255500 +1672504859:1257000 +1672665471:1258500 +1672859961:1260000 +1673048693:1261500 +1673232074:1263000 +1673409004:1264500 +1673593019:1266000 +1673773935:1267500 +1673952800:1269000 +1674135923:1270500 +1674315352:1272000 +1674491004:1273500 +1674670127:1275000 +1674857543:1276500 +1675042020:1278000 \ No newline at end of file diff --git a/src/widgets/XMRigWidget.h b/src/widgets/XMRigWidget.h index f80ee28d..b7eb8e80 100644 --- a/src/widgets/XMRigWidget.h +++ b/src/widgets/XMRigWidget.h @@ -70,7 +70,7 @@ private: bool m_isMining = false; QStringList m_urls; - QStringList m_defaultPools{"pool.xmr.pt:9000", "pool.supportxmr.com:9000", "mine.xmrpool.net:443", "xmrpool.eu:9999", "xmr-eu1.nanopool.org:14433", "pool.minexmr.com:6666", "us-west.minexmr.com:6666", "monerohash.com:9999", "cryptonote.social:5555", "cryptonote.social:5556"}; + QStringList m_defaultPools{"pool.xmr.pt:9000", "pool.supportxmr.com:9000", "mine.xmrpool.net:443", "xmrpool.eu:9999", "xmr-eu1.nanopool.org:14433","monerohash.com:9999", "cryptonote.social:5555", "cryptonote.social:5556"}; }; #endif // FEATHER_XMRWIDGET_H -- 2.52.0