From bd0a67fc330a5a828f30573cbc273524bbfc7922 Mon Sep 17 00:00:00 2001 From: cryptogera Date: Thu, 4 Apr 2024 00:08:59 +0000 Subject: [PATCH] Automated commit --- .github/ISSUE_TEMPLATE.md | 8 +- .gitignore | 22 +- .travis.yml | 22 +- CONTRIBUTING.md | 20 +- COPYING | 2 +- INSTALL.md | 4 +- Makefile.am | 10 +- README.md | 87 +- build-aux/m4/bitcoin_qt.m4 | 4 +- configure.ac | 30 +- contrib/README.md | 14 +- contrib/debian/examples/bitcoin.conf | 6 +- contrib/devtools/gen-manpages.sh | 20 +- contrib/gitian-build.sh | 62 +- contrib/gitian-descriptors/README.md | 4 +- contrib/gitian-descriptors/gitian-linux.yml | 18 +- .../gitian-descriptors/gitian-osx-signer.yml | 10 +- contrib/gitian-descriptors/gitian-osx.yml | 12 +- .../gitian-descriptors/gitian-win-signer.yml | 8 +- contrib/gitian-descriptors/gitian-win.yml | 16 +- contrib/linearize/README.md | 8 +- contrib/linearize/example-linearize.cfg | 14 +- contrib/linearize/linearize-hashes.py | 2 +- contrib/macdeploy/README.md | 2 +- contrib/macdeploy/custom_dsstore.py | 6 +- contrib/macdeploy/detached-sig-create.sh | 2 +- contrib/macdeploy/fancy.plist | 2 +- contrib/macdeploy/macdeployqtplus | 4 +- contrib/qos/README.md | 4 +- contrib/qos/tc.sh | 8 +- contrib/rpm/bitcoin.spec | 12 +- contrib/seeds/README.md | 2 +- contrib/seeds/generate-seeds.py | 6 +- contrib/seeds/makeseeds.py | 2 +- contrib/seeds/nodes_main.txt | 326 +----- contrib/seeds/nodes_test.txt | 21 +- contrib/spendfrom/spendfrom.py | 22 +- contrib/testgen/README.md | 2 +- contrib/tidy_datadir.sh | 12 +- contrib/windeploy/win-codesign.cert | 4 +- depends/README.md | 6 +- depends/config.guess | 4 +- depends/config.sub | 2 +- depends/packages/boost.mk | 2 +- doc/README.md | 32 +- doc/README_osx.md | 2 +- doc/README_windows.txt | 14 +- doc/REST-interface.md | 4 +- doc/assets-attribution.md | 2 +- doc/beginners-guide.md | 275 +++++ doc/benchmarking.md | 6 +- doc/build-openbsd.md | 14 +- doc/build-osx.md | 32 +- doc/build-unix.md | 44 +- doc/build-windows.md | 34 +- doc/developer-notes.md | 28 +- doc/dnsseed-policy.md | 16 +- doc/files.md | 6 +- .../10_wallet_four_block_rewards.png | Bin 0 -> 33593 bytes doc/first-steps/11_encrypt_wallet_menu.png | Bin 0 -> 37779 bytes .../12_encrypt_wallet_passphrase.png | Bin 0 -> 8039 bytes doc/first-steps/13_encrypt_wallet_warning.png | Bin 0 -> 10147 bytes .../14_encrypt_wallet_process_alert.png | Bin 0 -> 13717 bytes doc/first-steps/15_frozen_process.png | Bin 0 -> 2027 bytes doc/first-steps/16_change_passphrase.png | Bin 0 -> 40391 bytes doc/first-steps/17_backup_wallet.png | Bin 0 -> 40923 bytes doc/first-steps/18_backup_dialog.png | Bin 0 -> 30114 bytes doc/first-steps/1_start_install.png | Bin 0 -> 30358 bytes doc/first-steps/2_finish_install.png | Bin 0 -> 28059 bytes doc/first-steps/3_choose_storage_location.png | Bin 0 -> 23264 bytes doc/first-steps/4_wallet_sync.png | Bin 0 -> 29701 bytes .../5_menu_debug_window_option.png | Bin 0 -> 31899 bytes doc/first-steps/6_debug_window_generate_1.png | Bin 0 -> 16309 bytes doc/first-steps/7_generate_1_empty_answer.png | Bin 0 -> 18135 bytes .../8_generate_1_several_requests.png | Bin 0 -> 25532 bytes doc/first-steps/9_generate_1_success.png | Bin 0 -> 24051 bytes doc/fuzzing.md | 10 +- doc/gitian-building.md | 54 +- doc/guia-do-iniciante.md | 277 +++++ .../release-notes-0.10.2.2.md | 94 -- .../release-notes-0.10.4.md | 123 --- .../release-notes-0.13.2.md | 993 ------------------ .../release-notes-0.13.3.md | 80 -- .../release-notes-0.14.2.md | 429 -------- .../release-notes-0.15.0.1.md | 773 -------------- doc/man/Makefile.am | 6 +- doc/man/{litecoin-cli.1 => zorro-cli.1} | 30 +- doc/man/{litecoin-qt.1 => zorro-qt.1} | 38 +- doc/man/{litecoin-tx.1 => zorro-tx.1} | 22 +- doc/man/{litecoind.1 => zorrod.1} | 40 +- doc/reduce-traffic.md | 4 +- doc/release-notes-litecoin.md | 20 +- doc/release-process.md | 122 +-- doc/tor.md | 48 +- doc/travis-ci.md | 2 +- doc/zmq.md | 20 +- share/pixmaps/bitcoin.ico | Bin 89957 -> 9062 bytes share/pixmaps/bitcoin128.png | Bin 16408 -> 13306 bytes share/pixmaps/bitcoin128.xpm | 439 ++++---- share/pixmaps/bitcoin16.png | Bin 951 -> 868 bytes share/pixmaps/bitcoin16.xpm | 279 +++-- share/pixmaps/bitcoin256.png | Bin 39906 -> 28547 bytes share/pixmaps/bitcoin256.xpm | 742 +++++++------ share/pixmaps/bitcoin32.png | Bin 2624 -> 2300 bytes share/pixmaps/bitcoin32.xpm | 241 +++-- share/pixmaps/bitcoin64.png | Bin 6681 -> 5754 bytes share/pixmaps/bitcoin64.xpm | 300 +++--- share/pixmaps/nsis-header.bmp | Bin 25820 -> 25818 bytes share/pixmaps/nsis-wizard.bmp | Bin 154544 -> 154542 bytes share/qt/Info.plist.in | 20 +- share/rpcuser/rpcuser.py | 2 +- share/setup.nsi.in | 8 +- src/Makefile.am | 46 +- src/Makefile.bench.include | 24 +- src/Makefile.qt.include | 32 +- src/Makefile.qttest.include | 28 +- src/Makefile.test.include | 40 +- src/bench/.gitignore | 2 +- src/bench/checkblock.cpp | 2 +- src/bitcoin-cli-res.rc | 10 +- src/bitcoin-cli.cpp | 12 +- src/bitcoin-tx-res.rc | 10 +- src/bitcoin-tx.cpp | 6 +- src/bitcoind-res.rc | 10 +- src/bitcoind.cpp | 6 +- src/chainparams.cpp | 116 +- src/chainparamsbase.cpp | 6 +- src/chainparamsseeds.h | 349 +----- src/clientversion.cpp | 2 +- src/init.cpp | 6 +- src/net.cpp | 2 +- src/net_processing.cpp | 2 +- src/policy/feerate.cpp | 2 +- src/pow.cpp | 4 +- src/qt/addressbookpage.cpp | 4 +- src/qt/askpassphrasedialog.cpp | 4 +- src/qt/bitcoin.cpp | 2 +- src/qt/bitcoin.qrc | 2 +- src/qt/bitcoingui.cpp | 16 +- src/qt/bitcoinunits.cpp | 12 +- src/qt/editaddressdialog.cpp | 2 +- src/qt/forms/coincontroldialog.ui | 8 +- src/qt/forms/modaloverlay.ui | 4 +- src/qt/forms/optionsdialog.ui | 6 +- src/qt/forms/overviewpage.ui | 20 +- src/qt/forms/receivecoinsdialog.ui | 4 +- src/qt/forms/sendcoinsdialog.ui | 14 +- src/qt/forms/sendcoinsentry.ui | 6 +- src/qt/forms/signverifymessagedialog.ui | 10 +- src/qt/guiconstants.h | 8 +- src/qt/guiutil.cpp | 24 +- src/qt/intro.cpp | 4 +- src/qt/locale/bitcoin_af.ts | 40 +- src/qt/locale/bitcoin_af_ZA.ts | 4 +- src/qt/locale/bitcoin_ar.ts | 42 +- src/qt/locale/bitcoin_be_BY.ts | 38 +- src/qt/locale/bitcoin_bg.ts | 64 +- src/qt/locale/bitcoin_bg_BG.ts | 12 +- src/qt/locale/bitcoin_bs.ts | 8 +- src/qt/locale/bitcoin_ca.ts | 136 +-- src/qt/locale/bitcoin_ca@valencia.ts | 112 +- src/qt/locale/bitcoin_ca_ES.ts | 136 +-- src/qt/locale/bitcoin_cs.ts | 140 +-- src/qt/locale/bitcoin_cy.ts | 8 +- src/qt/locale/bitcoin_da.ts | 158 +-- src/qt/locale/bitcoin_de.ts | 150 +-- src/qt/locale/bitcoin_de_DE.ts | 2 +- src/qt/locale/bitcoin_el_GR.ts | 70 +- src/qt/locale/bitcoin_en.ts | 98 +- src/qt/locale/bitcoin_en_AU.ts | 8 +- src/qt/locale/bitcoin_en_GB.ts | 100 +- src/qt/locale/bitcoin_eo.ts | 56 +- src/qt/locale/bitcoin_es.ts | 146 +-- src/qt/locale/bitcoin_es_419.ts | 4 +- src/qt/locale/bitcoin_es_CL.ts | 24 +- src/qt/locale/bitcoin_es_CO.ts | 12 +- src/qt/locale/bitcoin_es_DO.ts | 44 +- src/qt/locale/bitcoin_es_ES.ts | 142 +-- src/qt/locale/bitcoin_es_MX.ts | 16 +- src/qt/locale/bitcoin_es_UY.ts | 8 +- src/qt/locale/bitcoin_es_VE.ts | 20 +- src/qt/locale/bitcoin_et.ts | 74 +- src/qt/locale/bitcoin_et_EE.ts | 8 +- src/qt/locale/bitcoin_eu_ES.ts | 14 +- src/qt/locale/bitcoin_fa.ts | 68 +- src/qt/locale/bitcoin_fa_IR.ts | 16 +- src/qt/locale/bitcoin_fi.ts | 124 +-- src/qt/locale/bitcoin_fr.ts | 142 +-- src/qt/locale/bitcoin_fr_FR.ts | 44 +- src/qt/locale/bitcoin_gl.ts | 44 +- src/qt/locale/bitcoin_he.ts | 62 +- src/qt/locale/bitcoin_he_IL.ts | 6 +- src/qt/locale/bitcoin_hi_IN.ts | 2 +- src/qt/locale/bitcoin_hr.ts | 50 +- src/qt/locale/bitcoin_hu.ts | 124 +-- src/qt/locale/bitcoin_id_ID.ts | 78 +- src/qt/locale/bitcoin_it.ts | 144 +-- src/qt/locale/bitcoin_ja.ts | 130 +-- src/qt/locale/bitcoin_ja_JP.ts | 66 +- src/qt/locale/bitcoin_ka.ts | 46 +- src/qt/locale/bitcoin_kk_KZ.ts | 2 +- src/qt/locale/bitcoin_ko_KR.ts | 76 +- src/qt/locale/bitcoin_ky.ts | 4 +- src/qt/locale/bitcoin_la.ts | 36 +- src/qt/locale/bitcoin_lt.ts | 22 +- src/qt/locale/bitcoin_lv_LV.ts | 50 +- src/qt/locale/bitcoin_mk_MK.ts | 6 +- src/qt/locale/bitcoin_mn.ts | 4 +- src/qt/locale/bitcoin_ms_MY.ts | 32 +- src/qt/locale/bitcoin_nb.ts | 116 +- src/qt/locale/bitcoin_nb_NO.ts | 32 +- src/qt/locale/bitcoin_ne.ts | 28 +- src/qt/locale/bitcoin_nl.ts | 144 +-- src/qt/locale/bitcoin_nl_NL.ts | 8 +- src/qt/locale/bitcoin_pam.ts | 28 +- src/qt/locale/bitcoin_pl.ts | 132 +-- src/qt/locale/bitcoin_pt_BR.ts | 124 +-- src/qt/locale/bitcoin_pt_PT.ts | 134 +-- src/qt/locale/bitcoin_ro.ts | 28 +- src/qt/locale/bitcoin_ro_RO.ts | 86 +- src/qt/locale/bitcoin_ru.ts | 128 +-- src/qt/locale/bitcoin_ru_RU.ts | 14 +- src/qt/locale/bitcoin_sk.ts | 136 +-- src/qt/locale/bitcoin_sl_SI.ts | 78 +- src/qt/locale/bitcoin_sq.ts | 16 +- src/qt/locale/bitcoin_sr.ts | 4 +- src/qt/locale/bitcoin_sr@latin.ts | 22 +- src/qt/locale/bitcoin_sv.ts | 140 +-- src/qt/locale/bitcoin_ta.ts | 8 +- src/qt/locale/bitcoin_te.ts | 6 +- src/qt/locale/bitcoin_th_TH.ts | 56 +- src/qt/locale/bitcoin_tr.ts | 160 +-- src/qt/locale/bitcoin_uk.ts | 112 +- src/qt/locale/bitcoin_uz@Cyrl.ts | 40 +- src/qt/locale/bitcoin_vi_VN.ts | 32 +- src/qt/locale/bitcoin_zh.ts | 2 +- src/qt/locale/bitcoin_zh_CN.ts | 82 +- src/qt/locale/bitcoin_zh_HK.ts | 24 +- src/qt/locale/bitcoin_zh_TW.ts | 136 +-- src/qt/macnotificationhandler.mm | 2 +- src/qt/networkstyle.cpp | 2 +- src/qt/openuridialog.cpp | 4 +- src/qt/paymentrequest.proto | 2 +- src/qt/paymentserver.cpp | 14 +- src/qt/res/bitcoin-qt-res.rc | 8 +- src/qt/res/icons/bitcoin.ico | Bin 65303 -> 9062 bytes src/qt/res/icons/bitcoin.png | Bin 133328 -> 1394285 bytes src/qt/res/icons/bitcoin_testnet.ico | Bin 67293 -> 9062 bytes src/qt/res/icons/litecoin_splash.png | Bin 94700 -> 0 bytes src/qt/res/icons/zorro_splash.png | Bin 0 -> 1394285 bytes src/qt/sendcoinsdialog.cpp | 10 +- src/qt/test/paymentrequestdata.h | 2 +- src/qt/test/rpcnestedtests.cpp | 2 +- src/qt/test/test_main.cpp | 4 +- src/qt/test/uritests.cpp | 22 +- src/qt/test/wallettests.cpp | 4 +- src/qt/utilitydialog.cpp | 2 +- src/rpc/blockchain.cpp | 4 +- src/rpc/mining.cpp | 8 +- src/rpc/misc.cpp | 16 +- src/rpc/net.cpp | 6 +- src/rpc/rawtransaction.cpp | 10 +- src/rpc/server.cpp | 8 +- src/test/README.md | 4 +- src/test/amount_tests.cpp | 2 +- src/test/test_bitcoin.cpp | 2 +- src/test/test_bitcoin_main.cpp | 2 +- src/txdb.cpp | 4 +- src/util.cpp | 12 +- src/validation.cpp | 6 +- src/wallet/rpcdump.cpp | 12 +- src/wallet/rpcwallet.cpp | 84 +- src/wallet/test/wallet_tests.cpp | 2 +- test/README.md | 44 +- test/functional/README.md | 20 +- test/functional/bitcoin_cli.py | 2 +- test/functional/bumpfee.py | 2 +- test/functional/fundrawtransaction.py | 2 +- test/functional/listtransactions.py | 2 +- test/functional/multi_rpc.py | 4 +- test/functional/p2p-acceptblock.py | 4 +- test/functional/p2p-segwit.py | 6 +- test/functional/proxy_test.py | 8 +- test/functional/test_framework/mininode.py | 6 +- .../test_framework/test_framework.py | 36 +- test/functional/test_framework/test_node.py | 26 +- test/functional/test_framework/util.py | 6 +- test/functional/test_runner.py | 16 +- test/functional/test_script_address2.py | 2 +- test/functional/zmq_test.py | 2 +- test/util/data/bitcoin-util-test.json | 126 +-- 291 files changed, 5343 insertions(+), 8005 deletions(-) create mode 100644 doc/beginners-guide.md create mode 100644 doc/first-steps/10_wallet_four_block_rewards.png create mode 100644 doc/first-steps/11_encrypt_wallet_menu.png create mode 100644 doc/first-steps/12_encrypt_wallet_passphrase.png create mode 100644 doc/first-steps/13_encrypt_wallet_warning.png create mode 100644 doc/first-steps/14_encrypt_wallet_process_alert.png create mode 100644 doc/first-steps/15_frozen_process.png create mode 100644 doc/first-steps/16_change_passphrase.png create mode 100644 doc/first-steps/17_backup_wallet.png create mode 100644 doc/first-steps/18_backup_dialog.png create mode 100644 doc/first-steps/1_start_install.png create mode 100644 doc/first-steps/2_finish_install.png create mode 100644 doc/first-steps/3_choose_storage_location.png create mode 100644 doc/first-steps/4_wallet_sync.png create mode 100644 doc/first-steps/5_menu_debug_window_option.png create mode 100644 doc/first-steps/6_debug_window_generate_1.png create mode 100644 doc/first-steps/7_generate_1_empty_answer.png create mode 100644 doc/first-steps/8_generate_1_several_requests.png create mode 100644 doc/first-steps/9_generate_1_success.png create mode 100644 doc/guia-do-iniciante.md delete mode 100644 doc/litecoin-release-notes/release-notes-0.10.2.2.md delete mode 100644 doc/litecoin-release-notes/release-notes-0.10.4.md delete mode 100644 doc/litecoin-release-notes/release-notes-0.13.2.md delete mode 100644 doc/litecoin-release-notes/release-notes-0.13.3.md delete mode 100644 doc/litecoin-release-notes/release-notes-0.14.2.md delete mode 100644 doc/litecoin-release-notes/release-notes-0.15.0.1.md rename doc/man/{litecoin-cli.1 => zorro-cli.1} (65%) rename doc/man/{litecoin-qt.1 => zorro-qt.1} (92%) rename doc/man/{litecoin-tx.1 => zorro-tx.1} (81%) rename doc/man/{litecoind.1 => zorrod.1} (92%) delete mode 100755 src/qt/res/icons/litecoin_splash.png create mode 100755 src/qt/res/icons/zorro_splash.png diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 3c80203eb..6867d6e00 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,10 +1,10 @@ -This issue tracker is only for technical issues related to litecoin-core. +This issue tracker is only for technical issues related to zorro-core. -General litecoin questions and/or support requests and are best directed to the [litecointalk.io forums](https://litecointalk.io/). +General zorro questions and/or support requests and are best directed to the [zorrotalk.io forums](https://zorrotalk.io/). -For reporting security issues, please contact the Litecoin developers on the #litecoin-dev Freenode IRC channel or alternatively you can email us at contact@litecoin.org. +For reporting security issues, please contact the Zorro developers on the #zorro-dev Freenode IRC channel or alternatively you can email us at contact@cryptogera.com. ### Describe the issue @@ -23,7 +23,7 @@ Tell us what happens instead ### Screenshots. If the issue is related to the GUI, screenshots can be added to this issue via drag & drop. -### What version of litecoin-core are you using? +### What version of zorro-core are you using? List the version number/commit ID, and if it is an official binary, self compiled or a distribution package such as PPA. ### Machine specs: diff --git a/.gitignore b/.gitignore index a2034a6d2..8c763b0ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,13 @@ *.tar.gz *.exe -src/litecoin -src/litecoind -src/litecoin-cli -src/litecoin-tx -src/test/test_litecoin -src/test/test_litecoin_fuzzy -src/qt/test/test_litecoin-qt +src/zorro +src/zorrod +src/zorro-cli +src/zorro-tx +src/test/test_zorro +src/test/test_zorro_fuzzy +src/qt/test/test_zorro-qt # autoreconf Makefile.in @@ -74,12 +74,12 @@ src/qt/test/moc*.cpp # Compilation and Qt preprocessor part *.qm Makefile -litecoin-qt -Litecoin-Qt.app +zorro-qt +Zorro-Qt.app # Unit-tests Makefile.test -litecoin-qt_test +zorro-qt_test # Resources cpp qrc_*.cpp @@ -92,7 +92,7 @@ build *.gcno *.gcda /*.info -test_litecoin.coverage/ +test_zorro.coverage/ total.coverage/ coverage_percent.txt diff --git a/.travis.yml b/.travis.yml index fd98c4de5..da7bc1ebb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,20 +20,20 @@ env: - SDK_URL=https://bitcoincore.org/depends-sources/sdks - PYTHON_DEBUG=1 - WINEDEBUG=fixme-all - - LITECOIN_SCRYPT=0 + - ZORRO_SCRYPT=0 matrix: # ARM - HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=0 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports" # Win32 - - HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 python3-dev python3-pip nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports" LITECOIN_SCRYPT=1 + - HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 python3-dev python3-pip nsis g++-mingw-w64-i686 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports" ZORRO_SCRYPT=1 # 32-bit + dash - - HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python3-zmq python3-dev python3-pip" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash" LITECOIN_SCRYPT=1 + - HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc python3-zmq python3-dev python3-pip" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash" ZORRO_SCRYPT=1 # Win64 - - HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 python3-dev python3-pip nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports --enable-sse2" LITECOIN_SCRYPT=1 + - HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 python3-dev python3-pip nsis g++-mingw-w64-x86-64 wine1.6 bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports --enable-sse2" ZORRO_SCRYPT=1 # x86_64 Linux (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout) - - HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq python3-dev python3-pip qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-sse2 CPPFLAGS=-DDEBUG_LOCKORDER" LITECOIN_SCRYPT=1 + - HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq python3-dev python3-pip qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-sse2 CPPFLAGS=-DDEBUG_LOCKORDER" ZORRO_SCRYPT=1 # x86_64 Linux, No wallet - - HOST=x86_64-unknown-linux-gnu PACKAGES="python3 python3-dev python3-pip" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports --enable-sse2" LITECOIN_SCRYPT=1 + - HOST=x86_64-unknown-linux-gnu PACKAGES="python3 python3-dev python3-pip" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports --enable-sse2" ZORRO_SCRYPT=1 # Cross-Mac - HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-sse2" OSX_SDK=10.11 GOAL="deploy" @@ -43,7 +43,7 @@ install: - if [ -n "$DPKG_ADD_ARCH" ]; then sudo dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi - - if [ "$LITECOIN_SCRYPT" = 1 ]; then travis_retry sudo pip3 install litecoin_scrypt; fi + - if [ "$ZORRO_SCRYPT" = 1 ]; then travis_retry sudo pip3 install zorro_scrypt; fi before_script: - if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then contrib/devtools/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi - unset CC; unset CXX @@ -53,9 +53,9 @@ before_script: - if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi - make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS script: - - if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "litecoin-project/litecoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys; fi - - if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "litecoin-project/litecoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then git fetch --unshallow; fi - - if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "litecoin-project/litecoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then contrib/verify-commits/verify-commits.sh; fi + - if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "zorro-project/zorro" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys; fi + - if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "zorro-project/zorro" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then git fetch --unshallow; fi + - if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "zorro-project/zorro" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then contrib/verify-commits/verify-commits.sh; fi - export TRAVIS_COMMIT_LOG=`git log --format=fuller -1` - if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi - OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST @@ -65,7 +65,7 @@ script: - mkdir build && cd build - ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false) - make distdir VERSION=$HOST - - cd litecoin-$HOST + - cd zorro-$HOST - ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false) - make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false ) - export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e847703a7..ccd9357bc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ -Contributing to Litecoin Core +Contributing to Zorro Core ============================ -The Litecoin Core project operates an open contributor model where anyone is +The Zorro Core project operates an open contributor model where anyone is welcome to contribute towards development in the form of peer review, testing and patches. This document explains the practical process and guidelines for contributing. @@ -57,12 +57,12 @@ the pull request affects. Valid areas as: - *Consensus* for changes to consensus critical code - *Docs* for changes to the documentation - - *Qt* for changes to litecoin-qt + - *Qt* for changes to zorro-qt - *Mining* for changes to the mining code - *Net* or *P2P* for changes to the peer-to-peer network code - *RPC/REST/ZMQ* for changes to the RPC, REST or ZMQ APIs - *Scripts and tools* for changes to the scripts and tools - - *Tests* for changes to the litecoin unit tests or QA tests + - *Tests* for changes to the zorro unit tests or QA tests - *Trivial* should **only** be used for PRs that do not change generated executable code. Notably, refactors (change of function arguments and code reorganization) and changes in behavior should **not** be marked as trivial. @@ -157,10 +157,10 @@ where possible keep them short, uncomplex and easy to verify. "Decision Making" Process ------------------------- -The following applies to code changes to the Litecoin Core project, and is not to be confused with overall Litecoin +The following applies to code changes to the Zorro Core project, and is not to be confused with overall Zorro Network Protocol consensus changes. -Whether a pull request is merged into Litecoin Core rests with the project merge +Whether a pull request is merged into Zorro Core rests with the project merge maintainers and ultimately the project lead. Maintainers will take into consideration if a patch is in line with the general @@ -178,7 +178,7 @@ In general, all pull requests must: - Where bugs are fixed, where possible, there should be unit tests demonstrating the bug and also proving the fix. This helps prevent regression. -Patches that change Litecoin consensus rules are considerably more involved than +Patches that change Zorro consensus rules are considerably more involved than normal because they affect the entire ecosystem and so must be preceded by extensive mailing list discussions and have a numbered BIP. While each case will be different, one should be prepared to expend more time and effort than for @@ -219,7 +219,7 @@ higher in terms of discussion and peer review requirements, keeping in mind that mistakes could be very costly to the wider community. This includes refactoring of consensus critical code. -Where a patch set proposes to change the Litecoin consensus, it must have been +Where a patch set proposes to change the Zorro consensus, it must have been discussed extensively on the mailing list and IRC, be accompanied by a widely discussed BIP and have a generally widely perceived technical consensus of being a worthwhile change based on the judgement of the maintainers. @@ -259,11 +259,11 @@ about: Release Policy -------------- -The project leader is the release manager for each Litecoin Core release. +The project leader is the release manager for each Zorro Core release. Copyright --------- -Copyright 2018 The Litecoin Core Developers +Copyright 2018 The Zorro Core Developers - bitcoin: Copyright (c) 2009-2018 Bitcoin Core Developers (MIT License) diff --git a/COPYING b/COPYING index 9700e9e16..a0a544a4a 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,7 @@ The MIT License (MIT) Copyright (c) 2009-2018 The Bitcoin Core developers Copyright (c) 2009-2018 Bitcoin Developers -Copyright (c) 2011-2018 The Litecoin Core developers +Copyright (c) 2011-2018 The Zorro Core developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/INSTALL.md b/INSTALL.md index be23c6088..ca0b144c8 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,5 +1,5 @@ -Building Litecoin +Building Zorro ================ See doc/build-*.md for instructions on building the various -elements of the Litecoin Core reference implementation of Litecoin. +elements of the Zorro Core reference implementation of Zorro. diff --git a/Makefile.am b/Makefile.am index dfcd5ce53..b48ffe03b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX empty := space := $(empty) $(empty) -OSX_APP=Litecoin-Qt.app +OSX_APP=Zorro-Qt.app OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME)) OSX_DMG = $(OSX_VOLNAME).dmg OSX_BACKGROUND_SVG=background.svg @@ -95,7 +95,7 @@ $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/Litecoin-Qt: $(BITCOIN_QT_BIN) +$(OSX_APP)/Contents/MacOS/Zorro-Qt: $(BITCOIN_QT_BIN) $(MKDIR_P) $(@D) STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@ @@ -105,7 +105,7 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \ $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \ - $(OSX_APP)/Contents/MacOS/Litecoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings + $(OSX_APP)/Contents/MacOS/Zorro-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings osx_volname: echo $(OSX_VOLNAME) >$@ @@ -130,7 +130,7 @@ $(APP_DIST_DIR)/Applications: @rm -f $@ @cd $(@D); $(LN_S) /Applications $(@F) -$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Litecoin-Qt +$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Zorro-Qt $(OSX_DMG): $(APP_DIST_EXTRAS) $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist @@ -145,7 +145,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF $(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN) $(PYTHON) $< "$@" "$(OSX_VOLNAME)" -$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Litecoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) +$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Zorro-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2 deploydir: $(APP_DIST_EXTRAS) diff --git a/README.md b/README.md index ad95a1d58..54d7b5ba0 100644 --- a/README.md +++ b/README.md @@ -1,79 +1,30 @@ -Litecoin Core integration/staging tree -===================================== -[![Build Status](https://travis-ci.org/litecoin-project/litecoin.svg?branch=master)](https://travis-ci.org/litecoin-project/litecoin) +Zorro Core +============== -https://litecoin.org +https://cryptogera.com -What is Litecoin? +What is Zorro? +------------------ + +Born on April 03, 2024 at 00:18:45 GMT, Zorro is an experimental digital currency of the Bitcoin family, which enables instant payments to anyone, anywhere in the world. It uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Zorro Core is the name of open source software which enables the use of this currency. + +Zorro has a maximum circulating supply of 84,000,000 ZRR, which is four times larger than Bitcoin's maximum circulating supply of 21,000,000 BTC. It uses the Scrypt algorithm, just like the already popular Bitcoin family members: Litecoin and Dogecoin, thus making it compatible with the already existing cyptocurrency platform (developer code, mining software, mining pools, wallets, trading platforms) and mining hardware (CPU, GPU, ASIC). + +For more information, as well as an immediately useable, binary version of the Zorro Core software, see [https://git.cryptogera.com/cryptogera/zorro/releases](https://git.cryptogera.com/cryptogera/zorro/releases). + +TCP Ports ---------------- -Litecoin is an experimental digital currency that enables instant payments to -anyone, anywhere in the world. Litecoin uses peer-to-peer technology to operate -with no central authority: managing transactions and issuing money are carried -out collectively by the network. Litecoin Core is the name of open source -software which enables the use of this currency. +Zorro Core by default uses port `18641` for peer-to-peer communication that is needed to synchronize the "mainnet" blockchain and stay informed of new transactions and blocks. Additionally, a JSONRPC port can be opened, which defaults to port `18642` for mainnet nodes. It is strongly recommended to not expose RPC ports to the public internet. -For more information, as well as an immediately useable, binary version of -the Litecoin Core software, see [https://litecoin.org](https://litecoin.org). +| Function | mainnet | testnet | regtest | +| :------- | ------: | ------: | ------: | +| P2P | 18641 | 19062 | 16106 | +| RPC | 18642 | 19063 | 16107 | License ------- -Litecoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more -information or see https://opensource.org/licenses/MIT. +Zorro Core is released under the terms of the MIT license. See [COPYING](COPYING) for more information or see https://opensource.org/licenses/MIT. -Development Process -------------------- - -The `master` branch is regularly built and tested, but is not guaranteed to be -completely stable. [Tags](https://github.com/litecoin-project/litecoin/tags) are created -regularly to indicate new official, stable release versions of Litecoin Core. - -The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md). - -The developer [mailing list](https://groups.google.com/forum/#!forum/litecoin-dev) -should be used to discuss complicated or controversial changes before working -on a patch set. - -Developer IRC can be found on Freenode at #litecoin-dev. - -Testing -------- - -Testing and code review is the bottleneck for development; we get more pull -requests than we can review and test on short notice. Please be patient and help out by testing -other people's pull requests, and remember this is a security-critical project where any mistake might cost people -lots of money. - -### Automated Testing - -Developers are strongly encouraged to write [unit tests](src/test/README.md) for new code, and to -submit new unit tests for old code. Unit tests can be compiled and run -(assuming they weren't disabled in configure) with: `make check`. Further details on running -and extending unit tests can be found in [/src/test/README.md](/src/test/README.md). - -There are also [regression and integration tests](/test), written -in Python, that are run automatically on the build server. -These tests can be run (if the [test dependencies](/test) are installed) with: `test/functional/test_runner.py` - -The Travis CI system makes sure that every pull request is built for Windows, Linux, and OS X, and that unit/sanity tests are run automatically. - -### Manual Quality Assurance (QA) Testing - -Changes should be tested by somebody other than the developer who wrote the -code. This is especially important for large or high-risk changes. It is useful -to add a test plan to the pull request description if testing the changes is -not straightforward. - -Translations ------------- - -We only accept translation fixes that are submitted through [Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/). -Translations are converted to Litecoin periodically. - -Translations are periodically pulled from Transifex and merged into the git repository. See the -[translation process](doc/translation_process.md) for details on how this works. - -**Important**: We do not accept translation changes as GitHub pull requests because the next -pull from Transifex would automatically overwrite them again. diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 644f6c834..db44ab4d2 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -7,7 +7,7 @@ dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit. AC_DEFUN([BITCOIN_QT_FAIL],[ if test "x$bitcoin_qt_want_version" = "xauto" && test x$bitcoin_qt_force != xyes; then if test x$bitcoin_enable_qt != xno; then - AC_MSG_WARN([$1; litecoin-qt frontend will not be built]) + AC_MSG_WARN([$1; zorro-qt frontend will not be built]) fi bitcoin_enable_qt=no bitcoin_enable_qt_test=no @@ -54,7 +54,7 @@ AC_DEFUN([BITCOIN_QT_INIT],[ dnl enable qt support AC_ARG_WITH([gui], [AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@], - [build litecoin-qt GUI (default=auto, qt5 tried first)])], + [build zorro-qt GUI (default=auto, qt5 tried first)])], [ bitcoin_qt_want_version=$withval if test x$bitcoin_qt_want_version = xyes; then diff --git a/configure.ac b/configure.ac index 4e77826be..12a498914 100644 --- a/configure.ac +++ b/configure.ac @@ -7,17 +7,17 @@ define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2018) define(_COPYRIGHT_HOLDERS,[The %s developers]) -define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Litecoin Core]]) -AC_INIT([Litecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/litecoin-project/litecoin/issues],[litecoin],[https://litecoin.org/]) +define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Zorro Core]]) +AC_INIT([Zorro Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://git.cryptogera.com/cryptogera/zorro/issues],[zorro],[https://cryptogera.com/]) AC_CONFIG_SRCDIR([src/validation.cpp]) AC_CONFIG_HEADERS([src/config/bitcoin-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) -BITCOIN_DAEMON_NAME=litecoind -BITCOIN_GUI_NAME=litecoin-qt -BITCOIN_CLI_NAME=litecoin-cli -BITCOIN_TX_NAME=litecoin-tx +BITCOIN_DAEMON_NAME=zorrod +BITCOIN_GUI_NAME=zorro-qt +BITCOIN_CLI_NAME=zorro-cli +BITCOIN_TX_NAME=zorro-tx dnl Unless the user specified ARFLAGS, force it to be cr AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to if not set]) @@ -297,7 +297,7 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS" AC_ARG_WITH([utils], [AS_HELP_STRING([--with-utils], - [build litecoin-cli litecoin-tx (default=yes)])], + [build zorro-cli zorro-tx (default=yes)])], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -309,7 +309,7 @@ AC_ARG_WITH([libs], AC_ARG_WITH([daemon], [AS_HELP_STRING([--with-daemon], - [build litecoind daemon (default=yes)])], + [build zorrod daemon (default=yes)])], [build_bitcoind=$withval], [build_bitcoind=yes]) @@ -1036,11 +1036,11 @@ AC_SUBST(UNIVALUE_LIBS) BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) -AC_MSG_CHECKING([whether to build litecoind]) +AC_MSG_CHECKING([whether to build zorrod]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) -AC_MSG_CHECKING([whether to build utils (litecoin-cli litecoin-tx)]) +AC_MSG_CHECKING([whether to build utils (zorro-cli zorro-tx)]) AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) AC_MSG_RESULT($build_bitcoin_utils) @@ -1141,7 +1141,7 @@ if test x$bitcoin_enable_qt != xno; then AC_MSG_WARN("xgettext is required to update qt translations") fi - AC_MSG_CHECKING([whether to build test_litecoin-qt]) + AC_MSG_CHECKING([whether to build test_zorro-qt]) if test x$use_gui_tests$bitcoin_enable_qt_test = xyesyes; then AC_MSG_RESULT([yes]) BUILD_TEST_QT="yes" @@ -1152,7 +1152,7 @@ fi AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"]) -AC_MSG_CHECKING([whether to build test_litecoin]) +AC_MSG_CHECKING([whether to build test_zorro]) if test x$use_tests = xyes; then AC_MSG_RESULT([yes]) BUILD_TEST="yes" @@ -1198,9 +1198,9 @@ AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes]) AM_CONDITIONAL([ENABLE_HWCRC32],[test x$enable_hwcrc32 = xyes]) AM_CONDITIONAL([EXPERIMENTAL_ASM],[test x$experimental_asm = xyes]) -AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version]) -AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version]) -AC_DEFINE(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION, [Build revision]) +AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, 0) +AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, 15) +AC_DEFINE(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION, 1) AC_DEFINE(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD, [Version Build]) AC_DEFINE(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE, [Version is release]) AC_DEFINE(COPYRIGHT_YEAR, _COPYRIGHT_YEAR, [Copyright year]) diff --git a/contrib/README.md b/contrib/README.md index b01ea2ca9..4817011ec 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain. ### [Qos](/contrib/qos) ### -A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Litecoin network. This means one can have an always-on litecoind instance running, and another local litecoind/litecoin-qt instance which connects to this node and receives blocks from it. +A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Zorro network. This means one can have an always-on zorrod instance running, and another local zorrod/zorro-qt instance which connects to this node and receives blocks from it. ### [Seeds](/contrib/seeds) ### Utility to generate the pnSeed[] array that is compiled into the client. @@ -22,20 +22,20 @@ Build Tools and Keys --------------------- ### [Debian](/contrib/debian) ### -Contains files used to package litecoind/litecoin-qt -for Debian-based Linux systems. If you compile litecoind/litecoin-qt yourself, there are some useful files here. +Contains files used to package zorrod/zorro-qt +for Debian-based Linux systems. If you compile zorrod/zorro-qt yourself, there are some useful files here. ### [Gitian-descriptors](/contrib/gitian-descriptors) ### Notes on getting Gitian builds up and running using KVM. ### [Gitian-keys](/contrib/gitian-keys) -PGP keys used for signing Litecoin Core [Gitian release](/doc/release-process.md) results. +PGP keys used for signing Zorro Core [Gitian release](/doc/release-process.md) results. ### [MacDeploy](/contrib/macdeploy) ### Scripts and notes for Mac builds. ### [RPM](/contrib/rpm) ### -RPM spec file for building litecoin-core on RPM based distributions +RPM spec file for building zorro-core on RPM based distributions ### [Gitian-build](/contrib/gitian-build.sh) ### Script for running full Gitian builds. @@ -44,7 +44,7 @@ Test and Verify Tools --------------------- ### [TestGen](/contrib/testgen) ### -Utilities to generate test vectors for the data-driven Litecoin tests. +Utilities to generate test vectors for the data-driven Zorro tests. ### [Verify Binaries](/contrib/verifybinaries) ### -This script attempts to download and verify the signature file SHA256SUMS.asc from litecoin.org. +This script attempts to download and verify the signature file SHA256SUMS.asc from cryptogera.com. diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf index 61c744c08..53fc3fc48 100644 --- a/contrib/debian/examples/bitcoin.conf +++ b/contrib/debian/examples/bitcoin.conf @@ -44,11 +44,11 @@ # Use as many addnode= settings as you like to connect to specific peers #addnode=69.164.218.197 -#addnode=10.0.0.2:9333 +#addnode=10.0.0.2:18641 # Alternatively use as many connect= settings as you like to connect ONLY to specific peers #connect=69.164.218.197 -#connect=10.0.0.1:9333 +#connect=10.0.0.1:18641 # Listening mode, enabled by default except when 'connect' is being used #listen=1 @@ -110,7 +110,7 @@ #rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96 # Listen for RPC connections on this TCP port: -#rpcport=9332 +#rpcport=18642 # You can use Bitcoin or bitcoind to send commands to Bitcoin/bitcoind # running on another host using this option: diff --git a/contrib/devtools/gen-manpages.sh b/contrib/devtools/gen-manpages.sh index 52964f613..472b61c6f 100755 --- a/contrib/devtools/gen-manpages.sh +++ b/contrib/devtools/gen-manpages.sh @@ -4,26 +4,26 @@ TOPDIR=${TOPDIR:-$(git rev-parse --show-toplevel)} SRCDIR=${SRCDIR:-$TOPDIR/src} MANDIR=${MANDIR:-$TOPDIR/doc/man} -LITECOIND=${LITECOIND:-$SRCDIR/litecoind} -LITECOINCLI=${LITECOINCLI:-$SRCDIR/litecoin-cli} -LITECOINTX=${LITECOINTX:-$SRCDIR/litecoin-tx} -LITECOINQT=${LITECOINQT:-$SRCDIR/qt/litecoin-qt} +ZORROD=${ZORROD:-$SRCDIR/zorrod} +ZORROCLI=${ZORROCLI:-$SRCDIR/zorro-cli} +ZORROTX=${ZORROTX:-$SRCDIR/zorro-tx} +ZORROQT=${ZORROQT:-$SRCDIR/qt/zorro-qt} -[ ! -x $LITECOIND ] && echo "$LITECOIND not found or not executable." && exit 1 +[ ! -x $ZORROD ] && echo "$ZORROD not found or not executable." && exit 1 # The autodetected version git tag can screw up manpage output a little bit -LTCVER=($($LITECOINCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')) +ZRRVER=($($ZORROCLI --version | head -n1 | awk -F'[ -]' '{ print $6, $7 }')) # Create a footer file with copyright content. # This gets autodetected fine for bitcoind if --version-string is not set, # but has different outcomes for bitcoin-qt and bitcoin-cli. echo "[COPYRIGHT]" > footer.h2m -$LITECOIND --version | sed -n '1!p' >> footer.h2m +$ZORROD --version | sed -n '1!p' >> footer.h2m -for cmd in $LITECOIND $LITECOINCLI $LITECOINTX $LITECOINQT; do +for cmd in $ZORROD $ZORROCLI $ZORROTX $ZORROQT; do cmdname="${cmd##*/}" - help2man -N --version-string=${LTCVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} - sed -i "s/\\\-${LTCVER[1]}//g" ${MANDIR}/${cmdname}.1 + help2man -N --version-string=${ZRRVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} + sed -i "s/\\\-${ZRRVER[1]}//g" ${MANDIR}/${cmdname}.1 done rm -f footer.h2m \ No newline at end of file diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh index d43ec9b1e..ddcfb591d 100755 --- a/contrib/gitian-build.sh +++ b/contrib/gitian-build.sh @@ -17,7 +17,7 @@ osx=true SIGNER= VERSION= commit=false -url=https://github.com/litecoin-project/litecoin +url=https://git.cryptogera.com/cryptogera/zorro proc=2 mem=2000 lxc=true @@ -31,7 +31,7 @@ commitFiles=true read -d '' usage <<- EOF Usage: $scriptName [-c|u|v|b|s|B|o|h|j|m|] signer version -Run this script from the directory containing the litecoin, gitian-builder, gitian.sigs.ltc, and litecoin-detached-sigs. +Run this script from the directory containing the zorro, gitian-builder, gitian.sigs.ltc, and zorro-detached-sigs. Arguments: signer GPG signer to sign each build assert file @@ -39,7 +39,7 @@ version Version number, commit, or branch to build. If building a commit or bra Options: -c|--commit Indicate that the version argument is for a commit or branch --u|--url Specify the URL of the repository. Default is https://github.com/litecoin-project/litecoin +-u|--url Specify the URL of the repository. Default is https://git.cryptogera.com/cryptogera/zorro -v|--verify Verify the gitian build -b|--build Do a gitian build -s|--sign Make signed binaries for Windows and Mac OSX @@ -232,8 +232,8 @@ echo ${COMMIT} if [[ $setup = true ]] then sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm qemu-utils - git clone https://github.com/litecoin-project/gitian.sigs.ltc.git - git clone https://github.com/litecoin-project/litecoin-detached-sigs.git + git clone https://github.com/zorro-project/gitian.sigs.ltc.git + git clone https://git.cryptogera.com/cryptogera/zorro-detached-sigs.git git clone https://github.com/devrandom/gitian-builder.git pushd ./gitian-builder if [[ -n "$USE_LXC" ]] @@ -247,7 +247,7 @@ then fi # Set up build -pushd ./litecoin +pushd ./zorro git fetch git checkout ${COMMIT} popd @@ -256,7 +256,7 @@ popd if [[ $build = true ]] then # Make output folder - mkdir -p ./litecoin-binaries/${VERSION} + mkdir -p ./zorro-binaries/${VERSION} # Build Dependencies echo "" @@ -266,7 +266,7 @@ then mkdir -p inputs wget -N -P inputs $osslPatchUrl wget -N -P inputs $osslTarUrl - make -C ../litecoin/depends download SOURCES_PATH=`pwd`/cache/common + make -C ../zorro/depends download SOURCES_PATH=`pwd`/cache/common # Linux if [[ $linux = true ]] @@ -274,9 +274,9 @@ then echo "" echo "Compiling ${VERSION} Linux" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit litecoin=${COMMIT} --url litecoin=${url} ../litecoin/contrib/gitian-descriptors/gitian-linux.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs.ltc/ ../litecoin/contrib/gitian-descriptors/gitian-linux.yml - mv build/out/litecoin-*.tar.gz build/out/src/litecoin-*.tar.gz ../litecoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit zorro=${COMMIT} --url zorro=${url} ../zorro/contrib/gitian-descriptors/gitian-linux.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-linux --destination ../gitian.sigs.ltc/ ../zorro/contrib/gitian-descriptors/gitian-linux.yml + mv build/out/zorro-*.tar.gz build/out/src/zorro-*.tar.gz ../zorro-binaries/${VERSION} fi # Windows if [[ $windows = true ]] @@ -284,10 +284,10 @@ then echo "" echo "Compiling ${VERSION} Windows" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit litecoin=${COMMIT} --url litecoin=${url} ../litecoin/contrib/gitian-descriptors/gitian-win.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs.ltc/ ../litecoin/contrib/gitian-descriptors/gitian-win.yml - mv build/out/litecoin-*-win-unsigned.tar.gz inputs/litecoin-win-unsigned.tar.gz - mv build/out/litecoin-*.zip build/out/litecoin-*.exe ../litecoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit zorro=${COMMIT} --url zorro=${url} ../zorro/contrib/gitian-descriptors/gitian-win.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-unsigned --destination ../gitian.sigs.ltc/ ../zorro/contrib/gitian-descriptors/gitian-win.yml + mv build/out/zorro-*-win-unsigned.tar.gz inputs/zorro-win-unsigned.tar.gz + mv build/out/zorro-*.zip build/out/zorro-*.exe ../zorro-binaries/${VERSION} fi # Mac OSX if [[ $osx = true ]] @@ -295,10 +295,10 @@ then echo "" echo "Compiling ${VERSION} Mac OSX" echo "" - ./bin/gbuild -j ${proc} -m ${mem} --commit litecoin=${COMMIT} --url litecoin=${url} ../litecoin/contrib/gitian-descriptors/gitian-osx.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs.ltc/ ../litecoin/contrib/gitian-descriptors/gitian-osx.yml - mv build/out/litecoin-*-osx-unsigned.tar.gz inputs/litecoin-osx-unsigned.tar.gz - mv build/out/litecoin-*.tar.gz build/out/litecoin-*.dmg ../litecoin-binaries/${VERSION} + ./bin/gbuild -j ${proc} -m ${mem} --commit zorro=${COMMIT} --url zorro=${url} ../zorro/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-unsigned --destination ../gitian.sigs.ltc/ ../zorro/contrib/gitian-descriptors/gitian-osx.yml + mv build/out/zorro-*-osx-unsigned.tar.gz inputs/zorro-osx-unsigned.tar.gz + mv build/out/zorro-*.tar.gz build/out/zorro-*.dmg ../zorro-binaries/${VERSION} fi popd @@ -325,27 +325,27 @@ then echo "" echo "Verifying v${VERSION} Linux" echo "" - ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-linux ../litecoin/contrib/gitian-descriptors/gitian-linux.yml + ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-linux ../zorro/contrib/gitian-descriptors/gitian-linux.yml # Windows echo "" echo "Verifying v${VERSION} Windows" echo "" - ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-win-unsigned ../litecoin/contrib/gitian-descriptors/gitian-win.yml + ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-win-unsigned ../zorro/contrib/gitian-descriptors/gitian-win.yml # Mac OSX echo "" echo "Verifying v${VERSION} Mac OSX" echo "" - ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-osx-unsigned ../litecoin/contrib/gitian-descriptors/gitian-osx.yml + ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-osx-unsigned ../zorro/contrib/gitian-descriptors/gitian-osx.yml # Signed Windows echo "" echo "Verifying v${VERSION} Signed Windows" echo "" - ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-osx-signed ../litecoin/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-osx-signed ../zorro/contrib/gitian-descriptors/gitian-osx-signer.yml # Signed Mac OSX echo "" echo "Verifying v${VERSION} Signed Mac OSX" echo "" - ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-osx-signed ../litecoin/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gverify -v -d ../gitian.sigs.ltc/ -r ${VERSION}-osx-signed ../zorro/contrib/gitian-descriptors/gitian-osx-signer.yml popd fi @@ -360,10 +360,10 @@ then echo "" echo "Signing ${VERSION} Windows" echo "" - ./bin/gbuild -i --commit signature=${COMMIT} ../litecoin/contrib/gitian-descriptors/gitian-win-signer.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs.ltc/ ../litecoin/contrib/gitian-descriptors/gitian-win-signer.yml - mv build/out/litecoin-*win64-setup.exe ../litecoin-binaries/${VERSION} - mv build/out/litecoin-*win32-setup.exe ../litecoin-binaries/${VERSION} + ./bin/gbuild -i --commit signature=${COMMIT} ../zorro/contrib/gitian-descriptors/gitian-win-signer.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-win-signed --destination ../gitian.sigs.ltc/ ../zorro/contrib/gitian-descriptors/gitian-win-signer.yml + mv build/out/zorro-*win64-setup.exe ../zorro-binaries/${VERSION} + mv build/out/zorro-*win32-setup.exe ../zorro-binaries/${VERSION} fi # Sign Mac OSX if [[ $osx = true ]] @@ -371,9 +371,9 @@ then echo "" echo "Signing ${VERSION} Mac OSX" echo "" - ./bin/gbuild -i --commit signature=${COMMIT} ../litecoin/contrib/gitian-descriptors/gitian-osx-signer.yml - ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs.ltc/ ../litecoin/contrib/gitian-descriptors/gitian-osx-signer.yml - mv build/out/litecoin-osx-signed.dmg ../litecoin-binaries/${VERSION}/litecoin-${VERSION}-osx.dmg + ./bin/gbuild -i --commit signature=${COMMIT} ../zorro/contrib/gitian-descriptors/gitian-osx-signer.yml + ./bin/gsign -p $signProg --signer $SIGNER --release ${VERSION}-osx-signed --destination ../gitian.sigs.ltc/ ../zorro/contrib/gitian-descriptors/gitian-osx-signer.yml + mv build/out/zorro-osx-signed.dmg ../zorro-binaries/${VERSION}/zorro-${VERSION}-osx.dmg fi popd diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md index 7b76ba37e..5eed7edeb 100644 --- a/contrib/gitian-descriptors/README.md +++ b/contrib/gitian-descriptors/README.md @@ -19,7 +19,7 @@ Sanity checks: Once you've got the right hardware and software: - git clone git://github.com/litecoin-project/litecoin.git + git clone git://git.cryptogera.com/cryptogera/zorro.git git clone git://github.com/devrandom/gitian-builder.git mkdir gitian-builder/inputs cd gitian-builder/inputs @@ -61,5 +61,5 @@ Here's a description of Gavin's setup on OSX 10.6: 5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above: export USE_LXC=1 - git clone git://github.com/litecoin-project/litecoin.git + git clone git://git.cryptogera.com/cryptogera/zorro.git ... etc diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 99196054d..e049aecb3 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "litecoin-linux-0.15" +name: "zorro-linux-0.15" enable_cache: true suites: - "trusty" @@ -28,8 +28,8 @@ packages: - "ca-certificates" - "python" remotes: -- "url": "https://github.com/litecoin-project/litecoin.git" - "dir": "litecoin" +- "url": "https://git.cryptogera.com/cryptogera/zorro.git" + "dir": "zorro" files: [] script: | @@ -113,7 +113,7 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - cd litecoin + cd zorro BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -135,13 +135,13 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo litecoin-*.tar.gz` + SOURCEDIST=`echo zorro-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find litecoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find zorro-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd # Workaround for tarball not building with the bare tag version (prep) @@ -182,13 +182,13 @@ script: | find . -name "lib*.a" -delete rm -rf ${DISTNAME}/lib/pkgconfig - # Litecoin: Delete libbitcoin from binary distribution for now, see #192 + # Zorro: Delete libbitcoin from binary distribution for now, see #192 rm -rf ${DISTNAME}/lib/ rm -rf ${DISTNAME}/include/ - # Litecoin: ends + # Zorro: ends find ${DISTNAME}/bin -type f -executable -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \; - #find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \; # Litecoin: see issue 192 + #find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \; # Zorro: see issue 192 find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz cd ../../ diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml index 784583473..9f0c963f3 100644 --- a/contrib/gitian-descriptors/gitian-osx-signer.yml +++ b/contrib/gitian-descriptors/gitian-osx-signer.yml @@ -1,5 +1,5 @@ --- -name: "litecoin-dmg-signer" +name: "zorro-dmg-signer" suites: - "trusty" architectures: @@ -7,10 +7,10 @@ architectures: packages: - "faketime" remotes: -- "url": "https://github.com/litecoin-project/litecoin-detached-sigs.git" +- "url": "https://git.cryptogera.com/cryptogera/zorro-detached-sigs.git" "dir": "signature" files: -- "litecoin-osx-unsigned.tar.gz" +- "zorro-osx-unsigned.tar.gz" script: | WRAP_DIR=$HOME/wrapped mkdir -p ${WRAP_DIR} @@ -27,8 +27,8 @@ script: | chmod +x ${WRAP_DIR}/${prog} done - UNSIGNED=litecoin-osx-unsigned.tar.gz - SIGNED=litecoin-osx-signed.dmg + UNSIGNED=zorro-osx-unsigned.tar.gz + SIGNED=zorro-osx-signed.dmg tar -xf ${UNSIGNED} OSX_VOLNAME="$(cat osx_volname)" diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 2abaddc92..75ab59bae 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "litecoin-osx-0.15" +name: "zorro-osx-0.15" enable_cache: true suites: - "trusty" @@ -28,8 +28,8 @@ packages: - "python-setuptools" - "fonts-tuffy" remotes: -- "url": "https://github.com/litecoin-project/litecoin.git" - "dir": "litecoin" +- "url": "https://git.cryptogera.com/cryptogera/zorro.git" + "dir": "zorro" files: - "MacOSX10.11.sdk.tar.gz" script: | @@ -83,7 +83,7 @@ script: | create_per-host_faketime_wrappers "2000-01-01 12:00:00" export PATH=${WRAP_DIR}:${PATH} - cd litecoin + cd zorro BASEPREFIX=`pwd`/depends mkdir -p ${BASEPREFIX}/SDKs @@ -104,14 +104,14 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo litecoin-*.tar.gz` + SOURCEDIST=`echo zorro-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find litecoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find zorro-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST popd # Workaround for tarball not building with the bare tag version (prep) diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml index 331bf8976..5b3239abd 100644 --- a/contrib/gitian-descriptors/gitian-win-signer.yml +++ b/contrib/gitian-descriptors/gitian-win-signer.yml @@ -1,5 +1,5 @@ --- -name: "litecoin-win-signer" +name: "zorro-win-signer" suites: - "trusty" architectures: @@ -8,12 +8,12 @@ packages: - "libssl-dev" - "autoconf" remotes: -- "url": "https://github.com/litecoin-project/litecoin-detached-sigs.git" +- "url": "https://git.cryptogera.com/cryptogera/zorro-detached-sigs.git" "dir": "signature" files: - "osslsigncode-1.7.1.tar.gz" - "osslsigncode-Backports-to-1.7.1.patch" -- "litecoin-win-unsigned.tar.gz" +- "zorro-win-unsigned.tar.gz" script: | BUILD_DIR=`pwd` SIGDIR=${BUILD_DIR}/signature/win @@ -23,7 +23,7 @@ script: | echo "a8c4e9cafba922f89de0df1f2152e7be286aba73f78505169bc351a7938dd911 osslsigncode-Backports-to-1.7.1.patch" | sha256sum -c mkdir -p ${UNSIGNED_DIR} - tar -C ${UNSIGNED_DIR} -xf litecoin-win-unsigned.tar.gz + tar -C ${UNSIGNED_DIR} -xf zorro-win-unsigned.tar.gz tar xf osslsigncode-1.7.1.tar.gz cd osslsigncode-1.7.1 diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index d4a9d9f04..2bb4b6799 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "litecoin-win-0.15" +name: "zorro-win-0.15" enable_cache: true suites: - "trusty" @@ -22,8 +22,8 @@ packages: - "ca-certificates" - "python" remotes: -- "url": "https://github.com/litecoin-project/litecoin.git" - "dir": "litecoin" +- "url": "https://git.cryptogera.com/cryptogera/zorro.git" + "dir": "zorro" files: [] script: | WRAP_DIR=$HOME/wrapped @@ -101,7 +101,7 @@ script: | create_per-host_linker_wrapper "2000-01-01 12:00:00" export PATH=${WRAP_DIR}:${PATH} - cd litecoin + cd zorro BASEPREFIX=`pwd`/depends # Build dependencies for each host for i in $HOSTS; do @@ -119,14 +119,14 @@ script: | ./autogen.sh CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/ make dist - SOURCEDIST=`echo litecoin-*.tar.gz` + SOURCEDIST=`echo zorro-*.tar.gz` DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'` # Correct tar file order mkdir -p temp pushd temp tar xf ../$SOURCEDIST - find litecoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST + find zorro-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST mkdir -p $OUTDIR/src cp ../$SOURCEDIST $OUTDIR/src popd @@ -155,7 +155,7 @@ script: | make deploy make install DESTDIR=${INSTALLPATH} rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe - cp -f litecoin-*setup*.exe $OUTDIR/ + cp -f zorro-*setup*.exe $OUTDIR/ cd installed mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/ find . -name "lib*.la" -delete @@ -171,7 +171,7 @@ script: | cp -rf contrib/windeploy $BUILD_DIR cd $BUILD_DIR/windeploy mkdir unsigned - cp $OUTDIR/litecoin-*setup-unsigned.exe unsigned/ + cp $OUTDIR/zorro-*setup-unsigned.exe unsigned/ find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip mv ${OUTDIR}/${DISTNAME}-i686-*-debug.zip ${OUTDIR}/${DISTNAME}-win32-debug.zip diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md index 071c13a60..8738db7ae 100644 --- a/contrib/linearize/README.md +++ b/contrib/linearize/README.md @@ -1,5 +1,5 @@ # Linearize -Construct a linear, no-fork, best version of the Litecoin blockchain. The scripts +Construct a linear, no-fork, best version of the Zorro blockchain. The scripts run using Python 3 but are compatible with Python 2. ## Step 1: Download hash list @@ -12,7 +12,7 @@ Required configuration file settings for linearize-hashes: Optional config file setting for linearize-hashes: * RPC: `host` (Default: `127.0.0.1`) -* RPC: `port` (Default: `9332`) +* RPC: `port` (Default: `18642`) * Blockchain: `min_height`, `max_height` * `rev_hash_bytes`: If true, the written block hash list will be byte-reversed. (In other words, the hash returned by getblockhash will have its @@ -21,7 +21,7 @@ standalone hash lists but safe to use with linearize-data.py, which will output the same data no matter which byte format is chosen. The `linearize-hashes` script requires a connection, local or remote, to a -JSON-RPC server. Running `litecoind` or `litecoin-qt -server` will be sufficient. +JSON-RPC server. Running `zorrod` or `zorro-qt -server` will be sufficient. ## Step 2: Copy local block data @@ -39,7 +39,7 @@ will be printed. respectively, to the current time and to the timestamp of the most recent block written to the script's blockchain. * `genesis`: The hash of the genesis block in the blockchain. -* `input`: litecoind blocks/ directory containing blkNNNNN.dat +* `input`: zorrod blocks/ directory containing blkNNNNN.dat * `hashlist`: text file containing list of block hashes created by linearize-hashes.py. * `max_out_sz`: Maximum size for files created by the `output_file` option. diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg index 7e91609b6..d71071181 100644 --- a/contrib/linearize/example-linearize.cfg +++ b/contrib/linearize/example-linearize.cfg @@ -1,10 +1,10 @@ -# litecoind RPC settings (linearize-hashes) +# zorrod RPC settings (linearize-hashes) rpcuser=someuser rpcpassword=somepassword -#datadir=~/.litecoin +#datadir=~/.zorro host=127.0.0.1 -port=9332 -#port=19332 +port=18642 +#port=19063 # bootstrap.dat hashlist settings (linearize-hashes) max_height=313000 @@ -14,12 +14,12 @@ max_height=313000 # mainnet netmagic=fbc0b6db genesis=12a765e31ffd4059bada1e25190f6e98c99d9714d334efa41a195a7e7e04bfe2 -input=/home/example/.litecoin/blocks +input=/home/example/.zorro/blocks # testnet #netmagic=fdd2c8f1 -#genesis=4966625a4b2851d9fdee139e56211a0d88575f59ed816ff5e6a63deb4e3e29a0 -#input=/home/example/.litecoin/testnet3/blocks +#genesis=d43857b4d0f5e0d7140a395ba91e2ba714925d1a575dcfeef12bf8c71a985622 +#input=/home/example/.zorro/testnet3/blocks # "output" option causes blockchain files to be written to the given location, # with "output_file" ignored. If not used, "output_file" is used instead. diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index cc405b631..2812766f5 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -125,7 +125,7 @@ if __name__ == '__main__': if 'host' not in settings: settings['host'] = '127.0.0.1' if 'port' not in settings: - settings['port'] = 9332 + settings['port'] = 18642 if 'min_height' not in settings: settings['min_height'] = 0 if 'max_height' not in settings: diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index 50cc94d20..5824d5e28 100644 --- a/contrib/macdeploy/README.md +++ b/contrib/macdeploy/README.md @@ -11,5 +11,5 @@ This script should not be run manually, instead, after building as usual: During the process, the disk image window will pop up briefly where the fancy settings are applied. This is normal, please do not interfere. -When finished, it will produce `Litecoin-Core.dmg`. +When finished, it will produce `Zorro-Core.dmg`. diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py index c8bb6d1a2..1b25403ee 100755 --- a/contrib/macdeploy/custom_dsstore.py +++ b/contrib/macdeploy/custom_dsstore.py @@ -45,8 +45,8 @@ alias = Alias.from_bytes(icvp['backgroundImageAlias']) alias.volume.name = package_name_ns alias.volume.posix_path = '/Volumes/' + package_name_ns alias.volume.disk_image_alias.target.filename = package_name_ns + '.temp.dmg' -alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00litecoinuser:\x00Documents:\x00litecoin:\x00litecoin:\x00' + package_name_ns + '.temp.dmg' -alias.volume.disk_image_alias.target.posix_path = 'Users/litecoinuser/Documents/litecoin/litecoin/' + package_name_ns + '.temp.dmg' +alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00zorrouser:\x00Documents:\x00zorro:\x00zorro:\x00' + package_name_ns + '.temp.dmg' +alias.volume.disk_image_alias.target.posix_path = 'Users/zorrouser/Documents/zorro/zorro/' + package_name_ns + '.temp.dmg' alias.target.carbon_path = package_name_ns + ':.background:\x00background.tiff' icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes()) ds['.']['icvp'] = icvp @@ -54,7 +54,7 @@ ds['.']['icvp'] = icvp ds['.']['vSrn'] = ('long', 1) ds['Applications']['Iloc'] = (370, 156) -ds['Litecoin-Qt.app']['Iloc'] = (128, 156) +ds['Zorro-Qt.app']['Iloc'] = (128, 156) ds.flush() ds.close() diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh index a3fc318b4..58f2b8b00 100755 --- a/contrib/macdeploy/detached-sig-create.sh +++ b/contrib/macdeploy/detached-sig-create.sh @@ -6,7 +6,7 @@ set -e ROOTDIR=dist -BUNDLE="${ROOTDIR}/Litecoin-Qt.app" +BUNDLE="${ROOTDIR}/Zorro-Qt.app" CODESIGN=codesign TEMPDIR=sign.temp TEMPLIST=${TEMPDIR}/signatures.txt diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist index 1dd36c9d1..4c1c4e9de 100644 --- a/contrib/macdeploy/fancy.plist +++ b/contrib/macdeploy/fancy.plist @@ -22,7 +22,7 @@ 370 156 - Litecoin-Qt.app + Zorro-Qt.app 128 156 diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 6d4b15ce5..d7c905546 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -155,7 +155,7 @@ class FrameworkInfo(object): class ApplicationBundleInfo(object): def __init__(self, path): self.path = path - appName = "Litecoin-Qt" + appName = "Zorro-Qt" self.binaryPath = os.path.join(path, "Contents", "MacOS", appName) if not os.path.exists(self.binaryPath): raise RuntimeError("Could not find bundle binary for " + path) @@ -603,7 +603,7 @@ else: # ------------------------------------------------ -target = os.path.join("dist", "Litecoin-Qt.app") +target = os.path.join("dist", "Zorro-Qt.app") if verbose >= 2: print("+ Copying source bundle +") diff --git a/contrib/qos/README.md b/contrib/qos/README.md index d569b6a6f..606010ae4 100644 --- a/contrib/qos/README.md +++ b/contrib/qos/README.md @@ -1,5 +1,5 @@ ### Qos ### -This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Litecoin network. It limits outbound TCP traffic with a source or destination port of 9333, but not if the destination IP is within a LAN (defined as 192.168.x.x). +This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Zorro network. It limits outbound TCP traffic with a source or destination port of 18641, but not if the destination IP is within a LAN (defined as 192.168.x.x). -This means one can have an always-on litecoind instance running, and another local litecoind/litecoin-qt instance which connects to this node and receives blocks from it. +This means one can have an always-on zorrod instance running, and another local zorrod/zorro-qt instance which connects to this node and receives blocks from it. diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index 8f9bb7a8b..8803f016a 100644 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -6,7 +6,7 @@ IF="eth0" #limit of the network interface in question LINKCEIL="1gbit" -#limit outbound Litecoin protocol traffic to this rate +#limit outbound Zorro protocol traffic to this rate LIMIT="160kbit" #defines the address space for which you wish to disable rate limiting LOCALNET="192.168.0.0/16" @@ -36,10 +36,10 @@ tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11 # ret=$? #done -#limit outgoing traffic to and from port 9333. but not when dealing with a host on the local network +#limit outgoing traffic to and from port 18641. but not when dealing with a host on the local network # (defined by $LOCALNET) # --set-mark marks packages matching these criteria with the number "2" # these packages are filtered by the tc filter with "handle 2" # this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT} -iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 9333 ! -d ${LOCALNET} -j MARK --set-mark 0x2 -iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 9333 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 18641 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 18641 ! -d ${LOCALNET} -j MARK --set-mark 0x2 diff --git a/contrib/rpm/bitcoin.spec b/contrib/rpm/bitcoin.spec index ca089f715..1142ba2a9 100644 --- a/contrib/rpm/bitcoin.spec +++ b/contrib/rpm/bitcoin.spec @@ -332,9 +332,9 @@ if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then for selinuxvariant in %{selinux_variants}; do %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/bitcoin.pp &> /dev/null || : done -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 9332 -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 9333 -%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 19332 +%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18642 +%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18641 +%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 19063 %{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 19333 %{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || : %{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || : @@ -351,9 +351,9 @@ fi # SELinux if [ $1 -eq 0 ]; then if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then - %{_sbindir}/semanage port -d -p tcp 9332 - %{_sbindir}/semanage port -d -p tcp 9333 - %{_sbindir}/semanage port -d -p tcp 19332 + %{_sbindir}/semanage port -d -p tcp 18642 + %{_sbindir}/semanage port -d -p tcp 18641 + %{_sbindir}/semanage port -d -p tcp 19063 %{_sbindir}/semanage port -d -p tcp 19333 for selinuxvariant in %{selinux_variants}; do %{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || : diff --git a/contrib/seeds/README.md b/contrib/seeds/README.md index 9d2ffe369..3626bf1e0 100644 --- a/contrib/seeds/README.md +++ b/contrib/seeds/README.md @@ -8,7 +8,7 @@ and remove old versions as necessary. The seeds compiled into the release are created from poolers's DNS seed data, like this: - curl -s https://www.litecoinpool.org/seeds.txt > seeds_main.txt + curl -s https://www.zorropool.org/seeds.txt > seeds_main.txt python3 makeseeds.py < seeds_main.txt > nodes_main.txt python3 generate-seeds.py . > ../../src/chainparamsseeds.h diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py index c753491af..c4735f044 100755 --- a/contrib/seeds/generate-seeds.py +++ b/contrib/seeds/generate-seeds.py @@ -120,17 +120,17 @@ def main(): g.write('#ifndef BITCOIN_CHAINPARAMSSEEDS_H\n') g.write('#define BITCOIN_CHAINPARAMSSEEDS_H\n') g.write('/**\n') - g.write(' * List of fixed seed nodes for the litecoin network\n') + g.write(' * List of fixed seed nodes for the zorro network\n') g.write(' * AUTOGENERATED by contrib/seeds/generate-seeds.py\n') g.write(' *\n') g.write(' * Each line contains a 16-byte IPv6 address and a port.\n') g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n') g.write(' */\n') with open(os.path.join(indir,'nodes_main.txt'),'r') as f: - process_nodes(g, f, 'pnSeed6_main', 9333) + process_nodes(g, f, 'pnSeed6_main', 18641) g.write('\n') with open(os.path.join(indir,'nodes_test.txt'),'r') as f: - process_nodes(g, f, 'pnSeed6_test', 19335) + process_nodes(g, f, 'pnSeed6_test', 19062) g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n') if __name__ == '__main__': diff --git a/contrib/seeds/makeseeds.py b/contrib/seeds/makeseeds.py index 940d1e270..95d8ded7d 100755 --- a/contrib/seeds/makeseeds.py +++ b/contrib/seeds/makeseeds.py @@ -30,7 +30,7 @@ import collections PATTERN_IPV4 = re.compile(r"^((\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})):(\d+)$") PATTERN_IPV6 = re.compile(r"^\[([0-9a-z:]+)\]:(\d+)$") PATTERN_ONION = re.compile(r"^([abcdefghijklmnopqrstuvwxyz234567]{16}\.onion):(\d+)$") -PATTERN_AGENT = re.compile(r"^(/Satoshi:0.13.(0|1|2|99)/|/LitecoinCore:0.13.(0|1|2|99)/|/LitecoinCore:0.14.(0|1|2|99)/|/LitecoinCore:0.15.(0|1|2|99)/)$") +PATTERN_AGENT = re.compile(r"^(/Satoshi:0.13.(0|1|2|99)/|/Zorro:0.13.(0|1|2|99)/|/Zorro:0.14.(0|1|2|99)/|/Zorro:0.15.(0|1|2|99)/)$") def parseline(line): sline = line.split() diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt index c96ee4942..b89fa47d6 100644 --- a/contrib/seeds/nodes_main.txt +++ b/contrib/seeds/nodes_main.txt @@ -1,325 +1 @@ -5.19.171.173:10333 -5.39.64.7:9333 -5.39.174.116:9333 -5.45.69.13:9333 -5.70.60.59:9333 -5.83.128.199:9333 -5.164.223.102:9333 -5.255.86.7:9333 -14.152.121.45:9333 -14.162.208.157:9333 -23.89.193.201:9333 -23.92.221.66:9333 -23.111.173.210:9333 -23.227.204.78:9333 -23.249.72.123:9333 -24.32.201.82:9333 -24.42.207.95:9333 -24.113.234.227:9333 -24.220.69.242:9333 -31.220.7.131:9333 -34.193.68.10:9333 -35.194.152.236:33661 -35.198.168.198:9333 -36.249.108.60:9333 -37.61.209.144:9333 -37.97.181.86:9333 -37.120.161.147:9333 -37.148.195.230:9333 -37.157.183.16:9333 -37.221.209.222:9333 -38.27.99.44:9333 -38.108.92.49:9333 -45.77.131.4:9333 -45.77.248.13:9333 -46.21.146.245:9333 -46.28.201.68:9333 -46.32.50.98:9333 -46.37.191.113:9333 -46.38.56.110:9333 -46.229.168.201:9333 -46.238.238.176:9333 -46.254.240.86:10333 -47.54.207.91:9333 -47.55.95.227:9333 -47.74.228.154:9333 -47.89.48.243:9333 -47.93.232.59:9333 -47.187.1.83:9333 -49.228.206.9:9333 -50.63.166.27:9333 -52.50.244.44:9333 -52.229.171.108:9333 -54.153.120.32:9333 -54.166.208.190:9333 -60.40.43.189:9333 -60.191.106.148:9333 -62.152.54.44:9333 -62.152.58.16:9679 -62.212.141.33:9333 -63.141.246.42:9333 -63.224.55.76:9333 -64.34.231.140:9333 -65.44.118.194:9333 -65.189.240.126:9333 -66.187.65.6:9333 -66.196.5.33:9333 -67.6.226.221:9333 -68.97.201.76:9333 -68.102.158.172:9333 -68.114.233.44:9333 -68.171.16.250:9333 -68.198.36.180:9333 -69.27.173.227:10333 -69.112.110.247:9333 -69.172.169.188:9333 -70.63.170.86:9333 -70.95.219.136:9333 -70.118.197.69:9333 -70.124.168.12:9333 -71.120.16.218:9333 -72.185.120.29:9333 -72.234.251.203:9333 -74.66.93.22:9333 -74.80.235.180:10333 -74.208.221.224:9333 -76.12.247.45:9333 -76.107.8.67:9333 -77.37.156.166:9333 -77.90.195.67:9333 -77.110.11.52:9333 -78.129.241.145:9333 -79.135.200.27:9333 -79.157.88.48:9333 -80.83.191.199:9333 -80.101.93.34:9333 -80.122.43.78:9333 -80.209.234.173:9333 -80.211.132.197:9333 -80.218.108.14:9333 -81.24.101.140:9333 -81.27.96.37:9333 -81.94.197.250:9333 -81.111.118.56:9333 -82.202.162.5:9333 -83.162.196.192:9333 -83.183.110.251:9333 -83.212.97.34:9333 -84.85.102.113:9333 -84.215.80.43:9333 -84.234.52.190:37700 -85.21.144.226:9333 -85.143.137.206:9333 -85.145.248.184:9333 -85.194.238.130:9333 -85.195.242.52:9333 -85.214.68.122:9333 -85.245.167.246:9333 -86.2.87.19:9333 -86.166.234.4:9333 -87.79.94.221:9333 -87.236.27.155:9333 -87.249.207.89:9333 -88.99.184.7:9333 -88.191.51.7:9333 -88.191.247.11:9333 -88.202.202.221:9333 -88.208.3.82:9333 -89.22.104.48:9333 -89.179.153.171:9333 -89.212.75.6:9333 -89.221.215.56:9333 -89.221.241.44:9333 -89.238.77.69:9333 -91.109.112.90:9333 -91.109.112.94:9333 -91.126.118.164:9333 -91.195.42.134:9333 -91.197.44.43:9333 -91.227.47.247:9333 -91.228.155.63:9333 -91.240.142.228:9333 -92.63.88.125:9333 -92.107.160.77:9333 -92.222.180.15:9333 -93.100.51.48:9333 -93.104.210.112:9333 -94.156.174.65:9333 -94.210.62.73:9333 -94.242.232.92:9333 -94.254.21.81:9333 -95.79.102.209:10333 -95.154.90.99:9333 -95.174.101.14:9333 -95.211.136.86:9333 -95.211.189.3:9333 -95.213.137.3:9333 -95.213.182.182:9333 -96.19.28.91:9333 -96.27.8.242:9333 -97.91.224.251:9333 -98.198.104.57:9333 -99.69.17.146:9333 -101.100.141.69:9333 -103.56.136.105:9333 -103.82.56.25:9333 -103.203.50.58:9333 -103.218.3.122:9333 -103.242.66.36:3880 -104.35.96.255:9333 -104.219.251.145:9333 -104.238.198.165:9333 -104.239.230.131:28001 -107.155.120.131:9333 -107.180.69.235:9333 -107.183.37.154:9333 -108.170.26.210:11333 -108.222.149.83:9333 -109.75.172.40:9333 -109.88.85.177:9333 -109.111.178.181:10333 -109.172.77.204:9333 -109.195.179.63:9333 -109.236.88.229:9333 -110.4.40.147:9333 -113.105.139.42:9333 -116.62.224.23:15896 -118.163.120.179:9333 -118.163.122.208:9333 -119.9.116.68:9333 -119.15.100.120:9333 -119.28.12.152:9333 -119.28.177.66:9333 -119.205.234.81:9333 -120.92.117.37:10001 -121.54.175.90:10333 -121.54.175.191:10333 -134.119.221.115:9333 -136.30.44.86:9333 -136.144.155.115:9333 -138.197.156.129:9333 -139.199.90.223:9333 -143.89.121.207:9333 -144.76.220.17:9002 -147.229.13.210:9333 -148.66.58.194:9333 -152.186.36.86:9333 -158.129.212.236:9333 -158.129.212.251:9333 -159.203.110.137:9333 -159.253.21.46:9333 -162.213.252.46:9333 -166.70.94.106:9333 -167.88.15.89:6001 -168.235.81.143:9333 -169.44.34.88:9333 -169.57.145.101:9333 -171.25.221.40:9333 -172.104.104.203:9333 -173.32.12.108:9333 -173.51.177.2:9333 -173.71.68.101:9333 -173.80.190.86:9333 -173.209.44.34:9333 -173.209.53.114:9333 -173.249.8.133:9333 -173.255.204.124:9333 -174.97.240.26:9333 -174.117.242.205:9333 -176.99.7.253:9333 -176.102.192.8:9333 -176.126.167.10:9333 -176.221.43.121:9333 -178.12.118.128:9333 -178.15.158.237:9333 -178.20.55.234:9333 -178.155.51.54:9333 -178.238.236.130:10333 -182.255.61.202:28374 -184.61.213.5:9333 -184.70.33.190:9333 -184.70.254.238:9333 -184.95.48.202:9333 -185.8.165.150:10333 -185.15.92.18:10993 -185.21.223.231:9333 -185.25.120.91:9333 -185.35.137.50:9333 -185.50.213.124:9333 -185.56.82.26:9333 -185.64.104.2:9333 -185.86.83.53:9333 -185.101.218.140:9333 -185.103.243.133:9333 -185.127.17.125:9333 -185.133.40.200:8234 -185.141.24.127:9333 -185.141.24.249:9333 -185.148.162.35:10333 -185.153.198.231:9333 -185.154.15.191:9333 -185.160.208.122:9333 -185.176.141.11:9333 -185.181.11.226:9333 -185.183.161.35:9333 -185.194.140.155:9333 -185.220.33.46:9333 -188.42.59.116:9333 -188.72.214.6:9333 -188.126.60.51:9333 -188.138.33.33:9333 -188.168.81.56:9333 -188.172.155.81:9333 -188.214.30.216:9333 -188.241.58.79:9333 -189.38.88.105:9333 -190.117.133.172:9333 -191.101.236.222:9333 -192.111.152.58:9333 -192.162.100.156:9333 -192.187.116.245:9333 -193.23.181.135:9333 -193.106.30.173:9333 -194.44.136.178:9333 -194.63.143.197:9333 -194.79.8.37:10333 -194.88.106.40:9333 -194.190.93.235:10333 -195.68.159.181:9333 -195.154.235.93:9333 -195.169.138.2:9333 -196.38.233.130:10333 -198.40.48.22:9333 -198.48.216.49:9933 -198.98.48.192:9333 -199.204.211.87:9333 -203.60.2.67:9333 -203.98.175.26:9333 -203.98.175.43:9333 -203.218.9.132:9333 -205.185.120.58:9333 -207.254.60.12:9333 -209.41.186.78:9333 -209.108.206.229:9333 -209.133.221.159:9333 -209.147.127.107:9333 -210.183.15.227:9333 -212.24.96.197:9333 -212.47.252.13:9333 -212.51.144.42:9333 -213.113.232.47:9333 -213.114.244.105:9333 -213.141.154.201:9333 -213.143.107.143:9333 -213.168.13.151:9333 -217.20.130.72:9333 -217.103.32.213:9333 -217.112.251.21:9333 -217.122.192.92:9333 -217.148.94.54:9333 -219.88.232.127:9333 -219.117.248.55:9333 -220.194.43.237:9333 -221.229.166.25:9333 -222.236.44.46:9333 -222.239.11.131:9333 +179.228.234.7:18641 diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt index 02b36fcc0..18768d1d5 100644 --- a/contrib/seeds/nodes_test.txt +++ b/contrib/seeds/nodes_test.txt @@ -1,20 +1 @@ -5.9.31.67:19002 -23.239.30.164:19335 -35.159.10.86:19333 -45.76.92.84:19335 -52.221.228.214:19335 -80.237.240.102:19335 -81.169.237.132:19335 -85.143.254.151:19335 -85.214.99.201:19335 -104.131.161.171:19335 -104.243.38.34:19335 -118.89.159.229:19335 -138.201.195.202:19335 -139.59.38.132:9898 -162.213.252.66:19335 -173.209.42.7:19335 -188.42.59.116:19335 -195.142.111.77:6753 -198.58.102.18:19335 -218.244.146.111:19335 +179.228.234.7:19062 diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index e1b5e9cae..b9a9b4401 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -36,15 +36,15 @@ def check_json_precision(): raise RuntimeError("JSON encode/decode loses precision") def determine_db_dir(): - """Return the default location of the litecoin data directory""" + """Return the default location of the zorro data directory""" if platform.system() == "Darwin": - return os.path.expanduser("~/Library/Application Support/Litecoin/") + return os.path.expanduser("~/Library/Application Support/Zorro/") elif platform.system() == "Windows": - return os.path.join(os.environ['APPDATA'], "Litecoin") - return os.path.expanduser("~/.litecoin") + return os.path.join(os.environ['APPDATA'], "Zorro") + return os.path.expanduser("~/.zorro") def read_bitcoin_config(dbdir): - """Read the litecoin.conf file from dbdir, returns dictionary of settings""" + """Read the zorro.conf file from dbdir, returns dictionary of settings""" from ConfigParser import SafeConfigParser class FakeSecHead(object): @@ -62,15 +62,15 @@ def read_bitcoin_config(dbdir): return s config_parser = SafeConfigParser() - config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "litecoin.conf")))) + config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "zorro.conf")))) return dict(config_parser.items("all")) def connect_JSON(config): - """Connect to a litecoin JSON-RPC server""" + """Connect to a zorro JSON-RPC server""" testnet = config.get('testnet', '0') testnet = (int(testnet) > 0) # 0/1 in config file, convert to True/False if not 'rpcport' in config: - config['rpcport'] = 19332 if testnet else 9332 + config['rpcport'] = 19063 if testnet else 18642 connect = "http://%s:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport']) try: result = ServiceProxy(connect) @@ -224,15 +224,15 @@ def main(): parser = optparse.OptionParser(usage="%prog [options]") parser.add_option("--from", dest="fromaddresses", default=None, - help="addresses to get litecoins from") + help="addresses to get zorros from") parser.add_option("--to", dest="to", default=None, - help="address to get send litecoins to") + help="address to get send zorros to") parser.add_option("--amount", dest="amount", default=None, help="amount to send") parser.add_option("--fee", dest="fee", default="0.0", help="fee to include") parser.add_option("--datadir", dest="datadir", default=determine_db_dir(), - help="location of litecoin.conf file with RPC username/password (default: %default)") + help="location of zorro.conf file with RPC username/password (default: %default)") parser.add_option("--testnet", dest="testnet", default=False, action="store_true", help="Use the test network") parser.add_option("--dry_run", dest="dry_run", default=False, action="store_true", diff --git a/contrib/testgen/README.md b/contrib/testgen/README.md index 0858cdb13..3e4f6ab65 100644 --- a/contrib/testgen/README.md +++ b/contrib/testgen/README.md @@ -1,6 +1,6 @@ ### TestGen ### -Utilities to generate test vectors for the data-driven Litecoin tests. +Utilities to generate test vectors for the data-driven Zorro tests. Usage: diff --git a/contrib/tidy_datadir.sh b/contrib/tidy_datadir.sh index a802b542a..be782c3a9 100755 --- a/contrib/tidy_datadir.sh +++ b/contrib/tidy_datadir.sh @@ -7,7 +7,7 @@ if [ -d "$1" ]; then cd "$1" else echo "Usage: $0 " >&2 - echo "Removes obsolete Litecoin database files" >&2 + echo "Removes obsolete Zorro database files" >&2 exit 1 fi @@ -19,22 +19,22 @@ if [ -f wallet.dat -a -f peers.dat -a -f chainstate/CURRENT -a -f blocks/index/C case $LEVEL in 0) - echo "Error: no Litecoin datadir detected." + echo "Error: no Zorro datadir detected." exit 1 ;; 1) - echo "Detected old Litecoin datadir (before 0.7)." + echo "Detected old Zorro datadir (before 0.7)." echo "Nothing to do." exit 0 ;; 2) - echo "Detected Litecoin 0.7 datadir." + echo "Detected Zorro 0.7 datadir." ;; 3) - echo "Detected Litecoin pre-0.8 datadir." + echo "Detected Zorro pre-0.8 datadir." ;; 4) - echo "Detected Litecoin 0.8 datadir." + echo "Detected Zorro 0.8 datadir." ;; esac diff --git a/contrib/windeploy/win-codesign.cert b/contrib/windeploy/win-codesign.cert index 363c132b5..ac324098c 100644 --- a/contrib/windeploy/win-codesign.cert +++ b/contrib/windeploy/win-codesign.cert @@ -1,7 +1,7 @@ Bag Attributes - friendlyName: Litecoin Foundation LTD.'s DigiCert Inc ID + friendlyName: Zorro Foundation LTD.'s DigiCert Inc ID localKeyID: 2F AA 3A 86 85 98 1A 53 D5 23 F0 2E A0 22 CC 51 21 6D 78 B0 -subject=/C=SG/L=Singapore/O=Litecoin Foundation LTD./CN=Litecoin Foundation LTD. +subject=/C=SG/L=Singapore/O=Zorro Foundation LTD./CN=Zorro Foundation LTD. issuer=/C=US/O=DigiCert Inc/OU=www.digicert.com/CN=DigiCert SHA2 Assured ID Code Signing CA -----BEGIN CERTIFICATE----- MIIFKjCCBBKgAwIBAgIQDvRXzQ2H3xYGUBDUDBeH/TANBgkqhkiG9w0BAQsFADBy diff --git a/depends/README.md b/depends/README.md index 35814cabb..5a0170816 100644 --- a/depends/README.md +++ b/depends/README.md @@ -12,9 +12,9 @@ For example: make HOST=x86_64-w64-mingw32 -j4 -A prefix will be generated that's suitable for plugging into Litecoin's +A prefix will be generated that's suitable for plugging into Zorro's configure. In the above example, a dir named x86_64-w64-mingw32 will be -created. To use it for Litecoin: +created. To use it for Zorro: ./configure --prefix=`pwd`/depends/x86_64-w64-mingw32 @@ -43,7 +43,7 @@ The following can be set when running make: make FOO=bar BUILD_ID_SALT: Optional salt to use when generating build package ids If some packages are not built, for example `make NO_WALLET=1`, the appropriate -options will be passed to litecoin's configure. In this case, `--disable-wallet`. +options will be passed to zorro's configure. In this case, `--disable-wallet`. Additional targets: diff --git a/depends/config.guess b/depends/config.guess index 69ed3e573..ecd01353b 100755 --- a/depends/config.guess +++ b/depends/config.guess @@ -771,8 +771,8 @@ EOF echo ${UNAME_MACHINE}-unknown-osf1 fi exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites + parisc*:mZRR*:*:*) + echo hppa1.1-hp-mZRR exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd diff --git a/depends/config.sub b/depends/config.sub index 40ea5dfe1..18309e742 100755 --- a/depends/config.sub +++ b/depends/config.sub @@ -1404,7 +1404,7 @@ case $os in | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -udi* | -eabi* | -mZRR* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index bf773ccd1..92220afd7 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,6 +1,6 @@ package=boost $(package)_version=1_64_0 -$(package)_download_path=https://dl.bintray.com/boostorg/release/1.64.0/source/ +$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/1.64.0/source/ $(package)_file_name=$(package)_$($(package)_version).tar.bz2 $(package)_sha256_hash=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332 diff --git a/doc/README.md b/doc/README.md index 7f001e264..b6c59e63f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,41 +1,41 @@ -Litecoin Core +Zorro Core ============= Setup --------------------- -Litecoin Core is the original Litecoin client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Litecoin transactions (which is currently more than 7 GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. +Zorro Core is the original Zorro client and it builds the backbone of the network. It downloads and, by default, stores the entire history of Zorro transactions (which is currently more than 7 GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. -To download Litecoin Core, visit [litecoin.org](https://litecoin.org). +To download Zorro Core, visit [cryptogera.com](https://cryptogera.com). Running --------------------- -The following are some helpful notes on how to run Litecoin on your native platform. +The following are some helpful notes on how to run Zorro on your native platform. ### Unix Unpack the files into a directory and run: -- `bin/litecoin-qt` (GUI) or -- `bin/litecoind` (headless) +- `bin/zorro-qt` (GUI) or +- `bin/zorrod` (headless) ### Windows -Unpack the files into a directory, and then run litecoin-qt.exe. +Unpack the files into a directory, and then run zorro-qt.exe. ### OS X -Drag Litecoin-Core to your applications folder, and then run Litecoin-Core. +Drag Zorro-Core to your applications folder, and then run Zorro-Core. ### Need Help? -* See the documentation at the [Litecoin Wiki](https://litecoin.info/) +* See the documentation at the [Zorro Wiki](https://git.cryptogera.com/cryptogera/zorro/wiki/) for help and more information. -* Ask for help on [#litecoin](http://webchat.freenode.net?channels=litecoin) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net?channels=litecoin). -* Ask for help on the [LitecoinTalk](https://litecointalk.io/) forums. +* Ask for help on [#zorro](http://webchat.freenode.net?channels=zorro) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net?channels=zorro). +* Ask for help on the [ZorroTalk](https://zorrotalk.io/) forums. Building --------------------- -The following are developer notes on how to build Litecoin on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc. +The following are developer notes on how to build Zorro on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc. - [OS X Build Notes](build-osx.md) - [Unix Build Notes](build-unix.md) @@ -45,12 +45,12 @@ The following are developer notes on how to build Litecoin on your native platfo Development --------------------- -The Litecoin repo's [root README](/README.md) contains relevant information on the development process and automated testing. +The Zorro repo's [root README](/README.md) contains relevant information on the development process and automated testing. - [Developer Notes](developer-notes.md) - [Release Notes](release-notes.md) - [Release Process](release-process.md) -- [Source Code Documentation (External Link)](https://dev.visucore.com/litecoin/doxygen/) +- [Source Code Documentation (External Link)](https://dev.visucore.com/zorro/doxygen/) - [Translation Process](translation_process.md) - [Translation Strings Policy](translation_strings_policy.md) - [Travis CI](travis-ci.md) @@ -61,8 +61,8 @@ The Litecoin repo's [root README](/README.md) contains relevant information on t - [Benchmarking](benchmarking.md) ### Resources -* Discuss on the [LitecoinTalk](https://litecointalk.io/) forums. -* Discuss general Litecoin development on #litecoin-dev on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=litecoin-dev). +* Discuss on the [ZorroTalk](https://zorrotalk.io/) forums. +* Discuss general Zorro development on #zorro-dev on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=zorro-dev). ### Miscellaneous - [Assets Attribution](assets-attribution.md) diff --git a/doc/README_osx.md b/doc/README_osx.md index e2e2ca825..a7680d727 100644 --- a/doc/README_osx.md +++ b/doc/README_osx.md @@ -92,6 +92,6 @@ build process to remain somewhat deterministic. Here's how it works: that have been previously (deterministically) built in order to create a final dmg. - The Apple keyholder uses this unsigned app to create a detached signature, - using the script that is also included there. Detached signatures are available from this [repository](https://github.com/litecoin-project/litecoin-detached-sigs). + using the script that is also included there. Detached signatures are available from this [repository](https://git.cryptogera.com/cryptogera/zorro-detached-sigs). - Builders feed the unsigned app + detached signature back into Gitian. It uses the pre-built tools to recombine the pieces into a deterministic dmg. diff --git a/doc/README_windows.txt b/doc/README_windows.txt index d3885952b..c2b95fd1d 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,9 +1,9 @@ -Litecoin Core +Zorro Core ============= Intro ----- -Litecoin is a free open source peer-to-peer electronic cash system that is +Zorro is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. @@ -11,13 +11,13 @@ with each other, with the help of a P2P network to check for double-spending. Setup ----- -Unpack the files into a directory and run litecoin-qt.exe. +Unpack the files into a directory and run zorro-qt.exe. -Litecoin Core is the original Litecoin client and it builds the backbone of the network. -However, it downloads and stores the entire history of Litecoin transactions; +Zorro Core is the original Zorro client and it builds the backbone of the network. +However, it downloads and stores the entire history of Zorro transactions; depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. -See the litecoin wiki at: - https://litecoin.info/ +See the zorro wiki at: + https://git.cryptogera.com/cryptogera/zorro/wiki/ for more help and information. diff --git a/doc/REST-interface.md b/doc/REST-interface.md index 137e97713..774dddb11 100644 --- a/doc/REST-interface.md +++ b/doc/REST-interface.md @@ -57,7 +57,7 @@ https://github.com/bitcoin/bips/blob/master/bip-0064.mediawiki Example: ``` -$ curl localhost:19332/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp +$ curl localhost:19063/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp { "chainHeight" : 325347, "chaintipHash" : "00000000fb01a7f3745a717f8caebee056c484e6e0bfe4a9591c235bb70506fb", @@ -99,4 +99,4 @@ Only supports JSON as output format. Risks ------------- -Running a web browser on the same node with a REST enabled litecoind can be a risk. Accessing prepared XSS websites could read out tx/block data of your node by placing links like `