From 12e283f126cd03d7770978e41e9cbbe2a559ba60 Mon Sep 17 00:00:00 2001 From: _XxFedexX_ <_xxfedexx_@noreply.gitgud.wownero.nl> Date: Wed, 25 Jan 2023 16:06:28 +0000 Subject: [PATCH 1/5] Remove testnet checkpoints --- src/checkpoints/checkpoints.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/checkpoints/checkpoints.cpp b/src/checkpoints/checkpoints.cpp index aa55f38bd..626d1755c 100644 --- a/src/checkpoints/checkpoints.cpp +++ b/src/checkpoints/checkpoints.cpp @@ -184,10 +184,6 @@ namespace cryptonote { if (nettype == TESTNET) { - ADD_CHECKPOINT2(1, "6c5a3febcd45fc05b99bf5260abacc178925e517b09a52214404fa9d86c90820", "0x65"); - ADD_CHECKPOINT2(50, "e59709f523573441c02ba3cceafb1c5d6756cbc246e9158215a9afbdf4f668b4", "0x1389"); - ADD_CHECKPOINT2(100, "ccb1cda16a62caaa85725f35ab0f8e4d90e9f7a05cac3dfd3f1f5f0d23a74358", "0x2711"); - ADD_CHECKPOINT2(200, "600320660dffa07f8de62931c68a186dc7e2a543733c98e6a5c78d1a373dbc8c", "0xc115"); return true; } if (nettype == STAGENET) From 08f407e021c806cd0472132fe54af29af0ad8cf3 Mon Sep 17 00:00:00 2001 From: wowario Date: Wed, 25 Jan 2023 19:29:54 +0300 Subject: [PATCH 2/5] do not build utilities --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ab96c14e9..2e70143d6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -108,10 +108,10 @@ if(NOT IOS) add_subdirectory(simplewallet) add_subdirectory(daemonizer) add_subdirectory(daemon) - add_subdirectory(blockchain_utilities) endif() if(BUILD_DEBUG_UTILITIES) + add_subdirectory(blockchain_utilities) add_subdirectory(debug_utilities) add_subdirectory(gen_multisig) add_subdirectory(gen_ssl_cert) From 47e51f4fdedd993976ed54fa3287b8a8b1c41dbe Mon Sep 17 00:00:00 2001 From: wowario Date: Wed, 25 Jan 2023 19:27:45 +0300 Subject: [PATCH 3/5] gitian: copy config file --- contrib/gitian/gitian-android.yml | 4 +- contrib/gitian/gitian-freebsd.yml | 4 +- contrib/gitian/gitian-linux.yml | 4 +- contrib/gitian/gitian-osx.yml | 4 +- contrib/gitian/gitian-win.yml | 2 +- utils/conf/wow.conf | 69 +++++++++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 9 deletions(-) create mode 100644 utils/conf/wow.conf diff --git a/contrib/gitian/gitian-android.yml b/contrib/gitian/gitian-android.yml index 3dbc76a74..fca851185 100644 --- a/contrib/gitian/gitian-android.yml +++ b/contrib/gitian/gitian-android.yml @@ -120,8 +120,8 @@ script: | cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DCMAKE_BUILD_TYPE=Release make ${MAKEOPTS} chmod 755 bin/* - cp ../LICENSE ../README.md ../docs/ANONYMITY_NETWORKS.md bin - chmod 644 bin/LICENSE bin/*.md + cp ../utils/conf/wow.conf bin + chmod 644 bin/wow.conf DISTNAME=wownero-${i}-${version} mv bin ${DISTNAME} find ${DISTNAME}/ | sort | tar --no-recursion --owner=0 --group=0 -c -T - | bzip2 -9 > ${OUTDIR}/${DISTNAME}.tar.bz2 diff --git a/contrib/gitian/gitian-freebsd.yml b/contrib/gitian/gitian-freebsd.yml index 54b08ecfa..83cec75b1 100644 --- a/contrib/gitian/gitian-freebsd.yml +++ b/contrib/gitian/gitian-freebsd.yml @@ -117,8 +117,8 @@ script: | cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON make ${MAKEOPTS} chmod 755 bin/* - cp ../LICENSE ../README.md ../docs/ANONYMITY_NETWORKS.md bin - chmod 644 bin/LICENSE bin/*.md + cp ../utils/conf/wow.conf bin + chmod 644 bin/wow.conf DISTNAME=wownero-${i}-${version} mv bin ${DISTNAME} find ${DISTNAME}/ | sort | tar --no-recursion --owner=0 --group=0 -c -T - | bzip2 -9 > ${OUTDIR}/${DISTNAME}.tar.bz2 diff --git a/contrib/gitian/gitian-linux.yml b/contrib/gitian/gitian-linux.yml index 14b01084a..0eceb217f 100644 --- a/contrib/gitian/gitian-linux.yml +++ b/contrib/gitian/gitian-linux.yml @@ -162,8 +162,8 @@ script: | cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DBACKCOMPAT=ON -DCMAKE_SKIP_RPATH=ON make ${MAKEOPTS} chmod 755 bin/* - cp ../LICENSE ../README.md ../docs/ANONYMITY_NETWORKS.md bin - chmod 644 bin/LICENSE bin/*.md + cp ../utils/conf/wow.conf bin + chmod 644 bin/wow.conf DISTNAME=wownero-${i}-${version} mv bin ${DISTNAME} find ${DISTNAME}/ | sort | tar --no-recursion --owner=0 --group=0 -c -T - | bzip2 -9 > ${OUTDIR}/${DISTNAME}.tar.bz2 diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml index f54c7ed01..7fe03dadf 100644 --- a/contrib/gitian/gitian-osx.yml +++ b/contrib/gitian/gitian-osx.yml @@ -108,8 +108,8 @@ script: | cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake make ${MAKEOPTS} chmod 755 bin/* - cp ../LICENSE ../README.md ../docs/ANONYMITY_NETWORKS.md bin - chmod 644 bin/LICENSE bin/*.md + cp ../utils/conf/wow.conf bin + chmod 644 bin/wow.conf DISTNAME=wownero-${i}-${version} mv bin ${DISTNAME} find ${DISTNAME}/ | sort | tar --no-recursion --owner=0 --group=0 -c -T - | bzip2 -9 > ${OUTDIR}/${DISTNAME}.tar.bz2 diff --git a/contrib/gitian/gitian-win.yml b/contrib/gitian/gitian-win.yml index bb94c08d8..992e6edf0 100644 --- a/contrib/gitian/gitian-win.yml +++ b/contrib/gitian/gitian-win.yml @@ -127,7 +127,7 @@ script: | mkdir build && cd build cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake make ${MAKEOPTS} - cp ../LICENSE ../README.md ../docs/ANONYMITY_NETWORKS.md bin + cp ../utils/conf/wow.conf bin DISTNAME=wownero-${i}-${version} mv bin ${DISTNAME} find ${DISTNAME}/ | sort | zip -X@ ${OUTDIR}/${DISTNAME}.zip diff --git a/utils/conf/wow.conf b/utils/conf/wow.conf new file mode 100644 index 000000000..3151d17f5 --- /dev/null +++ b/utils/conf/wow.conf @@ -0,0 +1,69 @@ +## To use these setting, run: ./wownerod --config-file wow.conf +## For information about daemon options check out +## https://monerodocs.org/interacting/monerod-reference/ +## Directions for setting up Tor and I2P nodes +## https://forum.wownero.com/t/how-to-setup-a-full-node-with-tor-i2p/588 + +##### wownerod settings ##### +data-dir=~/.local/share/wownero +check-updates=disabled +log-level=0 +no-igd=1 +p2p-bind-ip=0.0.0.0 +p2p-bind-port=34567 +db-sync-mode=safe +out-peers=64 +in-peers=64 +max-connections-per-ip=64 +limit-rate-up=1048576 +limit-rate-down=1048576 +max-concurrency=1 +prep-blocks-threads=2 +block-sync-size=10 +fast-block-sync=1 +disable-dns-checkpoints=1 +pad-transactions=1 +add-priority-node=158.69.60.225:34567 +add-priority-node=159.65.91.59:34567 +add-priority-node=167.114.196.241:34567 +add-priority-node=142.93.144.79:34567 +add-priority-node=51.75.76.161:34567 +add-priority-node=145.239.93.75:34567 +add-priority-node=88.198.199.23:34567 +add-priority-node=167.114.119.46:34567 +add-priority-node=143.198.195.132:34567 +add-priority-node=134.122.53.193:34567 +add-priority-node=204.48.28.218:34567 + +##### Public RPC ##### +rpc-bind-ip=0.0.0.0 +rpc-bind-port=34568 +zmq-rpc-bind-port=34572 +restricted-rpc=1 +public-node=1 +confirm-external-bind=1 +disable-rpc-ban=1 + +##### Solo Mining ##### +#start-mining=YOUR_MAIN_WALLET_ADDRESS +## Specify number of mining threads +#mining-threads=1 + +##### Web Compatible (CORS) ##### +#rpc-ssl=autodetect +#rpc-ssl-allow-any-cert=1 +#rpc-ssl-private-key=/etc/letsencrypt/live/DOMAIN.com/privkey.pem +#rpc-ssl-certificate=/etc/letsencrypt/live/DOMAIN.com/fullchain.pem +#rpc-ssl-allow-chained=1 +#rpc-access-control-origins=* + +##### Tor & I2P settings ##### +#anonymous-inbound=YOUR_ONION_ADDRESS:34566,127.0.0.1:34566,64 +#anonymous-inbound=YOUR_I2P_ADDRESS:34565,127.0.0.1:34565,64 +#tx-proxy=tor,127.0.0.1:9050,23 +#tx-proxy=i2p,127.0.0.1:4447,23 +#add-priority-node=77uase4p6y6jsjdf6z2kdgpxgh7nkvywagvhurzphbm7vrkyj2d2gdid.onion:34566 +#add-priority-node=v2admi6gbeprxnk6i2oscizhgy4v5ixu6iezkhj5udiwbfjjs2w7dnid.onion:34566 +#add-priority-node=iorkdy6t4gdtwzn3iblnhy76nu7lhyz2qcvpj4wrspfxyvdrul7u22qd.onion:34566 +#add-priority-node=ttc6kxud3fikyaypn5voknyyvqje7j3wnoevsb7rfjerolynnisurkqd.onion:34566 +#add-priority-node=5enbij6tz3n2hw5ixzezfayd5gvckyg4xlktz74gj4l6u7olq7ovr3id.onion:34566 From 010f4d61f9144f35c5b498168681eb35cae16495 Mon Sep 17 00:00:00 2001 From: wowario Date: Wed, 25 Jan 2023 19:41:15 +0300 Subject: [PATCH 4/5] show full version --- src/rpc/daemon_handler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/daemon_handler.cpp b/src/rpc/daemon_handler.cpp index cfa693445..618ec2ef7 100644 --- a/src/rpc/daemon_handler.cpp +++ b/src/rpc/daemon_handler.cpp @@ -540,7 +540,7 @@ namespace rpc res.info.block_size_median = res.info.block_weight_median = m_core.get_blockchain_storage().get_current_cumulative_block_weight_median(); res.info.adjusted_time = m_core.get_blockchain_storage().get_adjusted_time(res.info.height); res.info.start_time = (uint64_t)m_core.get_start_time(); - res.info.version = MONERO_VERSION; + res.info.version = MONERO_VERSION_FULL; res.status = Message::STATUS_OK; res.error_details = ""; From 225e079087e43288ab17df0bb10da9503415517a Mon Sep 17 00:00:00 2001 From: wowario Date: Wed, 25 Jan 2023 19:44:23 +0300 Subject: [PATCH 5/5] remove testnet blocks --- src/blocks/CMakeLists.txt | 2 +- src/blocks/testnet_blocks.dat | Bin 4 -> 0 bytes 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 src/blocks/testnet_blocks.dat diff --git a/src/blocks/CMakeLists.txt b/src/blocks/CMakeLists.txt index e6b7f4c8d..bab121617 100644 --- a/src/blocks/CMakeLists.txt +++ b/src/blocks/CMakeLists.txt @@ -41,7 +41,7 @@ const size_t ${BLOB_NAME}_len = sizeof(${BLOB_NAME}); " ) ]=]) -foreach(BLOB_NAME checkpoints testnet_blocks) +foreach(BLOB_NAME checkpoints) set(OUTPUT_C_SOURCE "generated_${BLOB_NAME}.c") list(APPEND GENERATED_SOURCES ${OUTPUT_C_SOURCE}) set(INPUT_DAT_FILE "${BLOB_NAME}.dat") diff --git a/src/blocks/testnet_blocks.dat b/src/blocks/testnet_blocks.dat deleted file mode 100644 index 593f4708db84ac8fd0f5cc47c634f38c013fe9e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4 LcmZQzU|;|M00aO5