From 93d571e1be6a869a3b4f6d5fe2b7f8666da9844a Mon Sep 17 00:00:00 2001 From: "Netbox.Global" Date: Wed, 26 Jun 2019 19:49:35 +0300 Subject: [PATCH] Netbox.Wallet v3.3.0 --- .dockerignore | 157 + .github/ISSUE_TEMPLATE.md | 34 - .gitignore | 33 +- .travis/test_06_script_b.sh | 2 +- CMakeLists.txt | 84 +- CONTRIBUTING.md | 20 +- Dockerfile | 39 + Dockerfile_dev | 30 + Dockerfile_osx | 27 + Dockerfile_qt | 41 + Dockerfile_static | 21 + Dockerfile_windows | 25 + Dockerfile_windows_x64 | 25 + INSTALL | 2 +- Makefile.am | 56 +- Makefile_docker | 66 + README.md | 147 +- build-aux/m4/bitcoin_qt.m4 | 4 +- build-aux/m4/gmp.m4 | 16 - configure.ac | 83 +- contrib/bitrpc/bitrpc.py | 4 +- contrib/debian/README.md | 16 +- contrib/debian/changelog | 6 +- contrib/debian/control | 14 +- contrib/debian/copyright | 2 +- .../debian/examples/{pivx.conf => nbx.conf} | 24 +- contrib/debian/nbxd.bash-completion | 2 + contrib/debian/nbxd.examples | 1 + contrib/debian/nbxd.install | 2 + ...ntian-overrides => nbxd.lintian-overrides} | 2 +- contrib/debian/nbxd.manpages | 2 + .../debian/{pivxd.postinst => nbxd.postinst} | 8 +- contrib/debian/{pivxd.postrm => nbxd.postrm} | 8 +- .../debian/{pivxd.service => nbxd.service} | 16 +- contrib/debian/netboxwallet.desktop | 12 + contrib/debian/netboxwallet.install | 6 + ...errides => netboxwallet.lintian-overrides} | 2 +- contrib/debian/netboxwallet.manpages | 1 + ...pivx-qt.protocol => netboxwallet.protocol} | 4 +- contrib/debian/pivx-qt.desktop | 13 - contrib/debian/pivx-qt.install | 6 - contrib/debian/pivx-qt.manpages | 1 - contrib/debian/pivxd.bash-completion | 2 - contrib/debian/pivxd.examples | 1 - contrib/debian/pivxd.install | 3 - contrib/debian/pivxd.manpages | 2 - contrib/debian/rules | 6 +- contrib/devtools/README.md | 8 +- contrib/devtools/check-doc.py | 2 +- contrib/devtools/update-translations.py | 3 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- contrib/gitian-descriptors/gitian-osx.yml | 2 +- contrib/gitian-descriptors/gitian-win.yml | 2 +- contrib/gitian-keys/gpdionisio-key.gpg | 104 +- contrib/init/README.md | 10 +- contrib/init/{pivxd.conf => nbxd.conf} | 18 +- contrib/init/{pivxd.init => nbxd.init} | 24 +- contrib/init/{pivxd.openrc => nbxd.openrc} | 20 +- .../{pivxd.openrcconf => nbxd.openrcconf} | 24 +- contrib/init/{pivxd.service => nbxd.service} | 14 +- contrib/install_db4.sh | 2 +- contrib/linearize/linearize-hashes.py | 2 +- contrib/macdeploy/README.md | 2 +- contrib/macdeploy/custom_dsstore.py | 2 +- contrib/macdeploy/detached-sig-create.sh | 2 +- contrib/macdeploy/fancy.plist | 2 +- contrib/macdeploy/macdeployqtplus | 4 +- ...ash-completion => nbx-cli.bash-completion} | 26 +- contrib/{pivx-qt.pro => nbx-qt.pro} | 75 +- ...bash-completion => nbx-tx.bash-completion} | 0 ...d.bash-completion => nbxd.bash-completion} | 14 +- contrib/qos/README.md | 4 +- contrib/qos/tc.sh | 6 +- contrib/rpm/nbx.fc | 8 + contrib/rpm/{pivx.if => nbx.if} | 0 contrib/rpm/{pivx.spec => nbx.spec} | 220 +- contrib/rpm/{pivx.te => nbx.te} | 0 contrib/rpm/pivx.fc | 8 - contrib/seeds/generate-seeds.py | 4 +- contrib/spendfrom/README.md | 2 +- contrib/spendfrom/spendfrom.py | 78 +- contrib/valgrind.supp | 4 +- depends/README.md | 2 +- doc/README.md | 72 - doc/README_windows.txt | 19 - doc/REST-interface.md | 92 - doc/assets-attribution.md | 103 - doc/bitcoin_logo_doxygen.png | Bin 17454 -> 0 bytes doc/build-osx.md | 210 - doc/build-unix.md | 283 - doc/build-windows.md | 151 - doc/dependencies.md | 46 - doc/developer-notes.md | 905 --- doc/dnsseed-policy.md | 54 - doc/files.md | 22 - doc/gitian-building.md | 413 - .../create_vm_file_location_size.png | Bin 73099 -> 0 bytes doc/gitian-building/create_vm_hard_drive.png | Bin 80962 -> 0 bytes .../create_vm_hard_drive_file_type.png | Bin 83614 -> 0 bytes doc/gitian-building/create_vm_memsize.png | Bin 54844 -> 0 bytes doc/gitian-building/create_vm_page1.png | Bin 133328 -> 0 bytes .../create_vm_storage_physical_hard_drive.png | Bin 91493 -> 0 bytes .../debian_install_10_configure_clock.png | Bin 4355 -> 0 bytes .../debian_install_11_partition_disks.png | Bin 5212 -> 0 bytes .../debian_install_12_choose_disk.png | Bin 3372 -> 0 bytes .../debian_install_13_partition_scheme.png | Bin 4355 -> 0 bytes .../debian_install_14_finish.png | Bin 6013 -> 0 bytes .../debian_install_15_write_changes.png | Bin 4551 -> 0 bytes .../debian_install_16_choose_a_mirror.png | Bin 6640 -> 0 bytes .../debian_install_17_choose_a_mirror2.png | Bin 5552 -> 0 bytes .../debian_install_18_proxy_settings.png | Bin 4017 -> 0 bytes .../debian_install_19_software_selection.png | Bin 4795 -> 0 bytes .../debian_install_1_boot_menu.png | Bin 86145 -> 0 bytes .../debian_install_20_install_grub.png | Bin 5436 -> 0 bytes .../debian_install_21_finish_installation.png | Bin 3549 -> 0 bytes .../debian_install_2_select_a_language.png | Bin 9943 -> 0 bytes .../debian_install_3_select_location.png | Bin 6324 -> 0 bytes .../debian_install_4_configure_keyboard.png | Bin 5495 -> 0 bytes ...debian_install_5_configure_the_network.png | Bin 4110 -> 0 bytes .../debian_install_6_domain_name.png | Bin 3928 -> 0 bytes ...debian_install_6a_set_up_root_password.png | Bin 7075 -> 0 bytes .../debian_install_7_set_up_user_fullname.png | Bin 4977 -> 0 bytes .../debian_install_8_set_up_username.png | Bin 4005 -> 0 bytes .../debian_install_9_user_password.png | Bin 3170 -> 0 bytes doc/gitian-building/network_settings.png | Bin 60793 -> 0 bytes doc/gitian-building/port_forwarding_rules.png | Bin 14613 -> 0 bytes doc/gitian-building/select_startup_disk.png | Bin 87579 -> 0 bytes doc/img/bootstrap1.png | Bin 56149 -> 0 bytes doc/img/bootstrap2.png | Bin 35412 -> 0 bytes doc/img/bootstrap4.png | Bin 105723 -> 0 bytes doc/img/bootstrap5.png | Bin 20558 -> 0 bytes doc/init.md | 145 - doc/man/Makefile.am | 6 +- doc/man/{pivx-cli.1 => nbx-cli.1} | 8 +- doc/man/{pivx-tx.1 => nbx-tx.1} | 0 doc/man/{pivxd.1 => nbxd.1} | 76 +- doc/man/{pivx-qt.1 => netboxwallet.1} | 74 +- doc/release-notes.md | 159 - doc/release-notes/release-notes-2.1.5.md | 13 - doc/release-notes/release-notes-2.1.6.md | 3 - doc/release-notes/release-notes-2.1.7.md | 8 - doc/release-notes/release-notes-2.2.0.md | 6 - doc/release-notes/release-notes-2.2.1.md | 121 - doc/release-notes/release-notes-2.3.0.md | 198 - doc/release-notes/release-notes-2.3.1.md | 213 - doc/release-notes/release-notes-3.0.0.md | 135 - doc/release-notes/release-notes-3.0.2.md | 128 - doc/release-notes/release-notes-3.0.4.md | 123 - doc/release-notes/release-notes-3.0.5.1.md | 12 - doc/release-notes/release-notes-3.0.5.md | 111 - doc/release-notes/release-notes-3.0.6.md | 119 - doc/release-notes/release-notes-3.1.0.1.md | 54 - doc/release-notes/release-notes-3.1.0.2.md | 78 - doc/release-notes/release-notes-3.1.0.md | 408 - doc/release-notes/release-notes-3.1.1.md | 154 - doc/release-notes/release-notes-3.2.0.md | 342 - doc/release-process.md | 292 - doc/tor.md | 132 - doc/translation_process.md | 109 - doc/translation_strings_policy.md | 99 - doc/travis-ci.txt | 42 - doc/zmq.md | 110 - share/pixmaps/pivx-bc.ico | Bin 62716 -> 0 bytes share/pixmaps/pivx.ico | Bin 53158 -> 0 bytes share/pixmaps/pivx128.png | Bin 7704 -> 0 bytes share/pixmaps/pivx128.xpm | 258 - share/pixmaps/pivx16.png | Bin 697 -> 0 bytes share/pixmaps/pivx16.xpm | 149 - share/pixmaps/pivx256.png | Bin 14562 -> 0 bytes share/pixmaps/pivx256.xpm | 397 - share/pixmaps/pivx32.png | Bin 1572 -> 0 bytes share/pixmaps/pivx32.xpm | 182 - share/pixmaps/pivx64.png | Bin 2538 -> 0 bytes share/pixmaps/pivx64.xpm | 148 - share/qt/Info.plist.in | 8 +- share/qt/extract_strings_qt.py | 2 +- share/qt/make_windows_icon.sh | 26 +- share/setup.nsi.in | 2 +- share/ui.rc | 2 +- src/Makefile.am | 164 +- src/Makefile.qt.include | 191 +- src/Makefile.qttest.include | 32 +- src/Makefile.test.include | 40 +- src/activemasternode.cpp | 15 +- src/activemasternode.h | 5 +- src/allocators.h | 4 +- src/amount.cpp | 14 +- src/amount.h | 3 + src/attributes.h | 23 + src/base58.h | 3 +- src/bip38.cpp | 279 - src/bip38.h | 40 - src/blocksignature.cpp | 27 +- src/blocksignature.h | 7 +- src/bloom.cpp | 14 +- src/bloom.h | 2 +- src/chain.h | 75 +- src/chainparams.cpp | 310 +- src/chainparams.h | 95 +- src/chainparamsbase.cpp | 5 +- src/chainparamsbase.h | 4 +- src/chainparamsseeds.h | 250 +- src/clientversion.cpp | 5 +- src/clientversion.h | 9 +- src/coincontrol.h | 4 +- src/coins.cpp | 7 +- src/coins.h | 3 +- src/compat.h | 3 +- src/compat/byteswap.h | 3 +- src/compat/endian.h | 3 +- src/compat/glibc_compat.cpp | 3 +- src/compat/glibc_sanity.cpp | 3 +- src/compat/strnlen.cpp | 3 +- src/concurrentqueue.h | 6 +- src/core_read.cpp | 3 +- src/crypter.cpp | 98 +- src/crypter.h | 7 +- src/denomination_functions.cpp | 437 -- src/denomination_functions.h | 27 - src/genwit.cpp | 67 - src/genwit.h | 61 - src/hash.h | 93 +- src/httpserver.cpp | 5 +- src/init.cpp | 1144 ++- src/init.h | 4 +- src/invalid.cpp | 90 - src/invalid.h | 25 - src/invalid_outpoints.json.h | 6796 ----------------- src/invalid_serials.json.h | 1192 --- src/kernel.cpp | 129 +- src/kernel.h | 17 +- src/key.cpp | 5 +- src/key.h | 7 +- src/keystore.cpp | 27 +- src/keystore.h | 17 +- src/libzerocoin/Accumulator.cpp | 148 - src/libzerocoin/Accumulator.h | 159 - .../AccumulatorProofOfKnowledge.cpp | 144 - src/libzerocoin/AccumulatorProofOfKnowledge.h | 96 - src/libzerocoin/Coin.cpp | 302 - src/libzerocoin/Coin.h | 181 - src/libzerocoin/CoinSpend.cpp | 171 - src/libzerocoin/CoinSpend.h | 182 - src/libzerocoin/Commitment.cpp | 174 - src/libzerocoin/Commitment.h | 108 - src/libzerocoin/Denominations.cpp | 117 - src/libzerocoin/Denominations.h | 41 - src/libzerocoin/LICENSE | 19 - src/libzerocoin/ParamGeneration.cpp | 658 -- src/libzerocoin/ParamGeneration.h | 55 - src/libzerocoin/Params.cpp | 48 - src/libzerocoin/Params.h | 220 - .../SerialNumberSignatureOfKnowledge.cpp | 178 - .../SerialNumberSignatureOfKnowledge.h | 76 - src/libzerocoin/SpendType.h | 19 - src/libzerocoin/ZerocoinDefines.h | 41 - src/libzerocoin/bignum.cpp | 63 - src/libzerocoin/bignum.h | 349 - src/libzerocoin/bignum_gmp.cpp | 351 - src/libzerocoin/bignum_openssl.cpp | 508 -- src/libzerocoin/documentation/Doxyfile | 1870 ----- .../documentation/manual/intro.tex | 3 - .../documentation/manual/manual.pdf | Bin 73684 -> 0 bytes .../documentation/manual/manual.tex | 19 - .../documentation/manual/using.tex | 14 - src/libzerocoin/paramgen.cpp | 129 - src/libzerocoin/zerocoin.pc.in | 11 - src/lightzpivthread.cpp | 116 - src/lightzpivthread.h | 70 - src/main.cpp | 2270 +----- src/main.h | 60 +- src/masternode-budget.cpp | 2365 ------ src/masternode-budget.h | 607 -- src/masternode-payments.cpp | 247 +- src/masternode-payments.h | 5 +- src/masternode-sync.cpp | 121 +- src/masternode-sync.h | 15 +- src/masternode.cpp | 38 +- src/masternode.h | 7 +- src/masternodeconfig.cpp | 11 +- src/masternodeman.cpp | 29 +- src/miner.cpp | 194 +- src/mnemonic.cpp | 89 + src/mnemonic.h | 30 + src/mnemonic_en.cpp | 2053 +++++ src/{pivx-cli-res.rc => nbx-cli-res.rc} | 10 +- src/{pivx-cli.cpp => nbx-cli.cpp} | 13 +- src/{pivxd-res.rc => nbx-tx-res.rc} | 10 +- src/{pivx-tx.cpp => nbx-tx.cpp} | 5 +- src/{pivx-tx-res.rc => nbxd-res.rc} | 12 +- src/{pivxd.cpp => nbxd.cpp} | 15 +- src/net.cpp | 8 +- src/netbase.cpp | 3 +- src/netbase.h | 3 +- src/noui.cpp | 3 +- src/obfuscation-relay.cpp | 116 - src/obfuscation-relay.h | 51 - src/obfuscation.cpp | 49 +- src/obfuscation.h | 34 +- src/primitives/block.cpp | 11 +- src/primitives/block.h | 11 +- src/primitives/transaction.cpp | 118 +- src/primitives/transaction.h | 36 +- src/protocol.cpp | 12 +- src/protocol.h | 17 +- src/pubkey.h | 7 +- src/qt/CMakeLists.txt | 36 +- src/qt/addressbookpage.cpp | 7 +- src/qt/addresstablemodel.cpp | 51 +- src/qt/addresstablemodel.h | 3 +- src/qt/askpassphrasedialog.cpp | 49 +- src/qt/askpassphrasedialog.h | 9 +- src/qt/bip38tooldialog.cpp | 276 - src/qt/bip38tooldialog.h | 53 - src/qt/bitcoinaddressvalidator.cpp | 3 +- src/qt/bitcoinamountfield.cpp | 5 +- src/qt/bitcoingui.cpp | 155 +- src/qt/bitcoingui.h | 20 +- src/qt/bitcoinunits.cpp | 85 +- src/qt/bitcoinunits.h | 7 +- src/qt/blockexplorer.cpp | 7 +- src/qt/clientmodel.h | 3 +- src/qt/coincontroldialog.cpp | 24 +- src/qt/editaddressdialog.cpp | 3 +- src/qt/forms/askpassphrasedialog.ui | 4 +- src/qt/forms/bip38tooldialog.ui | 483 -- src/qt/forms/coincontroldialog.ui | 8 +- src/qt/forms/governancepage.ui | 340 - src/qt/forms/hdseeddialog.ui | 85 + src/qt/forms/helpmessagedialog.ui | 2 +- src/qt/forms/intro.ui | 6 +- src/qt/forms/multisenddialog.ui | 4 +- src/qt/forms/multisigdialog.ui | 2 +- src/qt/forms/obfuscationconfig.ui | 188 - src/qt/forms/optionsdialog.ui | 337 +- src/qt/forms/overviewpage.ui | 609 +- src/qt/forms/privacydialog.ui | 2560 ------- src/qt/forms/receivecoinsdialog.ui | 4 +- src/qt/forms/rpcconsole.ui | 31 +- src/qt/forms/sendcoinsdialog.ui | 49 +- src/qt/forms/sendcoinsentry.ui | 4 +- src/qt/forms/signverifymessagedialog.ui | 8 +- src/qt/forms/zpivcontroldialog.ui | 240 - src/qt/governancepage.cpp | 148 - src/qt/governancepage.h | 70 - src/qt/guiconstants.h | 9 +- src/qt/guiutil.cpp | 20 +- src/qt/guiutil.h | 7 +- src/qt/hdseeddialog.cpp | 56 + src/qt/hdseeddialog.h | 33 + src/qt/intro.cpp | 28 +- src/qt/locale/{pivx_bg.ts => nbx_bg.ts} | 1624 +--- src/qt/locale/{pivx_ca.ts => nbx_ca.ts} | 277 +- src/qt/locale/{pivx_cs.ts => nbx_cs.ts} | 393 +- src/qt/locale/{pivx_da.ts => nbx_da.ts} | 1665 +--- src/qt/locale/{pivx_de.ts => nbx_de.ts} | 1648 +--- src/qt/locale/{pivx_en.ts => nbx_en.ts} | 2199 +----- src/qt/locale/{pivx_en_GB.ts => nbx_en_GB.ts} | 1671 ++-- src/qt/locale/{pivx_en_US.ts => nbx_en_US.ts} | 688 +- src/qt/locale/{pivx_eo.ts => nbx_eo.ts} | 537 +- src/qt/locale/{pivx_es.ts => nbx_es.ts} | 1658 +--- src/qt/locale/{pivx_es_ES.ts => nbx_es_ES.ts} | 189 +- src/qt/locale/{pivx_fi.ts => nbx_fi.ts} | 453 +- src/qt/locale/{pivx_fr_FR.ts => nbx_fr_FR.ts} | 1829 +---- src/qt/locale/{pivx_hi_IN.ts => nbx_hi_IN.ts} | 31 +- src/qt/locale/{pivx_hr.ts => nbx_hr.ts} | 329 +- src/qt/locale/{pivx_hr_HR.ts => nbx_hr_HR.ts} | 1641 +--- src/qt/locale/{pivx_it.ts => nbx_it.ts} | 721 +- src/qt/locale/{pivx_ja.ts => nbx_ja.ts} | 29 +- src/qt/locale/{pivx_ko_KR.ts => nbx_ko_KR.ts} | 1632 +--- src/qt/locale/{pivx_lt_LT.ts => nbx_lt_LT.ts} | 945 +-- src/qt/locale/{pivx_nl.ts => nbx_nl.ts} | 1778 +---- src/qt/locale/{pivx_pl.ts => nbx_pl.ts} | 2312 +----- src/qt/locale/{pivx_pt.ts => nbx_pt.ts} | 229 +- src/qt/locale/{pivx_pt_BR.ts => nbx_pt_BR.ts} | 817 +- src/qt/locale/{pivx_ro_RO.ts => nbx_ro_RO.ts} | 17 +- src/qt/locale/{pivx_ru.ts => nbx_ru.ts} | 1672 +--- src/qt/locale/{pivx_sk.ts => nbx_sk.ts} | 289 +- src/qt/locale/{pivx_sv.ts => nbx_sv.ts} | 1803 +---- src/qt/locale/{pivx_tr.ts => nbx_tr.ts} | 1059 +-- src/qt/locale/{pivx_uk.ts => nbx_uk.ts} | 33 +- src/qt/locale/{pivx_vi.ts => nbx_vi.ts} | 25 +- src/qt/locale/{pivx_zh_CN.ts => nbx_zh_CN.ts} | 333 +- src/qt/locale/{pivx_zh_TW.ts => nbx_zh_TW.ts} | 265 +- src/qt/masternodelist.cpp | 7 +- src/qt/multisenddialog.h | 6 +- src/qt/multisigdialog.cpp | 13 +- src/qt/{pivx.qrc => nbx.qrc} | 30 +- src/qt/nbx_locale.qrc | 37 + src/qt/nbxstrings.cpp | 489 ++ src/qt/{pivx.cpp => netboxwallet.cpp} | 79 +- src/qt/networkstyle.cpp | 5 +- src/qt/notificator.h | 2 +- src/qt/openuridialog.cpp | 5 +- src/qt/optionsdialog.cpp | 28 +- src/qt/optionsmodel.cpp | 61 +- src/qt/optionsmodel.h | 11 +- src/qt/overviewpage.cpp | 216 +- src/qt/overviewpage.h | 13 +- src/qt/paymentserver.cpp | 23 +- src/qt/paymentserver.h | 3 +- src/qt/pivx_locale.qrc | 37 - src/qt/pivxstrings.cpp | 505 -- src/qt/privacydialog.cpp | 828 -- src/qt/privacydialog.h | 113 - src/qt/proposalframe.cpp | 316 - src/qt/proposalframe.h | 54 - src/qt/receiverequestdialog.cpp | 3 +- src/qt/recentrequeststablemodel.h | 3 +- src/qt/res/app.manifest | 1 + src/qt/res/css/default.css | 410 +- src/qt/res/icons/abstainvote.png | Bin 413 -> 0 bytes src/qt/res/icons/automint_active.png | Bin 841 -> 0 bytes src/qt/res/icons/automint_inactive.png | Bin 421 -> 0 bytes src/qt/res/icons/bitcoin.icns | Bin 287192 -> 0 bytes src/qt/res/icons/bitcoin.ico | Bin 53158 -> 0 bytes src/qt/res/icons/bitcoin.png | Bin 14562 -> 0 bytes src/qt/res/icons/bitcoin_regtest.png | Bin 16356 -> 0 bytes src/qt/res/icons/bitcoin_testnet.ico | Bin 53158 -> 0 bytes src/qt/res/icons/bitcoin_testnet.png | Bin 14590 -> 0 bytes src/qt/res/icons/governance.png | Bin 1196 -> 0 bytes src/qt/res/icons/governance_dark.png | Bin 1202 -> 0 bytes src/qt/res/icons/nbx.icns | Bin 0 -> 223411 bytes src/qt/res/icons/nbx.ico | Bin 0 -> 53158 bytes src/qt/res/icons/nbx.png | Bin 0 -> 18960 bytes src/qt/res/icons/nbx_regtest.png | Bin 0 -> 16079 bytes src/qt/res/icons/nbx_testnet.ico | Bin 0 -> 53158 bytes src/qt/res/icons/nbx_testnet.png | Bin 0 -> 16079 bytes src/qt/res/icons/novote.png | Bin 529 -> 0 bytes src/qt/res/icons/overview.png | Bin 6733 -> 12016 bytes src/qt/res/icons/privacy.png | Bin 19041 -> 0 bytes src/qt/res/icons/receive.png | Bin 4731 -> 21946 bytes src/qt/res/icons/receive_dark.png | Bin 1774 -> 0 bytes src/qt/res/icons/send.png | Bin 4743 -> 21967 bytes src/qt/res/icons/send_dark.png | Bin 1808 -> 0 bytes src/qt/res/icons/tx_mined.png | Bin 1231 -> 3259 bytes src/qt/res/icons/unit_mnbx.png | Bin 0 -> 426 bytes src/qt/res/icons/unit_mpivx.png | Bin 333 -> 0 bytes src/qt/res/icons/unit_nbx.png | Bin 0 -> 369 bytes src/qt/res/icons/unit_pivx.png | Bin 275 -> 0 bytes src/qt/res/icons/unit_tmnbx.png | Bin 0 -> 416 bytes src/qt/res/icons/unit_tmpivx.png | Bin 359 -> 0 bytes src/qt/res/icons/unit_tnbx.png | Bin 0 -> 387 bytes src/qt/res/icons/unit_tpivx.png | Bin 338 -> 0 bytes src/qt/res/icons/unit_tunbx.png | Bin 0 -> 422 bytes src/qt/res/icons/unit_tupivx.png | Bin 364 -> 0 bytes src/qt/res/icons/unit_unbx.png | Bin 0 -> 415 bytes src/qt/res/icons/unit_upivx.png | Bin 250 -> 0 bytes src/qt/res/icons/yesvote.png | Bin 623 -> 0 bytes src/qt/res/images/about.png | Bin 11807 -> 17016 bytes src/qt/res/images/logo_horizontal.png | Bin 0 -> 14756 bytes src/qt/res/images/pivx_logo_horizontal.png | Bin 8545 -> 0 bytes src/qt/res/images/splash.png | Bin 33910 -> 175248 bytes src/qt/res/images/splash_regtest.png | Bin 30754 -> 60489 bytes src/qt/res/images/splash_testnet.png | Bin 16937 -> 60489 bytes src/qt/res/{pivx-qt-res.rc => nbx-qt-res.rc} | 16 +- src/qt/rpcconsole.cpp | 12 +- src/qt/rpcconsole.h | 3 +- src/qt/sendcoinsdialog.cpp | 46 +- src/qt/sendcoinsdialog.h | 5 +- src/qt/sendcoinsentry.cpp | 5 +- src/qt/splashscreen.cpp | 13 +- src/qt/test/test_main.cpp | 4 +- src/qt/test/uritests.cpp | 22 +- src/qt/transactiondesc.cpp | 24 +- src/qt/transactionfilterproxy.cpp | 16 +- src/qt/transactionfilterproxy.h | 9 +- src/qt/transactionrecord.cpp | 203 +- src/qt/transactionrecord.h | 18 +- src/qt/transactiontablemodel.cpp | 78 +- src/qt/transactiontablemodel.h | 15 +- src/qt/transactionview.cpp | 51 +- src/qt/transactionview.h | 5 +- src/qt/utilitydialog.cpp | 11 +- src/qt/walletframe.cpp | 22 +- src/qt/walletframe.h | 9 +- src/qt/walletmodel.cpp | 174 +- src/qt/walletmodel.h | 46 +- src/qt/walletview.cpp | 45 +- src/qt/walletview.h | 15 +- src/qt/zpivcontroldialog.cpp | 234 - src/qt/zpivcontroldialog.h | 68 - src/rpc/blockchain.cpp | 532 +- src/rpc/budget.cpp | 952 --- src/rpc/client.cpp | 59 +- src/rpc/masternode.cpp | 10 +- src/rpc/mining.cpp | 16 +- src/rpc/misc.cpp | 61 +- src/rpc/net.cpp | 11 +- src/rpc/protocol.h | 3 +- src/rpc/rawtransaction.cpp | 235 +- src/rpc/server.cpp | 107 +- src/rpc/server.h | 61 +- src/script/bitcoinconsensus.h | 3 +- src/script/descriptor.cpp | 904 +++ src/script/descriptor.h | 92 + src/script/script.cpp | 30 +- src/script/script.h | 10 +- src/script/sign.cpp | 78 +- src/script/sign.h | 67 +- src/script/standard.cpp | 19 +- src/script/standard.h | 14 +- src/secure_string.cpp | 28 + src/secure_string.h | 21 + src/serialize.h | 71 +- src/span.h | 60 + src/spork.cpp | 74 +- src/spork.h | 44 +- src/sporkdb.h | 7 +- src/stakeinput.cpp | 183 +- src/stakeinput.h | 51 +- src/swifttx.cpp | 10 +- src/test/Checkpoints_tests.cpp | 2 +- src/test/DoS_tests.cpp | 2 +- src/test/README.md | 24 +- src/test/accounting_tests.cpp | 2 +- src/test/addrman_tests.cpp | 3 +- src/test/allocator_tests.cpp | 3 +- src/test/arith_uint256_tests.cpp | 3 +- src/test/base32_tests.cpp | 2 +- src/test/base58_tests.cpp | 2 +- src/test/base64_tests.cpp | 2 +- src/test/benchmark_zerocoin.cpp | 416 - src/test/bloom_tests.cpp | 2 +- src/test/budget_tests.cpp | 33 - src/test/checkblock_tests.cpp | 2 +- src/test/coins_tests.cpp | 2 +- src/test/compress_tests.cpp | 2 +- src/test/crypto_tests.cpp | 3 +- src/test/getarg_tests.cpp | 2 +- src/test/hash_tests.cpp | 2 +- src/test/key_tests.cpp | 2 +- src/test/libzerocoin_tests.cpp | 495 -- src/test/main_tests.cpp | 4 +- src/test/mruset_tests.cpp | 2 +- src/test/multisig_tests.cpp | 2 +- src/test/netbase_tests.cpp | 20 +- src/test/pmt_tests.cpp | 2 +- src/test/rpc_tests.cpp | 2 +- src/test/rpc_wallet_tests.cpp | 2 +- src/test/sanity_tests.cpp | 2 +- src/test/scheduler_tests.cpp | 2 +- src/test/script_P2SH_tests.cpp | 2 +- src/test/script_tests.cpp | 2 +- src/test/scriptnum_tests.cpp | 200 - src/test/serialize_tests.cpp | 2 +- src/test/sighash_tests.cpp | 4 +- src/test/sigopcount_tests.cpp | 2 +- src/test/skiplist_tests.cpp | 2 +- src/test/{test_pivx.cpp => test_nbx.cpp} | 5 +- src/test/{test_pivx.h => test_nbx.h} | 4 +- src/test/test_zerocoin.cpp | 28 - src/test/timedata_tests.cpp | 2 +- src/test/transaction_tests.cpp | 12 +- src/test/tutorial_zerocoin.cpp | 284 - src/test/uint256_tests.cpp | 2 +- src/test/univalue_tests.cpp | 2 +- src/test/util_tests.cpp | 2 +- src/test/zerocoin_bignum_tests.cpp | 91 - src/test/zerocoin_chain_tests.cpp | 7 - src/test/zerocoin_coinspend_tests.cpp | 93 - src/test/zerocoin_denomination_tests.cpp | 522 -- src/test/zerocoin_implementation_tests.cpp | 511 -- src/test/zerocoin_transactions_tests.cpp | 120 - src/timedata.cpp | 3 +- src/txdb.cpp | 174 +- src/txdb.h | 32 +- src/txmempool.cpp | 30 +- src/txmempool.h | 14 +- src/uint256.h | 15 +- src/uint512.h | 45 - src/util.cpp | 63 +- src/util.h | 14 +- src/util/bip32.cpp | 67 + src/util/bip32.h | 20 + src/util/memory.h | 20 + src/utilstrencodings.cpp | 34 + src/utilstrencodings.h | 17 +- src/utiltime.cpp | 3 +- src/version.h | 10 +- src/wallet/db.cpp | 3 +- src/wallet/db.h | 3 +- src/wallet/rpcdump.cpp | 422 +- src/wallet/rpcwallet.cpp | 1749 +---- src/wallet/test/wallet_tests.cpp | 2 +- src/wallet/wallet.cpp | 2726 ++----- src/wallet/wallet.h | 263 +- src/wallet/wallet_ismine.cpp | 8 +- src/wallet/wallet_ismine.h | 3 +- src/wallet/walletdb.cpp | 693 +- src/wallet/walletdb.h | 111 +- src/zmq/zmqconfig.h | 2 +- src/zpiv/accumulatorcheckpoints.cpp | 85 - src/zpiv/accumulatorcheckpoints.h | 21 - src/zpiv/accumulatorcheckpoints.json.h | 478 -- src/zpiv/accumulatormap.cpp | 105 - src/zpiv/accumulatormap.h | 29 - src/zpiv/accumulators.cpp | 931 --- src/zpiv/accumulators.h | 94 - src/zpiv/deterministicmint.cpp | 45 - src/zpiv/deterministicmint.h | 67 - src/zpiv/mintpool.cpp | 109 - src/zpiv/mintpool.h | 53 - src/zpiv/witness.cpp | 110 - src/zpiv/witness.h | 82 - src/zpiv/zerocoin.cpp | 116 - src/zpiv/zerocoin.h | 266 - src/zpiv/zpivmodule.cpp | 129 - src/zpiv/zpivmodule.h | 92 - src/zpiv/zpivtracker.cpp | 536 -- src/zpiv/zpivtracker.h | 58 - src/zpiv/zpivwallet.cpp | 487 -- src/zpiv/zpivwallet.h | 49 - src/zpivchain.cpp | 406 - src/zpivchain.h | 42 - test/README.md | 44 +- test/functional/README.md | 16 +- test/functional/fake_stake/base_test.py | 10 +- test/functional/fake_stake/util.py | 2 +- test/functional/feature_proxy.py | 8 +- test/functional/interface_bitcoin_cli.py | 8 +- test/functional/interface_http.py | 2 +- test/functional/p2p_zpos_fakestake.py | 106 - .../functional/p2p_zpos_fakestake_accepted.py | 117 - test/functional/rpc_bip38.py | 27 - test/functional/rpc_fundrawtransaction.py | 4 +- test/functional/rpc_rawtransaction.py | 2 +- test/functional/rpc_users.py | 4 +- test/functional/test_framework/authproxy.py | 2 +- test/functional/test_framework/blocktools.py | 2 +- test/functional/test_framework/comptool.py | 2 +- test/functional/test_framework/coverage.py | 2 +- test/functional/test_framework/messages.py | 8 +- .../test_framework/test_framework.py | 42 +- test/functional/test_framework/test_node.py | 26 +- test/functional/test_framework/util.py | 8 +- test/functional/test_runner.py | 22 +- test/functional/wallet_txn_doublespend.py | 2 +- test/functional/zerocoin_publicSpend_reorg.py | 208 - .../functional/zerocoin_valid_public_spend.py | 102 - test/functional/zerocoin_wrapped_serials.py | 108 - 641 files changed, 15315 insertions(+), 80680 deletions(-) create mode 100644 .dockerignore delete mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 Dockerfile create mode 100644 Dockerfile_dev create mode 100644 Dockerfile_osx create mode 100644 Dockerfile_qt create mode 100644 Dockerfile_static create mode 100644 Dockerfile_windows create mode 100644 Dockerfile_windows_x64 create mode 100755 Makefile_docker delete mode 100644 build-aux/m4/gmp.m4 rename contrib/debian/examples/{pivx.conf => nbx.conf} (83%) create mode 100644 contrib/debian/nbxd.bash-completion create mode 100644 contrib/debian/nbxd.examples create mode 100644 contrib/debian/nbxd.install rename contrib/debian/{pivxd.lintian-overrides => nbxd.lintian-overrides} (55%) create mode 100644 contrib/debian/nbxd.manpages rename contrib/debian/{pivxd.postinst => nbxd.postinst} (73%) rename contrib/debian/{pivxd.postrm => nbxd.postrm} (77%) rename contrib/debian/{pivxd.service => nbxd.service} (77%) create mode 100644 contrib/debian/netboxwallet.desktop create mode 100644 contrib/debian/netboxwallet.install rename contrib/debian/{pivx-qt.lintian-overrides => netboxwallet.lintian-overrides} (52%) create mode 100644 contrib/debian/netboxwallet.manpages rename contrib/debian/{pivx-qt.protocol => netboxwallet.protocol} (75%) delete mode 100644 contrib/debian/pivx-qt.desktop delete mode 100644 contrib/debian/pivx-qt.install delete mode 100644 contrib/debian/pivx-qt.manpages delete mode 100644 contrib/debian/pivxd.bash-completion delete mode 100644 contrib/debian/pivxd.examples delete mode 100644 contrib/debian/pivxd.install delete mode 100644 contrib/debian/pivxd.manpages rename contrib/init/{pivxd.conf => nbxd.conf} (81%) rename contrib/init/{pivxd.init => nbxd.init} (64%) rename contrib/init/{pivxd.openrc => nbxd.openrc} (81%) rename contrib/init/{pivxd.openrcconf => nbxd.openrcconf} (55%) rename contrib/init/{pivxd.service => nbxd.service} (80%) rename contrib/{pivx-cli.bash-completion => nbx-cli.bash-completion} (86%) rename contrib/{pivx-qt.pro => nbx-qt.pro} (94%) rename contrib/{pivx-tx.bash-completion => nbx-tx.bash-completion} (100%) rename contrib/{pivxd.bash-completion => nbxd.bash-completion} (81%) create mode 100644 contrib/rpm/nbx.fc rename contrib/rpm/{pivx.if => nbx.if} (100%) rename contrib/rpm/{pivx.spec => nbx.spec} (63%) rename contrib/rpm/{pivx.te => nbx.te} (100%) delete mode 100644 contrib/rpm/pivx.fc delete mode 100644 doc/README.md delete mode 100644 doc/README_windows.txt delete mode 100644 doc/REST-interface.md delete mode 100644 doc/assets-attribution.md delete mode 100644 doc/bitcoin_logo_doxygen.png delete mode 100644 doc/build-osx.md delete mode 100644 doc/build-unix.md delete mode 100644 doc/build-windows.md delete mode 100644 doc/dependencies.md delete mode 100644 doc/developer-notes.md delete mode 100644 doc/dnsseed-policy.md delete mode 100644 doc/files.md delete mode 100644 doc/gitian-building.md delete mode 100644 doc/gitian-building/create_vm_file_location_size.png delete mode 100644 doc/gitian-building/create_vm_hard_drive.png delete mode 100644 doc/gitian-building/create_vm_hard_drive_file_type.png delete mode 100644 doc/gitian-building/create_vm_memsize.png delete mode 100644 doc/gitian-building/create_vm_page1.png delete mode 100644 doc/gitian-building/create_vm_storage_physical_hard_drive.png delete mode 100644 doc/gitian-building/debian_install_10_configure_clock.png delete mode 100644 doc/gitian-building/debian_install_11_partition_disks.png delete mode 100644 doc/gitian-building/debian_install_12_choose_disk.png delete mode 100644 doc/gitian-building/debian_install_13_partition_scheme.png delete mode 100644 doc/gitian-building/debian_install_14_finish.png delete mode 100644 doc/gitian-building/debian_install_15_write_changes.png delete mode 100644 doc/gitian-building/debian_install_16_choose_a_mirror.png delete mode 100644 doc/gitian-building/debian_install_17_choose_a_mirror2.png delete mode 100644 doc/gitian-building/debian_install_18_proxy_settings.png delete mode 100644 doc/gitian-building/debian_install_19_software_selection.png delete mode 100644 doc/gitian-building/debian_install_1_boot_menu.png delete mode 100644 doc/gitian-building/debian_install_20_install_grub.png delete mode 100644 doc/gitian-building/debian_install_21_finish_installation.png delete mode 100644 doc/gitian-building/debian_install_2_select_a_language.png delete mode 100644 doc/gitian-building/debian_install_3_select_location.png delete mode 100644 doc/gitian-building/debian_install_4_configure_keyboard.png delete mode 100644 doc/gitian-building/debian_install_5_configure_the_network.png delete mode 100644 doc/gitian-building/debian_install_6_domain_name.png delete mode 100644 doc/gitian-building/debian_install_6a_set_up_root_password.png delete mode 100644 doc/gitian-building/debian_install_7_set_up_user_fullname.png delete mode 100644 doc/gitian-building/debian_install_8_set_up_username.png delete mode 100644 doc/gitian-building/debian_install_9_user_password.png delete mode 100644 doc/gitian-building/network_settings.png delete mode 100644 doc/gitian-building/port_forwarding_rules.png delete mode 100644 doc/gitian-building/select_startup_disk.png delete mode 100644 doc/img/bootstrap1.png delete mode 100644 doc/img/bootstrap2.png delete mode 100644 doc/img/bootstrap4.png delete mode 100644 doc/img/bootstrap5.png delete mode 100644 doc/init.md rename doc/man/{pivx-cli.1 => nbx-cli.1} (87%) rename doc/man/{pivx-tx.1 => nbx-tx.1} (100%) rename doc/man/{pivxd.1 => nbxd.1} (86%) rename doc/man/{pivx-qt.1 => netboxwallet.1} (86%) delete mode 100644 doc/release-notes.md delete mode 100644 doc/release-notes/release-notes-2.1.5.md delete mode 100644 doc/release-notes/release-notes-2.1.6.md delete mode 100644 doc/release-notes/release-notes-2.1.7.md delete mode 100644 doc/release-notes/release-notes-2.2.0.md delete mode 100644 doc/release-notes/release-notes-2.2.1.md delete mode 100644 doc/release-notes/release-notes-2.3.0.md delete mode 100644 doc/release-notes/release-notes-2.3.1.md delete mode 100644 doc/release-notes/release-notes-3.0.0.md delete mode 100644 doc/release-notes/release-notes-3.0.2.md delete mode 100644 doc/release-notes/release-notes-3.0.4.md delete mode 100644 doc/release-notes/release-notes-3.0.5.1.md delete mode 100644 doc/release-notes/release-notes-3.0.5.md delete mode 100644 doc/release-notes/release-notes-3.0.6.md delete mode 100644 doc/release-notes/release-notes-3.1.0.1.md delete mode 100644 doc/release-notes/release-notes-3.1.0.2.md delete mode 100644 doc/release-notes/release-notes-3.1.0.md delete mode 100644 doc/release-notes/release-notes-3.1.1.md delete mode 100644 doc/release-notes/release-notes-3.2.0.md delete mode 100644 doc/release-process.md delete mode 100644 doc/tor.md delete mode 100644 doc/translation_process.md delete mode 100644 doc/translation_strings_policy.md delete mode 100644 doc/travis-ci.txt delete mode 100644 doc/zmq.md delete mode 100755 share/pixmaps/pivx-bc.ico delete mode 100755 share/pixmaps/pivx.ico delete mode 100644 share/pixmaps/pivx128.png delete mode 100755 share/pixmaps/pivx128.xpm delete mode 100644 share/pixmaps/pivx16.png delete mode 100755 share/pixmaps/pivx16.xpm delete mode 100644 share/pixmaps/pivx256.png delete mode 100755 share/pixmaps/pivx256.xpm delete mode 100644 share/pixmaps/pivx32.png delete mode 100755 share/pixmaps/pivx32.xpm delete mode 100644 share/pixmaps/pivx64.png delete mode 100755 share/pixmaps/pivx64.xpm create mode 100644 src/attributes.h delete mode 100644 src/bip38.cpp delete mode 100644 src/bip38.h delete mode 100644 src/denomination_functions.cpp delete mode 100644 src/denomination_functions.h delete mode 100644 src/genwit.cpp delete mode 100644 src/genwit.h delete mode 100644 src/invalid.cpp delete mode 100644 src/invalid.h delete mode 100644 src/invalid_outpoints.json.h delete mode 100644 src/invalid_serials.json.h delete mode 100644 src/libzerocoin/Accumulator.cpp delete mode 100644 src/libzerocoin/Accumulator.h delete mode 100644 src/libzerocoin/AccumulatorProofOfKnowledge.cpp delete mode 100644 src/libzerocoin/AccumulatorProofOfKnowledge.h delete mode 100644 src/libzerocoin/Coin.cpp delete mode 100644 src/libzerocoin/Coin.h delete mode 100644 src/libzerocoin/CoinSpend.cpp delete mode 100644 src/libzerocoin/CoinSpend.h delete mode 100644 src/libzerocoin/Commitment.cpp delete mode 100644 src/libzerocoin/Commitment.h delete mode 100644 src/libzerocoin/Denominations.cpp delete mode 100644 src/libzerocoin/Denominations.h delete mode 100644 src/libzerocoin/LICENSE delete mode 100644 src/libzerocoin/ParamGeneration.cpp delete mode 100644 src/libzerocoin/ParamGeneration.h delete mode 100644 src/libzerocoin/Params.cpp delete mode 100644 src/libzerocoin/Params.h delete mode 100644 src/libzerocoin/SerialNumberSignatureOfKnowledge.cpp delete mode 100644 src/libzerocoin/SerialNumberSignatureOfKnowledge.h delete mode 100644 src/libzerocoin/SpendType.h delete mode 100644 src/libzerocoin/ZerocoinDefines.h delete mode 100644 src/libzerocoin/bignum.cpp delete mode 100755 src/libzerocoin/bignum.h delete mode 100644 src/libzerocoin/bignum_gmp.cpp delete mode 100644 src/libzerocoin/bignum_openssl.cpp delete mode 100644 src/libzerocoin/documentation/Doxyfile delete mode 100644 src/libzerocoin/documentation/manual/intro.tex delete mode 100644 src/libzerocoin/documentation/manual/manual.pdf delete mode 100644 src/libzerocoin/documentation/manual/manual.tex delete mode 100644 src/libzerocoin/documentation/manual/using.tex delete mode 100644 src/libzerocoin/paramgen.cpp delete mode 100644 src/libzerocoin/zerocoin.pc.in delete mode 100644 src/lightzpivthread.cpp delete mode 100644 src/lightzpivthread.h delete mode 100644 src/masternode-budget.cpp delete mode 100644 src/masternode-budget.h create mode 100644 src/mnemonic.cpp create mode 100644 src/mnemonic.h create mode 100644 src/mnemonic_en.cpp rename src/{pivx-cli-res.rc => nbx-cli-res.rc} (82%) rename src/{pivx-cli.cpp => nbx-cli.cpp} (94%) rename src/{pivxd-res.rc => nbx-tx-res.rc} (82%) rename src/{pivx-tx.cpp => nbx-tx.cpp} (99%) rename src/{pivx-tx-res.rc => nbxd-res.rc} (75%) rename src/{pivxd.cpp => nbxd.cpp} (89%) delete mode 100644 src/obfuscation-relay.cpp delete mode 100644 src/obfuscation-relay.h delete mode 100644 src/qt/bip38tooldialog.cpp delete mode 100644 src/qt/bip38tooldialog.h delete mode 100644 src/qt/forms/bip38tooldialog.ui delete mode 100644 src/qt/forms/governancepage.ui create mode 100644 src/qt/forms/hdseeddialog.ui delete mode 100644 src/qt/forms/obfuscationconfig.ui delete mode 100644 src/qt/forms/privacydialog.ui delete mode 100644 src/qt/forms/zpivcontroldialog.ui delete mode 100644 src/qt/governancepage.cpp delete mode 100644 src/qt/governancepage.h create mode 100644 src/qt/hdseeddialog.cpp create mode 100644 src/qt/hdseeddialog.h rename src/qt/locale/{pivx_bg.ts => nbx_bg.ts} (77%) rename src/qt/locale/{pivx_ca.ts => nbx_ca.ts} (88%) rename src/qt/locale/{pivx_cs.ts => nbx_cs.ts} (83%) rename src/qt/locale/{pivx_da.ts => nbx_da.ts} (77%) rename src/qt/locale/{pivx_de.ts => nbx_de.ts} (77%) rename src/qt/locale/{pivx_en.ts => nbx_en.ts} (78%) rename src/qt/locale/{pivx_en_GB.ts => nbx_en_GB.ts} (78%) rename src/qt/locale/{pivx_en_US.ts => nbx_en_US.ts} (85%) rename src/qt/locale/{pivx_eo.ts => nbx_eo.ts} (78%) rename src/qt/locale/{pivx_es.ts => nbx_es.ts} (77%) rename src/qt/locale/{pivx_es_ES.ts => nbx_es_ES.ts} (67%) rename src/qt/locale/{pivx_fi.ts => nbx_fi.ts} (84%) rename src/qt/locale/{pivx_fr_FR.ts => nbx_fr_FR.ts} (75%) rename src/qt/locale/{pivx_hi_IN.ts => nbx_hi_IN.ts} (90%) rename src/qt/locale/{pivx_hr.ts => nbx_hr.ts} (79%) rename src/qt/locale/{pivx_hr_HR.ts => nbx_hr_HR.ts} (77%) rename src/qt/locale/{pivx_it.ts => nbx_it.ts} (70%) rename src/qt/locale/{pivx_ja.ts => nbx_ja.ts} (90%) rename src/qt/locale/{pivx_ko_KR.ts => nbx_ko_KR.ts} (77%) rename src/qt/locale/{pivx_lt_LT.ts => nbx_lt_LT.ts} (74%) rename src/qt/locale/{pivx_nl.ts => nbx_nl.ts} (76%) rename src/qt/locale/{pivx_pl.ts => nbx_pl.ts} (65%) rename src/qt/locale/{pivx_pt.ts => nbx_pt.ts} (88%) rename src/qt/locale/{pivx_pt_BR.ts => nbx_pt_BR.ts} (85%) rename src/qt/locale/{pivx_ro_RO.ts => nbx_ro_RO.ts} (93%) rename src/qt/locale/{pivx_ru.ts => nbx_ru.ts} (77%) rename src/qt/locale/{pivx_sk.ts => nbx_sk.ts} (75%) rename src/qt/locale/{pivx_sv.ts => nbx_sv.ts} (75%) rename src/qt/locale/{pivx_tr.ts => nbx_tr.ts} (76%) rename src/qt/locale/{pivx_uk.ts => nbx_uk.ts} (84%) rename src/qt/locale/{pivx_vi.ts => nbx_vi.ts} (83%) rename src/qt/locale/{pivx_zh_CN.ts => nbx_zh_CN.ts} (78%) rename src/qt/locale/{pivx_zh_TW.ts => nbx_zh_TW.ts} (71%) rename src/qt/{pivx.qrc => nbx.qrc} (82%) create mode 100644 src/qt/nbx_locale.qrc create mode 100644 src/qt/nbxstrings.cpp rename src/qt/{pivx.cpp => netboxwallet.cpp} (90%) delete mode 100644 src/qt/pivx_locale.qrc delete mode 100644 src/qt/pivxstrings.cpp delete mode 100644 src/qt/privacydialog.cpp delete mode 100644 src/qt/privacydialog.h delete mode 100644 src/qt/proposalframe.cpp delete mode 100644 src/qt/proposalframe.h create mode 100644 src/qt/res/app.manifest delete mode 100644 src/qt/res/icons/abstainvote.png delete mode 100644 src/qt/res/icons/automint_active.png delete mode 100644 src/qt/res/icons/automint_inactive.png delete mode 100755 src/qt/res/icons/bitcoin.icns delete mode 100755 src/qt/res/icons/bitcoin.ico delete mode 100644 src/qt/res/icons/bitcoin.png delete mode 100644 src/qt/res/icons/bitcoin_regtest.png delete mode 100755 src/qt/res/icons/bitcoin_testnet.ico delete mode 100644 src/qt/res/icons/bitcoin_testnet.png delete mode 100644 src/qt/res/icons/governance.png delete mode 100644 src/qt/res/icons/governance_dark.png create mode 100644 src/qt/res/icons/nbx.icns create mode 100644 src/qt/res/icons/nbx.ico create mode 100644 src/qt/res/icons/nbx.png create mode 100644 src/qt/res/icons/nbx_regtest.png create mode 100644 src/qt/res/icons/nbx_testnet.ico create mode 100644 src/qt/res/icons/nbx_testnet.png delete mode 100644 src/qt/res/icons/novote.png delete mode 100644 src/qt/res/icons/privacy.png delete mode 100644 src/qt/res/icons/receive_dark.png delete mode 100644 src/qt/res/icons/send_dark.png create mode 100644 src/qt/res/icons/unit_mnbx.png delete mode 100644 src/qt/res/icons/unit_mpivx.png create mode 100644 src/qt/res/icons/unit_nbx.png delete mode 100644 src/qt/res/icons/unit_pivx.png create mode 100644 src/qt/res/icons/unit_tmnbx.png delete mode 100644 src/qt/res/icons/unit_tmpivx.png create mode 100644 src/qt/res/icons/unit_tnbx.png delete mode 100644 src/qt/res/icons/unit_tpivx.png create mode 100644 src/qt/res/icons/unit_tunbx.png delete mode 100644 src/qt/res/icons/unit_tupivx.png create mode 100644 src/qt/res/icons/unit_unbx.png delete mode 100644 src/qt/res/icons/unit_upivx.png delete mode 100644 src/qt/res/icons/yesvote.png create mode 100644 src/qt/res/images/logo_horizontal.png delete mode 100644 src/qt/res/images/pivx_logo_horizontal.png rename src/qt/res/{pivx-qt-res.rc => nbx-qt-res.rc} (74%) delete mode 100644 src/qt/zpivcontroldialog.cpp delete mode 100644 src/qt/zpivcontroldialog.h delete mode 100644 src/rpc/budget.cpp create mode 100644 src/script/descriptor.cpp create mode 100644 src/script/descriptor.h create mode 100644 src/secure_string.cpp create mode 100644 src/secure_string.h create mode 100644 src/span.h delete mode 100644 src/test/benchmark_zerocoin.cpp delete mode 100644 src/test/budget_tests.cpp delete mode 100644 src/test/libzerocoin_tests.cpp delete mode 100644 src/test/scriptnum_tests.cpp rename src/test/{test_pivx.cpp => test_nbx.cpp} (93%) rename src/test/{test_pivx.h => test_nbx.h} (93%) delete mode 100644 src/test/test_zerocoin.cpp delete mode 100644 src/test/tutorial_zerocoin.cpp delete mode 100644 src/test/zerocoin_bignum_tests.cpp delete mode 100644 src/test/zerocoin_chain_tests.cpp delete mode 100644 src/test/zerocoin_coinspend_tests.cpp delete mode 100644 src/test/zerocoin_denomination_tests.cpp delete mode 100644 src/test/zerocoin_implementation_tests.cpp delete mode 100644 src/test/zerocoin_transactions_tests.cpp delete mode 100644 src/uint512.h create mode 100644 src/util/bip32.cpp create mode 100644 src/util/bip32.h create mode 100644 src/util/memory.h delete mode 100644 src/zpiv/accumulatorcheckpoints.cpp delete mode 100644 src/zpiv/accumulatorcheckpoints.h delete mode 100644 src/zpiv/accumulatorcheckpoints.json.h delete mode 100644 src/zpiv/accumulatormap.cpp delete mode 100644 src/zpiv/accumulatormap.h delete mode 100644 src/zpiv/accumulators.cpp delete mode 100644 src/zpiv/accumulators.h delete mode 100644 src/zpiv/deterministicmint.cpp delete mode 100644 src/zpiv/deterministicmint.h delete mode 100644 src/zpiv/mintpool.cpp delete mode 100644 src/zpiv/mintpool.h delete mode 100644 src/zpiv/witness.cpp delete mode 100644 src/zpiv/witness.h delete mode 100644 src/zpiv/zerocoin.cpp delete mode 100644 src/zpiv/zerocoin.h delete mode 100644 src/zpiv/zpivmodule.cpp delete mode 100644 src/zpiv/zpivmodule.h delete mode 100644 src/zpiv/zpivtracker.cpp delete mode 100644 src/zpiv/zpivtracker.h delete mode 100644 src/zpiv/zpivwallet.cpp delete mode 100644 src/zpiv/zpivwallet.h delete mode 100644 src/zpivchain.cpp delete mode 100644 src/zpivchain.h delete mode 100755 test/functional/p2p_zpos_fakestake.py delete mode 100755 test/functional/p2p_zpos_fakestake_accepted.py delete mode 100755 test/functional/rpc_bip38.py delete mode 100644 test/functional/zerocoin_publicSpend_reorg.py delete mode 100755 test/functional/zerocoin_valid_public_spend.py delete mode 100755 test/functional/zerocoin_wrapped_serials.py diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000000..018552458c650 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,157 @@ +.DS_Store +.git +.github +.idea +/NetboxWallet* +/blocks +Dockerfile* +Makefile_docker +.dockerignore +docker-compose.yml +.gitignore +.gitattributes +.gitlab-ci.yml +.helm +README.* + +*.sublime-project +*.sublime-workspace +todo.txt +reset-files.bash + +**/*.tar.gz + +**/*.exe +src/nbx +src/nbxd +src/nbx-cli +src/nbx-tx +src/test/test_nbx +src/qt/test/test_nbx-qt + +# autoreconf +**/Makefile.in +**/aclocal.m4 +**/autom4te.cache +build-aux/config.guess +build-aux/config.sub +build-aux/depcomp +build-aux/install-sh +build-aux/ltmain.sh +build-aux/m4/libtool.m4 +build-aux/m4/lt~obsolete.m4 +build-aux/m4/ltoptions.m4 +build-aux/m4/ltsugar.m4 +build-aux/m4/ltversion.m4 +build-aux/missing +build-aux/compile +build-aux/test-driver +**/config.log +**/config.status +**/configure +**/confdefs.h +**/conftest.cpp +**/conftest.err +**/libtool +src/config/nbx-config.h +src/config/nbx-config.h.in +src/config/stamp-h1 +share/setup.nsi +share/qt/Info.plist +contrib/devtools/split-debug.sh + +src/qt/*.moc +src/qt/moc_*.cpp +src/qt/forms/ui_*.h + +src/qt/test/moc*.cpp + +**/.deps +**/.dirstamp +**/.libs +**/.*.swp +**/*.*~* +**/*.bak +**/*.rej +**/*.orig +**/*.pyc +**/*.o +**/*.o-* +**/.NetboxWallet +**/*.a +**/*.pb.cc +**/*.pb.h + +**/*.log +**/*.trs +**/*.dmg + +**/*.json.h +**/*.raw.h + +#libtool object files +**/*.lo +**/*.la + +# Compilation and Qt preprocessor part +**/*.qm +**/Makefile +**/netboxwallet +**/NetboxWallet.app + +# Unit-tests +**/Makefile.test +**/nbxx-qt_test +**/src/test/buildenv.py + +# Resources cpp +**/qrc_*.cpp + +# Qt creator +**/*.pro.user + +# Mac specific +.DS_Store +build + +#lcov +**/*.gcno +/*.info +**/test_nbx.coverage/ +**/total.coverage/ +**/coverage_percent.txt + +#build tests +**/linux-coverage-build +**/linux-build +**/win32-build +**/qa/pull-tester/run-bitcoind-for-test.sh +**/qa/pull-tester/tests-config.sh +**/qa/pull-tester/cache/* +**/qa/pull-tester/test.*/* + +!src/leveldb*/Makefile +!depends/Makefile + +depends/SDKs/ +depends/work/ +depends/built/ +depends/sources/ +depends/config.site +depends/x86_64* +depends/i686* +depends/mips* +depends/arm* +depends/aarch64* +depends/riscv32* +depends/riscv64* + +**/.cproject +**/.project +/doc/doxygen/ +/nbproject/ + +.idea +**/CMakeLists.txt +**/cmake-build-debug +.idea diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 68af46a7ac55e..0000000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,34 +0,0 @@ - - -This issue tracker is only for technical issues related to PIVX Core. -General PIVX questions and/or support requests and are best directed to the [PIVX Discord](https://discord.pivx.org). - -### Describe the issue - -### Can you reliably reproduce the issue? -#### If so, please list the steps to reproduce below: -1. -2. -3. - -### Expected behavior -Tell us what should happen - -### Actual behavior -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 PIVX Core are you using? -List the version number/commit ID, and if it is an official binary, self compiled or a distribution package. - -### Machine specs: -- OS: -- CPU: -- RAM: -- Disk size: -- Disk Type (HD/SDD): - -### Any extra information that might be useful in the debugging process. -This is normally the contents of a `debug.log`, `db.log` or `config.log` file. Raw text or a link to a pastebin type site are preferred. diff --git a/.gitignore b/.gitignore index 9074570fcb065..191e18c674687 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -.gitignore *.sublime-project *.sublime-workspace todo.txt @@ -7,12 +6,12 @@ reset-files.bash *.tar.gz *.exe -src/pivx -src/pivxd -src/pivx-cli -src/pivx-tx -src/test/test_pivx -src/qt/test/test_pivx-qt +src/nbx +src/nbxd +src/nbx-cli +src/nbx-tx +src/test/test_nbx +src/qt/test/test_nbx-qt # autoreconf Makefile.in @@ -38,15 +37,13 @@ confdefs.h conftest.cpp conftest.err libtool -src/config/pivx-config.h -src/config/pivx-config.h.in +src/config/nbx-config.h +src/config/nbx-config.h.in src/config/stamp-h1 share/setup.nsi share/qt/Info.plist contrib/devtools/split-debug.sh -src/univalue/gen - src/qt/*.moc src/qt/moc_*.cpp src/qt/forms/ui_*.h @@ -64,8 +61,7 @@ src/qt/test/moc*.cpp *.pyc *.o *.o-* -*.patch -.pivx +.NetboxWallet *.a *.pb.cc *.pb.h @@ -84,13 +80,13 @@ src/qt/test/moc*.cpp # Compilation and Qt preprocessor part *.qm Makefile -pivx-qt -PIVX-Qt.app +netboxwallet +NetboxWallet.app background.tiff* # Unit-tests Makefile.test -pivx-qt_test +nbx-qt_test src/test/buildenv.py # Resources cpp @@ -106,7 +102,7 @@ build #lcov *.gcno /*.info -test_pivx.coverage/ +test_nbx.coverage/ total.coverage/ coverage_percent.txt @@ -123,12 +119,15 @@ qa/pull-tester/test.*/* cache/* !src/leveldb*/Makefile +!depends/Makefile .cproject .project /doc/doxygen/ /nbproject/ libbitcoinconsensus.pc + .idea CMakeLists.txt cmake-build-debug +/NetboxWallet* diff --git a/.travis/test_06_script_b.sh b/.travis/test_06_script_b.sh index 48f13412a73b4..315a0e28b7287 100755 --- a/.travis/test_06_script_b.sh +++ b/.travis/test_06_script_b.sh @@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8 -cd "build/pivx-$HOST" || (echo "could not enter distdir build/pivx-$HOST"; exit 1) +cd "build/nbx-$HOST" || (echo "could not enter distdir build/nbx-$HOST"; exit 1) if [ "$RUN_UNIT_TESTS" = "true" ]; then BEGIN_FOLD unit-tests diff --git a/CMakeLists.txt b/CMakeLists.txt index f3c37596cd454..a3f548b530c95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(PIVX) +project(NBX) set(BDB_VER "4.8.30") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/contrib/cmake") @@ -74,8 +74,7 @@ if (GMP_FOUND) include_directories ( ${GMP_INCLUDE_DIR} ) link_directories ( ${GMP_LIBRARY_DIRS} ) else() - message(WARNING "GMP not found, falling back to OpenSSL for bignum!") - set(BIGNUM_CONFIGURE_FLAGS "--with-zerocoin-bignum=openssl") + message(WARNING "GMP not found!") endif() find_package(ZMQ) @@ -97,11 +96,11 @@ else() ) endif() -# run configure if pivx_config.h doesn't exist -if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/config/pivx-config.h") +# run configure if nbx_config.h doesn't exist +if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/config/nbx-config.h") else() execute_process( - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/configure ${BDB_CONFIGURE_FLAGS} ${BIGNUM_CONFIGURE_FLAGS} + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/configure ${BDB_CONFIGURE_FLAGS} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) endif() @@ -144,7 +143,7 @@ include_directories( ) set(libleveldb_a_headers - ${CMAKE_CURRENT_SOURCE_DIR}/src/config/pivx-config.h + ${CMAKE_CURRENT_SOURCE_DIR}/src/config/nbx-config.h ${CMAKE_CURRENT_SOURCE_DIR}/src/leveldb/port/atomic_pointer.h ${CMAKE_CURRENT_SOURCE_DIR}/src/leveldb/port/port_example.h ${CMAKE_CURRENT_SOURCE_DIR}/src/leveldb/port/port_posix.h @@ -325,7 +324,6 @@ set(SERVER_SOURCES ./src/txdb.cpp ./src/txmempool.cpp ./src/validationinterface.cpp - ./src/zpivchain.cpp ) add_library(SERVER_A STATIC ${BitcoinHeaders} ${SERVER_SOURCES}) @@ -353,21 +351,14 @@ set(WALLET_SOURCES ./src/masternode-sync.cpp ./src/masternodeconfig.cpp ./src/masternodeman.cpp - ./src/zpiv/mintpool.cpp ./src/wallet/rpcdump.cpp - ./src/zpiv/deterministicmint.cpp - ./src/zpiv/zerocoin.cpp ./src/wallet/rpcwallet.cpp ./src/kernel.cpp ./src/wallet/wallet.cpp ./src/wallet/wallet_ismine.cpp ./src/wallet/walletdb.cpp - ./src/zpiv/zpivwallet.cpp - ./src/zpiv/zpivtracker.cpp - ./src/zpiv/zpivmodule.cpp ./src/stakeinput.cpp ./src/genwit.cpp - ./src/lightzpivthread.cpp ) add_library(WALLET_A STATIC ${BitcoinHeaders} ${WALLET_SOURCES}) @@ -406,42 +397,7 @@ set(BITCOIN_CRYPTO_SOURCES ) add_library(BITCOIN_CRYPTO_A STATIC ${BITCOIN_CRYPTO_SOURCES}) -set(ZEROCOIN_SOURCES - ./src/libzerocoin/Accumulator.h - ./src/libzerocoin/AccumulatorProofOfKnowledge.h - ./src/libzerocoin/bignum.h - ./src/libzerocoin/bignum.cpp - ./src/libzerocoin/Coin.h - ./src/libzerocoin/CoinSpend.h - ./src/libzerocoin/Commitment.h - ./src/libzerocoin/Denominations.h - ./src/libzerocoin/ParamGeneration.h - ./src/libzerocoin/Params.h - ./src/libzerocoin/SerialNumberSignatureOfKnowledge.h - ./src/libzerocoin/SpendType.h - ./src/libzerocoin/ZerocoinDefines.h - ./src/libzerocoin/Accumulator.cpp - ./src/libzerocoin/AccumulatorProofOfKnowledge.cpp - ./src/libzerocoin/Coin.cpp - ./src/libzerocoin/Denominations.cpp - ./src/libzerocoin/CoinSpend.cpp - ./src/libzerocoin/Commitment.cpp - ./src/libzerocoin/ParamGeneration.cpp - ./src/libzerocoin/Params.cpp - ./src/libzerocoin/SerialNumberSignatureOfKnowledge.cpp - ) -if(GMP_FOUND) - list(APPEND ZEROCOIN_SOURCES ./src/libzerocoin/bignum_gmp.cpp) -else() - list(APPEND ZEROCOIN_SOURCES ./src/libzerocoin/bignum_openssl.cpp) -endif() -add_library(ZEROCOIN_A STATIC ${ZEROCOIN_SOURCES}) - set(COMMON_SOURCES - ./src/zpiv/accumulators.cpp - ./src/zpiv/accumulatorcheckpoints.cpp - ./src/zpiv/accumulatormap.cpp - ./src/zpiv/witness.cpp ./src/allocators.cpp ./src/amount.cpp ./src/base58.cpp @@ -450,9 +406,7 @@ set(COMMON_SOURCES ./src/coins.cpp ./src/compressor.cpp ./src/primitives/block.cpp - ./src/zpiv/deterministicmint.cpp ./src/primitives/transaction.cpp - ./src/zpiv/zerocoin.cpp ./src/core_read.cpp ./src/core_write.cpp ./src/hash.cpp @@ -495,9 +449,9 @@ add_library(UTIL_A STATIC ${BitcoinHeaders} ${UTIL_SOURCES}) set(CLI_SOURCES ./src/rpc/client.cpp) add_library(CLI_A STATIC ${BitcoinHeaders} ${CLI_SOURCES}) -add_executable(pivx-cli ${CMAKE_CURRENT_SOURCE_DIR}/src/pivx-cli.cpp) -add_dependencies(pivx-cli libunivalue) -target_link_libraries(pivx-cli +add_executable(nbx-cli ${CMAKE_CURRENT_SOURCE_DIR}/src/nbx-cli.cpp) +add_dependencies(nbx-cli libunivalue) +target_link_libraries(nbx-cli CLI_A univalue UTIL_A @@ -505,28 +459,26 @@ target_link_libraries(pivx-cli ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIBEVENT_LIB} ) -add_executable(pivx-tx ${CMAKE_CURRENT_SOURCE_DIR}/src/pivx-tx.cpp) -add_dependencies(pivx-tx libunivalue libsecp256k1) -target_link_libraries(pivx-tx +add_executable(nbx-tx ${CMAKE_CURRENT_SOURCE_DIR}/src/nbx-tx.cpp) +add_dependencies(nbx-tx libunivalue libsecp256k1) +target_link_libraries(nbx-tx univalue COMMON_A - ZEROCOIN_A UTIL_A BITCOIN_CRYPTO_A secp256k1 ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIBEVENT_LIB} ) if(GMP_FOUND) - target_link_libraries(pivx-tx ${GMP_LIBRARY}) + target_link_libraries(nbx-tx ${GMP_LIBRARY}) endif() -add_executable(pivxd ${CMAKE_CURRENT_SOURCE_DIR}/src/pivxd.cpp) -add_dependencies(pivxd libunivalue libsecp256k1 leveldb leveldb_sse42 memenv) -target_link_libraries(pivxd +add_executable(nbxd ${CMAKE_CURRENT_SOURCE_DIR}/src/nbxd.cpp) +add_dependencies(nbxd libunivalue libsecp256k1 leveldb leveldb_sse42 memenv) +target_link_libraries(nbxd SERVER_A COMMON_A univalue - ZEROCOIN_A UTIL_A WALLET_A BITCOIN_CRYPTO_A @@ -534,10 +486,10 @@ target_link_libraries(pivxd ${BerkeleyDB_LIBRARIES} ${OPENSSL_LIBRARIES} ${Boost_LIBRARIES} ${LIBEVENT_LIB} miniupnpc pthread ) if(GMP_FOUND) - target_link_libraries(pivxd ${GMP_LIBRARY}) + target_link_libraries(nbxd ${GMP_LIBRARY}) endif() if(ZMQ_FOUND) - target_link_libraries(pivxd ZMQ_A ${ZMQ_LIB}) + target_link_libraries(nbxd ZMQ_A ${ZMQ_LIB}) endif () diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 25835b60903ba..5ebc0bb016506 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ -Contributing to PIVX Core +Contributing to Netbox.Wallet ============================ -The PIVX Core project operates an open contributor model where anyone is +Netbox.Wallet 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. @@ -59,12 +59,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 pivx-qt + - *Qt* for changes to netboxwallet - *Minting* for changes to the minting code - *Net* or *P2P* for changes to the peer-to-peer network code - *RPC/REST* for changes to the RPC or REST APIs - *Scripts and tools* for changes to the scripts and tools - - *Tests* for changes to the pivx unit tests or QA tests + - *Tests* for changes to the nbx 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. @@ -203,10 +203,10 @@ workload on reviewing. "Decision Making" Process ------------------------- -The following applies to code changes to the PIVX Core project, and is not to be -confused with overall PIVX Network Protocol consensus changes. +The following applies to code changes to Netbox.Wallet project, and is not to be +confused with overall NBX network Protocol consensus changes. -Whether a pull request is merged into PIVX Core rests with the project merge +Whether a pull request is merged into Netbox.Wallet 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 @@ -220,7 +220,7 @@ In general, all pull requests must: - Be well peer reviewed; - follow code style guidelines; -Patches that change PIVX consensus rules are considerably more involved than +Patches that change consensus rules are considerably more involved than normal because they affect the entire ecosystem and so must be preceded by extensive discussions and clear detailing. While each case will be different, one should be prepared to expend more time and effort than for other kinds of @@ -263,7 +263,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 patchset proposes to change the PIVX consensus, it must have been +Where a patchset proposes to change the consensus, it must have been discussed extensively on the forums and Discord, be accompanied by a widely discussed Proposal and have a generally widely perceived technical consensus of being a worthwhile change based on the judgement of the maintainers. @@ -303,7 +303,7 @@ about: Release Policy -------------- -The project leader is the release manager for each PIVX Core release. +The project leader is the release manager for each Netbox.Wallet release. Copyright --------- diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000000000..8a4b921193fff --- /dev/null +++ b/Dockerfile @@ -0,0 +1,39 @@ +FROM ubuntu:18.04 as builder + +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + software-properties-common automake autoconf pkg-config libtool build-essential \ + libboost-all-dev bsdmainutils libssl1.0-dev libevent-dev libgmp-dev libminiupnpc-dev + +RUN add-apt-repository ppa:bitcoin/bitcoin +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + libdb4.8-dev libdb4.8++-dev \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /netboxwallet + +COPY / /netboxwallet + +RUN ./autogen.sh +RUN ./configure +RUN make -j$(nproc) +#RUN make install + +RUN strip $PWD/src/nbxd $PWD/src/nbx-cli $PWD/src/nbx-tx + +FROM ubuntu:18.04 + +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + software-properties-common \ + && add-apt-repository ppa:bitcoin/bitcoin \ + && apt-get update \ + && apt-get install --no-install-recommends --yes \ + libboost-system1.65.1 libboost-filesystem1.65.1 libboost-program-options1.65.1 libboost-thread1.65.1 \ + libboost-chrono1.65.1 libdb4.8++ libevent-2.1 libevent-pthreads-2.1 libminiupnpc10 libssl1.0.0 \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=builder /netboxwallet/src/nbxd /netboxwallet/src/nbx-cli /netboxwallet/src/nbx-tx /usr/local/bin/ + +ENTRYPOINT ["nbxd"] diff --git a/Dockerfile_dev b/Dockerfile_dev new file mode 100644 index 0000000000000..4a0b184ab596f --- /dev/null +++ b/Dockerfile_dev @@ -0,0 +1,30 @@ +FROM ubuntu:18.04 as builder + +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + software-properties-common automake autoconf pkg-config libtool build-essential \ + libboost-all-dev bsdmainutils libssl1.0-dev libevent-dev libgmp-dev libqrencode-dev \ + qtbase5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler libminiupnpc-dev \ + python-setuptools cmake libcap-dev libbz2-dev \ + curl g++-mingw-w64-x86-64 g++-mingw-w64-i686 git + +RUN update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix +RUN update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + +RUN update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix +RUN update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix + +RUN add-apt-repository ppa:bitcoin/bitcoin +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + libdb4.8-dev libdb4.8++-dev \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /netboxwallet + +RUN ln -s /netboxwallet/src/nbxd /usr/local/bin/ +RUN ln -s /netboxwallet/src/nbx-cli /usr/local/bin/ +RUN ln -s /netboxwallet/src/nbx-tx /usr/local/bin/ +RUN ln -s /netboxwallet/src/qt/netboxwallet /usr/local/bin/ + +#COPY / /netboxwallet diff --git a/Dockerfile_osx b/Dockerfile_osx new file mode 100644 index 0000000000000..606db657ad65c --- /dev/null +++ b/Dockerfile_osx @@ -0,0 +1,27 @@ +FROM ubuntu:18.04 as builder + +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + software-properties-common automake autoconf pkg-config libtool build-essential \ + curl bsdmainutils python3-setuptools cmake libcap-dev libz-dev libbz2-dev \ + && rm -rf /var/lib/apt/lists/* + +COPY / /netboxwallet + +WORKDIR /netboxwallet/depends + +RUN mkdir SDKs \ + && cd SDKs \ + && curl -sSLo MacOSX10.11.sdk.tar.xz https://github.com/phracker/MacOSX-SDKs/releases/download/MacOSX10.11.sdk/MacOSX10.11.sdk.tar.xz \ + && tar -xf MacOSX10.11.sdk.tar.xz \ + && rm MacOSX10.11.sdk.tar.xz + +RUN make HOST=x86_64-apple-darwin11 -j$(nproc) + +WORKDIR /netboxwallet + +RUN ./autogen.sh +RUN CONFIG_SITE=$PWD/depends/x86_64-apple-darwin11/share/config.site ./configure +RUN make -j$(nproc) + +RUN $PWD/depends/x86_64-apple-darwin11/native/bin/x86_64-apple-darwin11-strip $PWD/src/qt/netboxwallet $PWD/src/nbxd $PWD/src/nbx-cli $PWD/src/nbx-tx diff --git a/Dockerfile_qt b/Dockerfile_qt new file mode 100644 index 0000000000000..67c0aadddf8fa --- /dev/null +++ b/Dockerfile_qt @@ -0,0 +1,41 @@ +FROM ubuntu:18.04 as builder + +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + software-properties-common automake autoconf pkg-config libtool build-essential \ + libboost-all-dev bsdmainutils libssl1.0-dev libevent-dev libgmp-dev libqrencode-dev \ + qtbase5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler libminiupnpc-dev + +RUN add-apt-repository ppa:bitcoin/bitcoin +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + libdb4.8-dev libdb4.8++-dev \ + && rm -rf /var/lib/apt/lists/* + +WORKDIR /netboxwallet + +COPY / /netboxwallet + +RUN ./autogen.sh +RUN ./configure +RUN make -j$(nproc) +#RUN make install + +RUN strip $PWD/src/qt/netboxwallet + +FROM ubuntu:18.04 + +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + software-properties-common \ + && add-apt-repository ppa:bitcoin/bitcoin \ + && apt-get update \ + && apt-get install --no-install-recommends --yes \ + libboost-system1.65.1 libboost-filesystem1.65.1 libboost-program-options1.65.1 libboost-thread1.65.1 \ + libboost-chrono1.65.1 libdb4.8++ libevent-2.1 libevent-pthreads-2.1 \ + libqt5widgets5 libqrencode3 libprotobuf10 libminiupnpc10 libssl1.0.0 \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=builder /netboxwallet/src/qt/netboxwallet /usr/local/bin/ + +ENTRYPOINT ["netboxwallet"] diff --git a/Dockerfile_static b/Dockerfile_static new file mode 100644 index 0000000000000..ea1610c8a512c --- /dev/null +++ b/Dockerfile_static @@ -0,0 +1,21 @@ +FROM ubuntu:18.04 as builder + +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + software-properties-common automake autoconf pkg-config libtool build-essential \ + curl bsdmainutils \ + && rm -rf /var/lib/apt/lists/* + +COPY / /netboxwallet + +WORKDIR /netboxwallet/depends + +RUN make -j$(nproc) + +WORKDIR /netboxwallet + +RUN ./autogen.sh +RUN CONFIG_SITE=$PWD/depends/x86_64-pc-linux-gnu/share/config.site ./configure +RUN make -j$(nproc) + +RUN strip $PWD/src/qt/netboxwallet $PWD/src/nbxd $PWD/src/nbx-cli $PWD/src/nbx-tx diff --git a/Dockerfile_windows b/Dockerfile_windows new file mode 100644 index 0000000000000..a06126c77ab0e --- /dev/null +++ b/Dockerfile_windows @@ -0,0 +1,25 @@ +FROM ubuntu:18.04 as builder + +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + software-properties-common automake autoconf pkg-config libtool build-essential \ + curl g++-mingw-w64-i686 bsdmainutils \ + && rm -rf /var/lib/apt/lists/* + +RUN update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix +RUN update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix + +COPY / /netboxwallet + +WORKDIR /netboxwallet/depends + +RUN make HOST=i686-w64-mingw32 -j$(nproc) + +WORKDIR /netboxwallet + +RUN ./autogen.sh +RUN CONFIG_SITE=$PWD/depends/i686-w64-mingw32/share/config.site ./configure +RUN make -j$(nproc) +#RUN make install + +RUN strip $PWD/src/qt/netboxwallet.exe $PWD/src/nbxd.exe $PWD/src/nbx-cli.exe $PWD/src/nbx-tx.exe diff --git a/Dockerfile_windows_x64 b/Dockerfile_windows_x64 new file mode 100644 index 0000000000000..d548ea25bf2e8 --- /dev/null +++ b/Dockerfile_windows_x64 @@ -0,0 +1,25 @@ +FROM ubuntu:18.04 as builder + +RUN apt-get update \ + && apt-get install --no-install-recommends --yes \ + software-properties-common automake autoconf pkg-config libtool build-essential \ + curl g++-mingw-w64-x86-64 bsdmainutils \ + && rm -rf /var/lib/apt/lists/* + +RUN update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix +RUN update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + +COPY / /netboxwallet + +WORKDIR /netboxwallet/depends + +RUN make HOST=x86_64-w64-mingw32 -j$(nproc) + +WORKDIR /netboxwallet + +RUN ./autogen.sh +RUN CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site ./configure +RUN make -j$(nproc) +#RUN make install + +RUN strip $PWD/src/qt/netboxwallet.exe $PWD/src/nbxd.exe $PWD/src/nbx-cli.exe $PWD/src/nbx-tx.exe diff --git a/INSTALL b/INSTALL index 1c09050de74b0..19fccb59e2057 100644 --- a/INSTALL +++ b/INSTALL @@ -8,6 +8,6 @@ Use the autogen script to prepare the build environment. Always verify the signatures and checksums. -See doc/build-*.md for instructions on building pivxd, +See doc/build-*.md for instructions on building nbxd, the intended-for-services, no-graphical-interface, reference implementation of PIVX. diff --git a/Makefile.am b/Makefile.am index f08f565d6442a..4dfeae93000e2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX empty := space := $(empty) $(empty) -OSX_APP=PIVX-Qt.app +OSX_APP=NetboxWallet.app OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME)) OSX_DMG = $(OSX_VOLNAME).dmg OSX_BACKGROUND_SVG=background.svg @@ -33,14 +33,14 @@ OSX_BACKGROUND_IMAGE_DPIS=36 72 OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist -OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns +OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/nbx.icns OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md) -DIST_CONTRIB = $(top_srcdir)/contrib/pivx-cli.bash-completion \ - $(top_srcdir)/contrib/pivx-tx.bash-completion \ - $(top_srcdir)/contrib/pivxd.bash-completion \ +DIST_CONTRIB = $(top_srcdir)/contrib/nbx-cli.bash-completion \ + $(top_srcdir)/contrib/nbx-tx.bash-completion \ + $(top_srcdir)/contrib/nbxd.bash-completion \ $(top_srcdir)/contrib/init \ $(top_srcdir)/contrib/install_db4.sh @@ -51,14 +51,14 @@ DIST_SHARE = \ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \ $(top_srcdir)/contrib/devtools/security-check.py -WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/pivx.ico \ +WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/nbx.ico \ $(top_srcdir)/share/pixmaps/nsis-header.bmp \ $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \ $(top_srcdir)/doc/README_windows.txt -LINUX_PACKAGING = $(top_srcdir)/share/pixmaps/pivx16.xpm \ - $(top_srcdir)/share/pixmaps/pivx32.xpm \ - $(top_srcdir)/share/pixmaps/pivx128.png +LINUX_PACKAGING = $(top_srcdir)/share/pixmaps/nbx16.xpm \ + $(top_srcdir)/share/pixmaps/nbx32.xpm \ + $(top_srcdir)/share/pixmaps/nbx128.png OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \ $(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_SVG) \ @@ -67,9 +67,9 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \ $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh COVERAGE_INFO = baseline.info \ - test_pivx_filtered.info total_coverage.info \ + test_nbx_filtered.info total_coverage.info \ baseline_filtered.info functional_test.info functional_test_filtered.info \ - test_pivx_coverage.info test_pivx.info + test_nbx_coverage.info test_nbx.info dist-hook: -$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf - @@ -95,11 +95,11 @@ $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS) +$(OSX_APP)/Contents/Resources/nbx.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/PIVX-Qt: all-recursive +$(OSX_APP)/Contents/MacOS/NetboxWallet: all-recursive $(MKDIR_P) $(@D) STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $@ @@ -108,8 +108,8 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: echo '{ CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@ 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/PIVX-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings + $(OSX_APP)/Contents/Resources/nbx.icns $(OSX_APP)/Contents/Info.plist \ + $(OSX_APP)/Contents/MacOS/NetboxWallet $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings osx_volname: echo $(OSX_VOLNAME) >$@ @@ -134,7 +134,7 @@ $(APP_DIST_DIR)/Applications: @rm -f $@ @cd $(@D); $(LN_S) /Applications $(@F) -$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/PIVX-Qt +$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/NetboxWallet $(OSX_DMG): $(APP_DIST_EXTRAS) $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist @@ -149,7 +149,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/PIVX-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) +$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/NetboxWallet: $(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) @@ -182,16 +182,16 @@ baseline_filtered.info: baseline.info $(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@ $(LCOV) -a $@ $(LCOV_OPTS) -o $@ -test_pivx.info: baseline_filtered.info +test_nbx.info: baseline_filtered.info $(MAKE) -C src/ check - $(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src -t test_pivx -o $@ + $(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src -t test_nbx -o $@ $(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src -test_pivx_filtered.info: test_pivx.info +test_nbx_filtered.info: test_nbx.info $(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@ $(LCOV) -a $@ $(LCOV_OPTS) -o $@ -functional_test.info: test_pivx_filtered.info +functional_test.info: test_nbx_filtered.info -@TIMEOUT=15 test/functional/test_runner.py $(EXTENDED_FUNCTIONAL_TESTS) $(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src --t functional-tests -o $@ $(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src @@ -200,13 +200,13 @@ functional_test_filtered.info: functional_test.info $(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@ $(LCOV) -a $@ $(LCOV_OPTS) -o $@ -test_pivx_coverage.info: baseline_filtered.info test_pivx_filtered.info - $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_pivx_filtered.info -o $@ +test_nbx_coverage.info: baseline_filtered.info test_nbx_filtered.info + $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_nbx_filtered.info -o $@ -total_coverage.info: test_pivx_filtered.info functional_test_filtered.info - $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_pivx_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt +total_coverage.info: test_nbx_filtered.info functional_test_filtered.info + $(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_nbx_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt -test_pivx.coverage/.dirstamp: test_pivx_coverage.info +test_nbx.coverage/.dirstamp: test_nbx_coverage.info $(GENHTML) -s $(LCOV_OPTS) $< -o $(@D) @touch $@ @@ -214,7 +214,7 @@ total.coverage/.dirstamp: total_coverage.info $(GENHTML) -s $(LCOV_OPTS) $< -o $(@D) @touch $@ -cov: test_pivx.coverage/.dirstamp total.coverage/.dirstamp +cov: test_nbx.coverage/.dirstamp total.coverage/.dirstamp endif @@ -269,6 +269,6 @@ clean-docs: rm -rf doc/doxygen clean-local: clean-docs - rm -rf coverage_percent.txt test_pivx.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) + rm -rf coverage_percent.txt test_nbx.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache share/rpcauth/__pycache__ diff --git a/Makefile_docker b/Makefile_docker new file mode 100755 index 0000000000000..7b81e1e837831 --- /dev/null +++ b/Makefile_docker @@ -0,0 +1,66 @@ +APP=netbox-coin +TAG=latest + +# Metadata about this makefile and position +MKFILE_PATH := $(lastword $(MAKEFILE_LIST)) +CURRENT_DIR := $(dir $(realpath $(MKFILE_PATH))) +CURRENT_DIR := $(CURRENT_DIR:/=) + +.DEFAULT_GOAL := build + +build: + docker build --compress --force-rm --pull -t "${APP}:${TAG}" . + +run: + docker run --rm -it --name "${APP}" --entrypoint=bash "${APP}:${TAG}" + +exec: + docker exec -it "${APP}" /bin/bash + +once: + docker run --rm -it --entrypoint=nbxd "${APP}:${TAG}" + +build_dev: + docker build -f Dockerfile_dev --compress --force-rm --pull -t "${APP}-dev:${TAG}" . + +run_dev: + docker run --rm -it --name "${APP}-dev" -v $(shell pwd)/NetboxWallet:/root/.NetboxWallet -v $(shell pwd):/netboxwallet -e DISPLAY=${DISPLAY} -v /tmp/.X11-unix:/tmp/.X11-unix -v /etc/localtime:/etc/localtime:ro --entrypoint=bash "${APP}-dev:${TAG}" + +once_dev: + docker run --rm -it --entrypoint=nbxd -v $(shell pwd):/netboxwallet "${APP}-dev:${TAG}" + +exec_dev: + docker exec -it "${APP}-dev" /bin/bash + +run_test: + docker run --rm -it --name "${APP}-dev" --entrypoint=bash "${APP}-dev:${TAG}" + +build_qt: + docker build -f Dockerfile_qt --compress --force-rm --pull -t "${APP}-qt:${TAG}" . + +run_qt: + docker run --rm -it --name "${APP}-qt" -e DISPLAY=${DISPLAY} -v /tmp/.X11-unix:/tmp/.X11-unix --entrypoint=bash "${APP}-qt:${TAG}" + +build_windows: + docker build -f Dockerfile_windows --compress --force-rm --pull -t "${APP}-windows:${TAG}" . + +run_windows: + docker run --rm -it --name "${APP}-windows" "${APP}-windows:${TAG}" + +build_windows_x64: + docker build -f Dockerfile_windows_x64 --compress --force-rm --pull -t "${APP}-windows-x64:${TAG}" . + +run_windows_x64: + docker run --rm -it --name "${APP}-windows-x64" "${APP}-windows-x64:${TAG}" + +build_static: + docker build -f Dockerfile_static --compress --force-rm --pull -t "${APP}-static:${TAG}" . + +run_static: + docker run --rm -it --name "${APP}-static" "${APP}-static:${TAG}" + +build_osx: + docker build -f Dockerfile_osx --compress --force-rm --pull -t "${APP}-osx:${TAG}" . + +run_osx: + docker run --rm -it --name "${APP}-osx" "${APP}-osx:${TAG}" diff --git a/README.md b/README.md index 20270f82845e7..fa2b543d1848d 100644 --- a/README.md +++ b/README.md @@ -1,59 +1,92 @@ -PIVX Core integration/staging repository +Netbox.Wallet repository ===================================== -[![Build Status](https://travis-ci.org/PIVX-Project/PIVX.svg?branch=master)](https://travis-ci.org/PIVX-Project/PIVX) [![GitHub version](https://badge.fury.io/gh/PIVX-Project%2FPIVX.svg)](https://badge.fury.io/gh/PIVX-Project%2FPIVX) - -PIVX is an open source crypto-currency focused on fast private transactions using the Zerocoin protocol, with low transaction fees & environmental footprint. It utilizes the first ever anonymous proof of stake protocol, called zPoS, combined with regular PoS and masternodes for securing its network. zPoS incentivises using the privacy features available in PIVX by granting a higher block reward for zPoS over regular PoS and masternodes. In practice PIVX has between 4 to 10 times higher use of it's privacy features in comparison to other coins that combine public and private transactions. This is thanks to innovations like zPoS and integrating the Zerocoin protocol into light/mobile wallets, allowing for a complete and lightweight privacy protocol that can be used on the go. As well as security improvements like [deterministic generation of zPIV for easy backups.](https://www.reddit.com/r/pivx/comments/8gbjf7/how_to_use_deterministic_zerocoin_generation/) -The goal of PIVX is to achieve a decentralized sustainable crypto currency with near instant full-time private transactions, fair governance and community intelligence. -- Anonymized transactions & consensus using the [_Zerocoin Protocol_](http://www.pivx.org/zpiv) and [zPoS](https://pivx.org/zpos/). -- light/mobile wallet privacy using the [Zerocoin Light Node Protocol](https://pivx.org/wp-content/uploads/2018/11/Zerocoin_Light_Node_Protocol.pdf) -- Fast transactions featuring guaranteed zero confirmation transactions, we call it _SwiftX_. -- Decentralized blockchain voting utilizing Masternode technology to form a DAO. The blockchain will distribute monthly treasury funds based on successful proposals submitted by the community and voted on by the DAO. - -More information at [pivx.org](http://www.pivx.org) Visit our ANN thread at [BitcoinTalk](http://www.bitcointalk.org/index.php?topic=1262920) - -### Coin Specs - - - - - - - -
AlgoQuark
Block Time60 Seconds
Difficulty RetargetingEvery Block
Max Coin Supply (PoW Phase)43,199,500 PIV
Max Coin Supply (PoS Phase)Infinite
Premine60,000 PIV*
- -*60,000 PIV Premine was burned in block [279917](http://www.presstab.pw/phpexplorer/PIVX/block.php?blockhash=206d9cfe859798a0b0898ab00d7300be94de0f5469bb446cecb41c3e173a57e0) - -### Reward Distribution - - - - - -
Genesis Block
Block HeightReward AmountNotes
160,000 PIVInitial Pre-mine, burnt in block 279917
- -### PoW Rewards Breakdown - - - - - - -
Block HeightMasternodesMinerBudget
2-4320020% (50 PIV)80% (200 PIV)N/A
43201-15120020% (50 PIV)70% (200 PIV)10% (25 PIV)
151201-25920045% (22.5 PIV)45% (22.5 PIV)10% (5 PIV)
- -### PoS Rewards Breakdown - - - - - - - - - - - - - - -
PhaseBlock HeightRewardMasternodes & StakersBudget
Phase 0259201-30239950 PIV90% (45 PIV)10% (5 PIV)
Phase 1302400-34559945 PIV90% (40.5 PIV)10% (4.5 PIV)
Phase 2345600-38879940 PIV90% (36 PIV)10% (4 PIV)
Phase 3388800-43199935 PIV90% (31.5 PIV)10% (3.5 PIV)
Phase 4432000-47519930 PIV90% (27 PIV)10% (3 PIV)
Phase 5475200-51839925 PIV90% (22.5 PIV)10% (2.5 PIV)
Phase 6518400-56159920 PIV90% (18 PIV)10% (2 PIV)
Phase 7561600-60479915 PIV90% (13.5 PIV)10% (1.5 PIV)
Phase 8604800-64799910 PIV90% (9 PIV)10% (1 PIV)
Phase 9648000-11542035 PIV90% (4.5 PIV)10% (0.5 PIV)
Phase X1154203-∞6 PIV84% (5 PIV/zPIV)16% (1 PIV)
+## 1. What is Netbox.Global? +Web browser is a product that is an entry point to the Internet and its users are a huge community that is committed to network transparency and self-regulation. That is why we decided to create a blockchain-based Netbox.Browser, which is the key product of Netbox.Global infrastructure. Its’ users are distributed around the world and are able to join their forces to create a new transparent Internet access tool. + +Netbox.Browser is an application for PC and mobile devices, the main function of which, in addition to access to web-resources, is to maintain the functioning of the Netbox.Chain blockchain network. + +Netbox.Browser is the first web browser that does not have a centralized infrastructure: all personal data of users belong only to them and decisions on the areas of development of the product are made by the community. The Netbox.Browser infrastructure is completely transparent and distributed, as it is stored without the use of central servers in the Netbox.Chain blockchain structures. Individual addresses in the blockchain network are assigned to each web browser; these addresses can store Netbox.Coins — the currency of the Netbox.Chain blockchain network. The larger the active audience of the web browser is, the faster and more reliable transactions are conducted in the blockchain. + +## 2. Netbox.Coin Specification +- official ticker: NBX; +- max coin supply: 100 million; +- ICO: no; +- PoS: yes; +- masternodes: yes; +- masternode collateral: 10,000 NBX; +- Airdrops & referral program: yes. +- PoW phase period: 200 first blocks; +- PoW block reward: 360,000 NBX; +- PoW algorithm: Quark; +- PoS & masternodes phase period: after 200 first blocks; +- block time: 60 seconds (approx. 1,440 blocks per day); +- block size: 2MB (may increase in the future); + +Block reward after PoW stage (first 200 blocks) starts from 10 NBX decreasing 1% every single week during first 1.5 years. Later block reward is calculated automatically using formula. + +Block rewards distribution: 50% (Masternodes), 21% (PoS), 21% (Browser activity), 8% (Team). + +## 3. Netbox.Global decentralized products +#### 3.1. Netbox.Browser —web browser with pay to surf model. +The first decentralized web browser with integrated blockchain node. It includes Netbox.Wallet, which is credited with rewards for the really untraceable Internet surfing. +#### 3.2. Netbox.Chain and Netbox.Coin — blockchain network and cryptocurrency. +A distributed ledger for the operation of the Netbox.Global infrastructure and products; it is based on PoS and a masternode subnet; it uses the Netbox.Coin as an internal cryptocurrency. +#### 3.3. Netbox.Wallet — multi-currency crypto-wallet. +It is integrated into the Netbox.Browser. It features storage, exchange, and transactions using both the Netbox.Coin cryptocurrency and other cryptocurrencies (Bitcoin, Ethereum). +#### 3.4. Netbox.Pay — payment gateway. +Payment transactions in online stores; issuance of payment cards for offline transactions; automatic top-up of the card account using cryptocurrency accounts. +#### 3.5. Netbox.Vote — initiative and voting tool. +A mechanism built into the Netbox.Chain for managing the development of the Netbox.Global project. +#### 3.6. Netbox.Trust — website trust rating. +Blockchain-based web pages rating done by users and for users. +#### 3.7. Netbox.Video — blockchain video hosting service. +A video hosting service based on a distributed storage space and a distributed index located within the blockchain +#### 3.8. Netbox.Drive — distributed cloud storage. +Cloud storage for user files based on a distributed storage space and distributed index located within the blockchain. +#### 3.9. Netbox.Proxy — distributed proxy. +A client node network to provide untraceable Internet access using the Netbox.Browser. +#### 3.10. Netbox.Store — distributed application marketplace. +A dApp store for free and safe distributed applications usage in the Netbox.Browser. + +## 4. Masternodes +Masternodes have the following features: +- ensure regular income for their owners; +- ensure the privacy of transactions by mixing coins on masternodes; +- decentralized voting through the Netbox.Vote mechanism; +- Shall always be online, have a static IP address and a fixed port; +- Netbox.Coins allocated to enable the masternode are not stored in the masternode; thus, in case of a successful attack on the server, where the masternode is located, 10,000 Netbox.Coin allocated by the user to create it will remain safe. + +## 5. Staking Coins +There are two main ways to stake your NBX: +- using traditional core wallet interface; +- using Netbox.Wallet which is integrated into Netbox.Browser you may stake any amount you wish with the Netbox Staking Pool. + +## 6. Free Netbox.Coins for everyone +You will be rewarded for the following actions: +- install Netbox.Browser and sign in your Netbox.Wallet — 20 NBX; +- invite your friends with the Referral program — each of you will get 10 NBX; +- get paid to surf — browse the web the way you got used to and get rewarded. The more time you spend in Netbox.Browser, the more Netbox.Coins you get. + +## 7. Team +We are a team of professionals with longterm experience in fintech, software development and blockchain. + +Our mission is to start and develop high-technological online projects. + +Management team, Advisory Board and Senior specialists have led tech companies, startups, consulting firms, and been in management positions at public companies such as «Mail.ru Group», «Rambler&Co», «Raison.ai» and others. + +## 8. Contacts +Join us and stay tuned: +- Telegram: https://t.me/netboxglobal +- Discord: https://discord.gg/GCgZZPN +- Twitter: https://twitter.com/netboxglobal +- Linkedin: https://www.linkedin.com/company/netboxglobal +- BitcoinTalk: https://bitcointalk.org/index.php?topic= +- Medium: https://medium.com/@netboxglobal +- YouTube: https://tinyurl.com/netboxglobal + + +- Website, WhitePaper, Team: http://netbox.global +- Explorer: http://explorer.netbox.global +- Browser with wallet: https://cdn.netbox.global/download/netbox.exe +- Wallets: https://github.com/netboxglobal diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index c0c87dafd824f..3c5c45cc5ac47 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; pivx-qt frontend will not be built]) + AC_MSG_WARN([$1; netboxwallet 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|qt5|auto@:>@], - [build pivx-qt GUI (default=auto)])], + [build netboxwallet GUI (default=auto)])], [ bitcoin_qt_want_version=$withval if test "x$bitcoin_qt_want_version" = xyes; then diff --git a/build-aux/m4/gmp.m4 b/build-aux/m4/gmp.m4 deleted file mode 100644 index 60fa06b44e725..0000000000000 --- a/build-aux/m4/gmp.m4 +++ /dev/null @@ -1,16 +0,0 @@ -dnl Copyright (c) 2018 The PIVX Core developers -dnl Distributed under the MIT software license, see the accompanying -dnl file COPYING or http://www.opensource.org/licenses/mit-license.php. - -dnl -AC_DEFUN([GMP_CHECK],[ -if test x"$has_gmp" != x"yes"; then - AC_CHECK_HEADER(gmp.h,[ - AC_CHECK_LIB(gmp, __gmpz_init,[ - has_gmp=yes; - LIBS="$LIBS -lgmp"; - AC_DEFINE(HAVE_LIBGMP, 1, [Define this symbol if libgmp is installed]) - ]) - ]) -fi -]) diff --git a/configure.ac b/configure.ac index abfaf4835916a..c9711343cddc9 100644 --- a/configure.ac +++ b/configure.ac @@ -2,20 +2,20 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 3) define(_CLIENT_VERSION_MINOR, 3) -define(_CLIENT_VERSION_REVISION, 99) +define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_IS_RELEASE, false) -define(_COPYRIGHT_YEAR, 2018) -AC_INIT([Pivx Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[www.pivx.org],[pivx]) +define(_CLIENT_VERSION_IS_RELEASE, true) +define(_COPYRIGHT_YEAR, 2019) +AC_INIT([Netbox.Global],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[netbox.global],[nbx]) AC_CONFIG_SRCDIR([src/main.cpp]) -AC_CONFIG_HEADERS([src/config/pivx-config.h]) +AC_CONFIG_HEADERS([src/config/nbx-config.h]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([build-aux/m4]) -BITCOIN_DAEMON_NAME=pivxd -BITCOIN_GUI_NAME=pivx-qt -BITCOIN_CLI_NAME=pivx-cli -BITCOIN_TX_NAME=pivx-tx +BITCOIN_DAEMON_NAME=nbxd +BITCOIN_GUI_NAME=netboxwallet +BITCOIN_CLI_NAME=nbx-cli +BITCOIN_TX_NAME=nbx-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]) @@ -202,12 +202,6 @@ AC_ARG_ENABLE([zmq], [use_zmq=$enableval], [use_zmq=yes]) -AC_ARG_WITH([zerocoin-bignum], - [AS_HELP_STRING([--with-zerocoin-bignum=gmp|openssl|auto], - [Specify Bignum Implementation. Default is auto])], - [req_bignum=$withval], - [req_bignum=auto]) - AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[specify protoc bin path])], [protoc_bin_path=$withval], []) AC_ARG_ENABLE(man, @@ -400,7 +394,7 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS" AC_ARG_WITH([utils], [AS_HELP_STRING([--with-utils], - [build pivx-cli pivx-tx (default=yes)])], + [build nbx-cli nbx-tx (default=yes)])], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -412,7 +406,7 @@ AC_ARG_WITH([libs], AC_ARG_WITH([daemon], [AS_HELP_STRING([--with-daemon], - [build pivxd daemon (default=yes)])], + [build nbxd daemon (default=yes)])], [build_bitcoind=$withval], [build_bitcoind=yes]) @@ -626,7 +620,7 @@ AC_C_BIGENDIAN dnl Check for pthread compile/link requirements AX_PTHREAD -# The following macro will add the necessary defines to pivx-config.h, but +# The following macro will add the necessary defines to nbx-config.h, but # they also need to be passed down to any subprojects. Pull the results out of # the cache and add them to CPPFLAGS. AC_SYS_LARGEFILE @@ -1155,11 +1149,11 @@ AC_SUBST(UNIVALUE_LIBS) BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) -AC_MSG_CHECKING([whether to build pivxd]) +AC_MSG_CHECKING([whether to build nbxd]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) -AC_MSG_CHECKING([whether to build utils (pivx-cli pivx-tx)]) +AC_MSG_CHECKING([whether to build utils (nbx-cli nbx-tx)]) AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) AC_MSG_RESULT($build_bitcoin_utils) @@ -1192,32 +1186,6 @@ if test "x$use_ccache" = "xyes"; then AX_CHECK_PREPROC_FLAG([-Qunused-arguments],[CPPFLAGS="-Qunused-arguments $CPPFLAGS"]) fi -dnl bignum value -set_bignum=$req_bignum -case $req_bignum in -auto) - GMP_CHECK - if test x"$has_gmp" != x"yes"; then - AC_MSG_ERROR([gmp bignum automatically selected but libgmp is not available. Use depends, - install libgmp or select an other bignum implementation (ONLY gmp is fully SUPPORTED)]) - else - set_bignum=gmp - fi - ;; -gmp) - GMP_CHECK - if test x"$has_gmp" != x"yes"; then - AC_MSG_ERROR([gmp bignum explicitly requested but libgmp is not available]) - fi - ;; -openssl) - AC_MSG_WARN([openssl bignum explicitly requested. This is DEPRECATED.]) - ;; -*) - AC_MSG_ERROR([invalid bignum implementation selection]) - ;; -esac - dnl enable wallet AC_MSG_CHECKING([if wallet should be enabled]) if test x$enable_wallet != xno; then @@ -1286,7 +1254,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_pivx-qt]) + AC_MSG_CHECKING([whether to build test_nbx-qt]) if test x$use_gui_tests$bitcoin_enable_qt_test = xyesyes; then AC_MSG_RESULT([yes]) BUILD_TEST_QT="yes" @@ -1297,23 +1265,7 @@ fi AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"]) -# select bignum implementation -case $set_bignum in -gmp) - AC_DEFINE(USE_NUM_GMP, 1, [Define this symbol to use the gmp implementation]) - ;; -openssl) - AC_DEFINE(USE_NUM_OPENSSL, 1, [Define this symbol to use openssl implementation]) - ;; -*) - AC_MSG_ERROR([invalid bignum implementation]) - ;; -esac - -AM_CONDITIONAL([USE_NUM_GMP], [test "x$set_bignum" = "xgmp"]) -AM_CONDITIONAL([USE_NUM_OPENSSL], [test "x$set_bignum" = "xopenssl"]) - -AC_MSG_CHECKING([whether to build test_pivx]) +AC_MSG_CHECKING([whether to build test_nbx]) if test x$use_tests = xyes; then AC_MSG_RESULT([yes]) BUILD_TEST="yes" @@ -1403,8 +1355,6 @@ AC_SUBST(EVENT_PTHREADS_LIBS) AC_SUBST(ZMQ_LIBS) AC_SUBST(PROTOBUF_LIBS) AC_SUBST(QR_LIBS) -AC_SUBST(USE_NUM_GMP) -AC_SUBST(USE_NUM_OPENSSL) AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist test/config.ini]) AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh]) AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])]) @@ -1472,7 +1422,6 @@ if test x$bitcoin_enable_qt != xno; then echo " with qr = $use_qr" fi echo " with zmq = $use_zmq" -echo " with bignum = $set_bignum" echo " with test = $use_tests" echo " with bench = $use_bench" echo " with upnp = $use_upnp" diff --git a/contrib/bitrpc/bitrpc.py b/contrib/bitrpc/bitrpc.py index 8515b0c2cc915..5fa59430ec5ae 100644 --- a/contrib/bitrpc/bitrpc.py +++ b/contrib/bitrpc/bitrpc.py @@ -11,9 +11,9 @@ if rpcpass == "": - access = ServiceProxy("http://127.0.0.1:51473") + access = ServiceProxy("http://127.0.0.1:28735") else: - access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:51473") + access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:28735") cmd = sys.argv[1].lower() if cmd == "backupwallet": diff --git a/contrib/debian/README.md b/contrib/debian/README.md index 69b26793d10c4..08a50d52b3b20 100644 --- a/contrib/debian/README.md +++ b/contrib/debian/README.md @@ -1,21 +1,21 @@ Debian ==================== -This directory contains files used to package pivxd/pivx-qt -for Debian-based Linux systems. If you compile pivxd/pivx-qt yourself, there are some useful files here. +This directory contains files used to package nbxd/netboxwallet +for Debian-based Linux systems. If you compile nbxd/netboxwallet yourself, there are some useful files here. -## pivx: URI support ## +## nbx: URI support ## -pivx-qt.desktop (Gnome / Open Desktop) +netboxwallet.desktop (Gnome / Open Desktop) To install: - sudo desktop-file-install pivx-qt.desktop + sudo desktop-file-install netboxwallet.desktop sudo update-desktop-database If you build yourself, you will either need to modify the paths in -the .desktop file or copy or symlink your pivx-qt binary to `/usr/bin` -and the `../../share/pixmaps/pivx128.png` to `/usr/share/pixmaps` +the .desktop file or copy or symlink your netboxwallet binary to `/usr/bin` +and the `../../share/pixmaps/nbx128.png` to `/usr/share/pixmaps` -pivx-qt.protocol (KDE) +netboxwallet.protocol (KDE) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index c8d2b44bc3c8d..b14566a61ef30 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,5 +1,3 @@ -pivx (3.2.0-trusty1) trusty; urgency=medium +nbxd (3.3.0-trusty1) trusty; urgency=medium - * PIVX Core v3.2.0 (trusty). - - -- Fuzzbawls Fri, 12 Apr 2019 12:01:00 -0700 + * Netbox.Wallet v3.3.0 (trusty). diff --git a/contrib/debian/control b/contrib/debian/control index 646a35040bbc2..7b0ac1129cd8a 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -32,11 +32,11 @@ Homepage: http://www.pivx.org Vcs-Git: git://github.com/PIVX-Project/PIVX.git Vcs-Browser: http://github.com/PIVX-Project/PIVX -Package: pivxd +Package: nbxd Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - daemon - PIVX is a free open source peer-to-peer electronic cash system that + Netbox.Wallet 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 @@ -45,14 +45,14 @@ Description: peer-to-peer network based digital currency - daemon Full transaction history is stored locally at each client. This requires 10+ GB of space, slowly growing. . - This package provides the daemon, pivxd, and the CLI tool - pivx-cli to interact with the daemon. + This package provides the daemon, nbxd, and the CLI tool + nbx-cli to interact with the daemon. -Package: pivx-qt +Package: nbx-qt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: peer-to-peer network based digital currency - Qt GUI - PIVX is a free open source peer-to-peer electronic cash system that + Netbox.Wallet 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 @@ -61,4 +61,4 @@ Description: peer-to-peer network based digital currency - Qt GUI Full transaction history is stored locally at each client. This requires 10+ GB of space, slowly growing. . - This package provides Pivx-Qt, a GUI for PIVX based on Qt. + This package provides Netbox.Wallet-Qt, a GUI for Netbox.Wallet based on Qt. diff --git a/contrib/debian/copyright b/contrib/debian/copyright index b45222e5d30fd..84e9883edb703 100644 --- a/contrib/debian/copyright +++ b/contrib/debian/copyright @@ -65,7 +65,7 @@ Copyright: http://www.everaldo.com License: LGPL Comment: Icon Pack: Crystal SVG -Files: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png +Files: src/qt/res/icons/nbx.png, src/qt/res/icons/toolbar.png Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan) License: PUB-DOM Comment: Site: https://bitcointalk.org/?topic=1756.0 diff --git a/contrib/debian/examples/pivx.conf b/contrib/debian/examples/nbx.conf similarity index 83% rename from contrib/debian/examples/pivx.conf rename to contrib/debian/examples/nbx.conf index e1fa247e003fa..0faad187450b4 100644 --- a/contrib/debian/examples/pivx.conf +++ b/contrib/debian/examples/nbx.conf @@ -1,10 +1,10 @@ ## -## pivx.conf configuration file. Lines beginning with # are comments. +## nbx.conf configuration file. Lines beginning with # are comments. ## # Network-related settings: -# Run on the test network instead of the real pivx network. +# Run on the test network instead of the real NBX network. #testnet=0 # Run a regression test network @@ -38,11 +38,11 @@ # Use as many addnode= settings as you like to connect to specific peers #addnode=69.164.218.197 -#addnode=10.0.0.2:51472 +#addnode=10.0.0.2:28734 # 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:51472 +#connect=10.0.0.1:28734 # Listening mode, enabled by default except when 'connect' is being used #listen=1 @@ -51,10 +51,10 @@ #maxconnections= # -# JSON-RPC options (for controlling a running Pivx/pivxd process) +# JSON-RPC options (for controlling a running netboxwallet/nbxd process) # -# server=1 tells Pivx-QT and pivxd to accept JSON-RPC commands +# server=1 tells netboxwallet and nbxd to accept JSON-RPC commands #server=0 # You must set rpcuser and rpcpassword to secure the JSON-RPC api @@ -72,16 +72,16 @@ # NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED, # because the rpcpassword is transmitted over the network unencrypted. -# server=1 tells Pivx-QT to accept JSON-RPC commands. -# it is also read by pivxd to determine if RPC should be enabled +# server=1 tells netboxwallet to accept JSON-RPC commands. +# it is also read by nbxd to determine if RPC should be enabled #rpcallowip=10.1.1.34/255.255.255.0 #rpcallowip=1.2.3.4/24 #rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96 # Listen for RPC connections on this TCP port: -#rpcport=51473 +#rpcport=28735 -# You can use Pivx or pivxd to send commands to Pivx/pivxd +# You can use netboxwallet or nbxd to send commands to netboxwallet/nbxd # running on another host using this option: #rpcconnect=127.0.0.1 @@ -91,14 +91,14 @@ # both prior transactions and several dozen future transactions. #keypool=100 -# Pay an optional transaction fee every time you send PIVs. Transactions with fees +# Pay an optional transaction fee every time you send NBXs. Transactions with fees # are more likely than free transactions to be included in generated blocks, so may # be validated sooner. #paytxfee=0.00 # User interface options -# Start Pivx minimized +# Start Netbox.Wallet minimized #min=1 # Minimize to the system tray diff --git a/contrib/debian/nbxd.bash-completion b/contrib/debian/nbxd.bash-completion new file mode 100644 index 0000000000000..36c1c064c52ea --- /dev/null +++ b/contrib/debian/nbxd.bash-completion @@ -0,0 +1,2 @@ +contrib/nbxd.bash-completion nbxd +contrib/nbx-cli.bash-completion nbx-cli diff --git a/contrib/debian/nbxd.examples b/contrib/debian/nbxd.examples new file mode 100644 index 0000000000000..5e3e27bc7fe89 --- /dev/null +++ b/contrib/debian/nbxd.examples @@ -0,0 +1 @@ +debian/examples/nbx.conf diff --git a/contrib/debian/nbxd.install b/contrib/debian/nbxd.install new file mode 100644 index 0000000000000..6bd49154d1521 --- /dev/null +++ b/contrib/debian/nbxd.install @@ -0,0 +1,2 @@ +usr/local/bin/nbxd usr/bin +usr/local/bin/nbx-cli usr/bin diff --git a/contrib/debian/pivxd.lintian-overrides b/contrib/debian/nbxd.lintian-overrides similarity index 55% rename from contrib/debian/pivxd.lintian-overrides rename to contrib/debian/nbxd.lintian-overrides index a02eaed3fcca0..ee950577d6404 100644 --- a/contrib/debian/pivxd.lintian-overrides +++ b/contrib/debian/nbxd.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -pivxd: possible-gpl-code-linked-with-openssl +nbxd: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/nbxd.manpages b/contrib/debian/nbxd.manpages new file mode 100644 index 0000000000000..318d3b623c416 --- /dev/null +++ b/contrib/debian/nbxd.manpages @@ -0,0 +1,2 @@ +debian/manpages/nbxd.1 +debian/manpages/nbx.conf.5 diff --git a/contrib/debian/pivxd.postinst b/contrib/debian/nbxd.postinst similarity index 73% rename from contrib/debian/pivxd.postinst rename to contrib/debian/nbxd.postinst index c76afa77728a3..c9c6cb202cb0d 100644 --- a/contrib/debian/pivxd.postinst +++ b/contrib/debian/nbxd.postinst @@ -1,15 +1,15 @@ #!/bin/sh -# setup pivx account, homedir etc +# setup nbx account, homedir etc set -e -BCUSER="pivx" -BCHOME="/var/lib/pivx" +BCUSER="nbx" +BCHOME="/var/lib/nbx" if [ "$1" = "configure" ]; then - # Add pivx user/group - this will gracefully abort if the user already exists. + # Add nbx user/group - this will gracefully abort if the user already exists. # A homedir is never created. set +e adduser --system --home "${BCHOME}" --no-create-home --group "${BCUSER}" 2>/dev/null diff --git a/contrib/debian/pivxd.postrm b/contrib/debian/nbxd.postrm similarity index 77% rename from contrib/debian/pivxd.postrm rename to contrib/debian/nbxd.postrm index f287afd1785ef..126d36b8e6313 100644 --- a/contrib/debian/pivxd.postrm +++ b/contrib/debian/nbxd.postrm @@ -4,12 +4,12 @@ set -e -BCUSER="pivx" -BCHOME="/var/lib/pivx" +BCUSER="nbx" +BCHOME="/var/lib/nbx" if [ "$1" = "purge" ]; then - # The pivx user is left in place for now - This is to ensure that a new user + # The nbx user is left in place for now - This is to ensure that a new user # will not inherit the users UID/GID and inadvertently gain access to wallets etc # The homedir is also left intact to ensure that we don't accidentally delete a @@ -17,7 +17,7 @@ if [ "$1" = "purge" ]; then echo echo "#" - echo "# The pivx user (${BCUSER}) and data dir (${BCHOME})" + echo "# The nbx user (${BCUSER}) and data dir (${BCHOME})" echo "# were left intact." echo "#" echo "# Make sure to check \"${BCHOME}\" for wallets and other" diff --git a/contrib/debian/pivxd.service b/contrib/debian/nbxd.service similarity index 77% rename from contrib/debian/pivxd.service rename to contrib/debian/nbxd.service index 0864f7806beae..87b1d7a32453f 100644 --- a/contrib/debian/pivxd.service +++ b/contrib/debian/nbxd.service @@ -1,23 +1,23 @@ # It is not recommended to modify this file in-place, because it will # be overwritten during package upgrades. If you want to add further # options or overwrite existing ones then use -# $ systemctl edit pivxd.service +# $ systemctl edit nbxd.service # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /etc/pivx/pivx.conf +# /etc/nbx/nbx.conf [Unit] -Description=PIVX daemon +Description=NBX daemon After=network.target [Service] -ExecStart=/usr/bin/pivxd -daemon -datadir=/var/lib/pivx -conf=/etc/pivx/pivx.conf -pid=/run/pivxd/pivxd.pid -# Creates /run/pivxd owned by pivx -RuntimeDirectory=pivxd -User=pivx +ExecStart=/usr/bin/nbxd -daemon -datadir=/var/lib/nbx -conf=/etc/nbx/nbx.conf -pid=/run/nbxd/nbxd.pid +# Creates /run/nbxd owned by nbx +RuntimeDirectory=nbxd +User=nbx Type=forking -PIDFile=/run/pivxd/pivxd.pid +PIDFile=/run/nbxd/nbxd.pid Restart=on-failure # Hardening measures diff --git a/contrib/debian/netboxwallet.desktop b/contrib/debian/netboxwallet.desktop new file mode 100644 index 0000000000000..40a5ce8a745e7 --- /dev/null +++ b/contrib/debian/netboxwallet.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Netbox.Wallet +Comment=Netbox.Wallet P2P Cryptocurrency +Comment[fr]=Netbox.Wallet, monnaie virtuelle cryptographique pair à pair +Comment[tr]=Netbox.Wallet, eşten eşe kriptografik sanal para birimi +Exec=netboxwallet %u +Terminal=false +Type=Application +Icon=nbx128 +MimeType=x-scheme-handler/nbx; +Categories=Office;Finance; diff --git a/contrib/debian/netboxwallet.install b/contrib/debian/netboxwallet.install new file mode 100644 index 0000000000000..f7c6244f33996 --- /dev/null +++ b/contrib/debian/netboxwallet.install @@ -0,0 +1,6 @@ +usr/local/bin/netboxwallet usr/bin +share/pixmaps/nbx32.xpm usr/share/pixmaps +share/pixmaps/nbx16.xpm usr/share/pixmaps +share/pixmaps/nbx128.png usr/share/pixmaps +debian/netboxwallet.desktop usr/share/applications +debian/netboxwallet.protocol usr/share/kde4/services/ diff --git a/contrib/debian/pivx-qt.lintian-overrides b/contrib/debian/netboxwallet.lintian-overrides similarity index 52% rename from contrib/debian/pivx-qt.lintian-overrides rename to contrib/debian/netboxwallet.lintian-overrides index ce88a1cb25dcb..3e12b5eb13220 100644 --- a/contrib/debian/pivx-qt.lintian-overrides +++ b/contrib/debian/netboxwallet.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -pivx-qt: possible-gpl-code-linked-with-openssl +netboxwallet: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/netboxwallet.manpages b/contrib/debian/netboxwallet.manpages new file mode 100644 index 0000000000000..8dd31eef3ff76 --- /dev/null +++ b/contrib/debian/netboxwallet.manpages @@ -0,0 +1 @@ +doc/man/nbx-qt.1 diff --git a/contrib/debian/pivx-qt.protocol b/contrib/debian/netboxwallet.protocol similarity index 75% rename from contrib/debian/pivx-qt.protocol rename to contrib/debian/netboxwallet.protocol index e3d85451af349..6a1b95079cb86 100644 --- a/contrib/debian/pivx-qt.protocol +++ b/contrib/debian/netboxwallet.protocol @@ -1,6 +1,6 @@ [Protocol] -exec=pivx-qt '%u' -protocol=pivx +exec=netboxwallet '%u' +protocol=nbx input=none output=none helper=true diff --git a/contrib/debian/pivx-qt.desktop b/contrib/debian/pivx-qt.desktop deleted file mode 100644 index 88ac3499a745a..0000000000000 --- a/contrib/debian/pivx-qt.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=PIVX Core -Comment=PIVX P2P Cryptocurrency -Comment[fr]=PIVX, monnaie virtuelle cryptographique pair à pair -Comment[tr]=PIVX, eşten eşe kriptografik sanal para birimi -Exec=pivx-qt %u -Terminal=false -Type=Application -Icon=pivx128 -MimeType=x-scheme-handler/pivx; -Categories=Office;Finance; -StartupWMClass=Pivx-qt diff --git a/contrib/debian/pivx-qt.install b/contrib/debian/pivx-qt.install deleted file mode 100644 index e0e1ef9ce545b..0000000000000 --- a/contrib/debian/pivx-qt.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/local/bin/pivx-qt usr/bin -share/pixmaps/pivx32.xpm usr/share/pixmaps -share/pixmaps/pivx16.xpm usr/share/pixmaps -share/pixmaps/pivx128.png usr/share/pixmaps -debian/pivx-qt.desktop usr/share/applications -debian/pivx-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/pivx-qt.manpages b/contrib/debian/pivx-qt.manpages deleted file mode 100644 index 9d24ea2a73e4f..0000000000000 --- a/contrib/debian/pivx-qt.manpages +++ /dev/null @@ -1 +0,0 @@ -doc/man/pivx-qt.1 diff --git a/contrib/debian/pivxd.bash-completion b/contrib/debian/pivxd.bash-completion deleted file mode 100644 index 53abdf226215b..0000000000000 --- a/contrib/debian/pivxd.bash-completion +++ /dev/null @@ -1,2 +0,0 @@ -contrib/pivxd.bash-completion pivxd -contrib/pivx-cli.bash-completion pivx-cli diff --git a/contrib/debian/pivxd.examples b/contrib/debian/pivxd.examples deleted file mode 100644 index 8b1d527272c0b..0000000000000 --- a/contrib/debian/pivxd.examples +++ /dev/null @@ -1 +0,0 @@ -debian/examples/pivx.conf diff --git a/contrib/debian/pivxd.install b/contrib/debian/pivxd.install deleted file mode 100644 index 4d848b643e6cc..0000000000000 --- a/contrib/debian/pivxd.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/local/bin/pivxd usr/bin -usr/local/bin/pivx-cli usr/bin -debian/examples/pivx.conf etc/pivx diff --git a/contrib/debian/pivxd.manpages b/contrib/debian/pivxd.manpages deleted file mode 100644 index 87128f24c40b2..0000000000000 --- a/contrib/debian/pivxd.manpages +++ /dev/null @@ -1,2 +0,0 @@ -doc/man/pivxd.1 -doc/man/pivx-cli.1 diff --git a/contrib/debian/rules b/contrib/debian/rules index 30306ef5d143e..d0efa8a269763 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -1,9 +1,9 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -#DEB_MAKE_CHECK_TARGET = test_pivx +#DEB_MAKE_CHECK_TARGET = test_nbx #build/bitcoind:: -# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_pivx) +# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_nbx) DEB_INSTALL_EXAMPLES_bitcoind += debian/examples/* DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/* @@ -13,7 +13,7 @@ DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/* override_dh_auto_clean: if [ -f Makefile ]; then $(MAKE) distclean; fi - rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/pivx-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in + rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/nbx-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in # Yea, autogen should be run on the source archive, but I like doing git archive override_dh_auto_configure: diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md index c1cc2f9cc522a..8b32986324890 100644 --- a/contrib/devtools/README.md +++ b/contrib/devtools/README.md @@ -181,10 +181,10 @@ If only supported symbols are used the return value will be 0 and the output wil If there are 'unsupported' symbols, the return value will be 1 a list like this will be printed: - .../64/test_pivx: symbol memcpy from unsupported version GLIBC_2.14 - .../64/test_pivx: symbol __fdelt_chk from unsupported version GLIBC_2.15 - .../64/test_pivx: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 - .../64/test_pivx: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 + .../64/test_nbx: symbol memcpy from unsupported version GLIBC_2.14 + .../64/test_nbx: symbol __fdelt_chk from unsupported version GLIBC_2.15 + .../64/test_nbx: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15 + .../64/test_nbx: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15 update-translations.py ====================== diff --git a/contrib/devtools/check-doc.py b/contrib/devtools/check-doc.py index 47ff4be08bfb2..0a6e8d69bbfec 100755 --- a/contrib/devtools/check-doc.py +++ b/contrib/devtools/check-doc.py @@ -22,7 +22,7 @@ REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"') REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")') # list unsupported, deprecated and duplicate args as they need no documentation -SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-sendfreetransactions', '-checklevel', '-liquidityprovider', '-anonymizepivxamount']) +SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-sendfreetransactions', '-checklevel', '-liquidityprovider']) def main(): used = check_output(CMD_GREP_ARGS, shell=True, universal_newlines=True) diff --git a/contrib/devtools/update-translations.py b/contrib/devtools/update-translations.py index 97ab9cab81920..353c260fdb997 100755 --- a/contrib/devtools/update-translations.py +++ b/contrib/devtools/update-translations.py @@ -25,7 +25,7 @@ # Name of transifex tool TX = 'tx' # Name of source language file -SOURCE_LANG = 'pivx_en.ts' +SOURCE_LANG = 'nbx_en.ts' # Directory with locale files LOCALE_DIR = 'src/qt/locale' # Minimum number of messages for translation to be considered at all @@ -207,4 +207,3 @@ def postprocess_translations(reduce_diff_hacks=False): check_at_repository_root() fetch_all_translations() postprocess_translations() - diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 5e640bff8fa5c..f915604ea69ff 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "pivx-linux-3.4" +name: "pivx-linux-3.3" enable_cache: true distro: "ubuntu" suites: diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 34b710d4b4a47..ed9b56418e1a8 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "pivx-osx-3.4" +name: "pivx-osx-3.3" enable_cache: true distro: "ubuntu" suites: diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index 789bee30ecd5b..372bc4a3a75d6 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "pivx-win-3.4" +name: "pivx-win-3.3" enable_cache: true distro: "ubuntu" suites: diff --git a/contrib/gitian-keys/gpdionisio-key.gpg b/contrib/gitian-keys/gpdionisio-key.gpg index 6fa05faf6f613..959a5f64205a4 100644 --- a/contrib/gitian-keys/gpdionisio-key.gpg +++ b/contrib/gitian-keys/gpdionisio-key.gpg @@ -1,52 +1,52 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -mQINBFrqW0gBEADPbrRjoFm2MbhQc0e5NfnxpvT2ECwaPdRFC8moGv4hv06fXigU -k+3rHHEesaNbmHWUSZsmyGjcgp/nx5CtZRshSjXV+Zu0YJcKZ6MDug5sF6g3LpGJ -6YDd0f5ey8r6yo+eVtLewRBqB8b10/GkVfDSj6usjZQULvUigOEUsFCqFqKCC+Qo -3enKBA9tUK1BYJZsf8Pis5+crRodRDOC81s2Xl49iof8TLNxpVGbQE4DlgYVf0i+ -3zwq+f/+G/QLVORy5glxho3CPX8pjsofHKIjQEDsWOPi3sS9JXIhQfKc5p+bEvar -41EXedC0oAbP1Wu5tqxZkdn25zb7tHXEBF/Up/AMt0lCuKT4DHEddKvay4fSxeyD -pUOY3nTyDbTAy1E3atwzdkxwEnklcmwKbvfFYIr7DCEXUiB1t0DILdiHfEeto+ap -GwAB336+94Etrj4hFuIpic7ZqAovpSX0FO+5M/CvWYwf9egmHMvkaRAfIHrAAPET -cngp7UMMScQEIlKdjM+dlnOSpMjQI1GxyUKBKkVNrLgyv+DXXhgSkHZIBbbqRhEy -QLENV4kATX3uoAS79dGrB9cp96OmF6yKcWg3rttGOa2cqC3wRipdzY6YRv9gPERj -trtXMulBU05fHRZAJ92OUFWPt1aubUIGRWR4OdSc71c8gQheVJcAIQyUZwARAQAB -tDxncGRpb25pc2lvIChyYW5kb20uemVicmEpIDxnaWFucGllcm8uZGlvbmlzaW9A -cHJvdG9ubWFpbC5jaD6JAjgEEwECACIFAlrqW0gCGwMGCwkIBwMCBhUIAgkKCwQW -AgMBAh4BAheAAAoJEAMuOraC5K+FmksP/1Mar6qJpZJlfv5Ius6X8Bk04hc0Nygg -nK4cQR8/q450u3nHS5jutthPgZdcvwD4a51jt6QUT4YWBbO/ZrtAC9Ckorr3MuiU -2x4thNTTW+4xBFLRjlF4cVKfXKsV5J27w1DvXYNR1YHUm59bmW1c5OMYE7mCO6kp -Mx9ebvTOrw4WnIPalCSc7qw0gkeo17/ZtPJNYYyFKqTIYRU5dXhxnBzIFdoLW4Tw -3h+WY/XyJi3ru1uw3oiCo2hxxD4CD+3umpOiM3J7HEUq3kqlHcc8rb99lDx1LuqJ -ijvYAyUMEFZuXbHdWPKUTxWLmdZ0Kiqsjh83Igp5D9UxCvBJH2KB1Lo23vxiTMlN -hXa6Vzs12pSp/xSsWypC7QHCKeqDEWKb4kRhcUmzz+k0oV2pgH3+fxY3ORGRcIft -Esg7Cf9fTB81yvPKOPleFKExh4RzY0rkZmFXXKVV4KB/3vPeafjgUSnVS+0So+bg -roJJo1wH4tmlrq8rJTJrcESZX1r5R9ubBeSZWgO4dp6MYegWjnbtqhDVHarMxOqF -i1rpap+8r2Fy82qlRL+QhR4RunpB27R2kgg+VbZIBsYmxJuiMUlHII97ufVCsfye -swbwUFqQ4bBL+JGoEQJdwKcQ+WhXfnjhFGqiTVe4mUI76Ld2L64jQLEoNU19tMXO -WudHj6ccSlNwuQINBFrqW0gBEADRD52ke0YkffQTN98KhXYrnY2IwAXN+ARhck/Z -VeGt7LjgjGaTLyIiwFRZ89TERv4nLNEFzuWXqdvOOP+H9340GAA1hYGg/uVVapxq -P5IYIPHjHnzeCK4UBid2vAgZSuhLMY7DQpch+aYkdmBBc6gVsrfMj691rSvVEM7k -lLzWkTocLBzH/0UBf9Z1i/Q7vRfRNSZRWo35/NipbO/W78JPJEgIkx2/wjpIW+BA -xWTX9rKK8yHl8hkCQGkiaYAjMC62limcjc+IsC1FleL4XATiExNF134exrbiyiFr -PHppQvLAkktyNtThhfaPdSK20w0AUtQouVHlmbZjvyIyfMUbHjd04euPWZM/lGWi -T4544P17jdR9sskDwPvBsl3kCJ+vc2AISUkHoD0+gisC3hLPAgPzk6b+jRhUqfyi -RMdrNjQjgpUKTgY698p8MowbeAlu2QHp+kMJj5qr/Q+CFQPRWoGEdB4j8mlL1ake -/93j1TVY5DTFv3IK/uiCJEyj5uee2Q5DUwhtV5qZBBZuHSBIlLhePYWILFV4HUJN -vHDR7zMPfNp+I0At02ko3v/Kb2BfZTuQJ3IMnvB5PGkw0yQMRNnY4p600WOACwv9 -Kfiw4/MpML0s+HhV6+ZWlxONaK6GEKEFWfwqCpbu1DP++QtnQWJK7qLt+zC2KcSI -+nm9FQARAQABiQIfBBgBAgAJBQJa6ltIAhsMAAoJEAMuOraC5K+FJCwP/3p0vmje -d2t7nDLITXv+RajT+uUMvySBLNxFTi7U83ZK6yfN922050s6JiD0CpNVUB48iXUU -OIRkVIcmSSavnZQpc7BsozVcAAzw5QO3BVNfPqKdpyLXZ0wgGyACEEhLY5lXU7kg -c59TREiCx84cKXCqsJi5/CazMxL+FU0ZB74HLtuilfQmISkjzMaIf4gGhYIZQaV5 -/amBWoR9JKHSZuB5FzDWIVZzhkyN/SHS0pRQHTpVxfdoKpMq6eJYZDRMTeQ2bO45 -FiZipt4CGok1rQ5DfzDkzOPPt4F5Yau/jeSh7m1nOAJ97/Xn8nE9W8bqxSHScqUc -66gJwj7/tMN3pCgDP0ztrpyAjuXHk1LTeIydoCTtFoOCBvNHmUq4O17LnF8xEwNF -DkcfCooyfQijzapxD/ZH/TJAcAQUMX+rcM9SJSY8YCV0dyQgtYBlC01cJky2mwEe -SOUQsrP2fHHhdrXdmDd/IccMKK0ZVhm7iJRYHsVeqg3ISRtjcYtHtReaK4im4+qk -7oc/+S8HTCP+ybtzN7E+5QTVXEGFXU1lcS0xST0Ue8fgsibeYx9tsnp5w3qJJClJ -mtc+RhQVjKt9mNuPT0rMdNk/v2ibLzN/PYhueRYy6iP1hMU+NdiphaNWY0DNmO8n -8C9XZfWXj3OSfD45FeqISCGE0RSKSzff1yf5 -=tKJr ------END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFrqW0gBEADPbrRjoFm2MbhQc0e5NfnxpvT2ECwaPdRFC8moGv4hv06fXigU +k+3rHHEesaNbmHWUSZsmyGjcgp/nx5CtZRshSjXV+Zu0YJcKZ6MDug5sF6g3LpGJ +6YDd0f5ey8r6yo+eVtLewRBqB8b10/GkVfDSj6usjZQULvUigOEUsFCqFqKCC+Qo +3enKBA9tUK1BYJZsf8Pis5+crRodRDOC81s2Xl49iof8TLNxpVGbQE4DlgYVf0i+ +3zwq+f/+G/QLVORy5glxho3CPX8pjsofHKIjQEDsWOPi3sS9JXIhQfKc5p+bEvar +41EXedC0oAbP1Wu5tqxZkdn25zb7tHXEBF/Up/AMt0lCuKT4DHEddKvay4fSxeyD +pUOY3nTyDbTAy1E3atwzdkxwEnklcmwKbvfFYIr7DCEXUiB1t0DILdiHfEeto+ap +GwAB336+94Etrj4hFuIpic7ZqAovpSX0FO+5M/CvWYwf9egmHMvkaRAfIHrAAPET +cngp7UMMScQEIlKdjM+dlnOSpMjQI1GxyUKBKkVNrLgyv+DXXhgSkHZIBbbqRhEy +QLENV4kATX3uoAS79dGrB9cp96OmF6yKcWg3rttGOa2cqC3wRipdzY6YRv9gPERj +trtXMulBU05fHRZAJ92OUFWPt1aubUIGRWR4OdSc71c8gQheVJcAIQyUZwARAQAB +tDxncGRpb25pc2lvIChyYW5kb20uemVicmEpIDxnaWFucGllcm8uZGlvbmlzaW9A +cHJvdG9ubWFpbC5jaD6JAjgEEwECACIFAlrqW0gCGwMGCwkIBwMCBhUIAgkKCwQW +AgMBAh4BAheAAAoJEAMuOraC5K+FmksP/1Mar6qJpZJlfv5Ius6X8Bk04hc0Nygg +nK4cQR8/q450u3nHS5jutthPgZdcvwD4a51jt6QUT4YWBbO/ZrtAC9Ckorr3MuiU +2x4thNTTW+4xBFLRjlF4cVKfXKsV5J27w1DvXYNR1YHUm59bmW1c5OMYE7mCO6kp +Mx9ebvTOrw4WnIPalCSc7qw0gkeo17/ZtPJNYYyFKqTIYRU5dXhxnBzIFdoLW4Tw +3h+WY/XyJi3ru1uw3oiCo2hxxD4CD+3umpOiM3J7HEUq3kqlHcc8rb99lDx1LuqJ +ijvYAyUMEFZuXbHdWPKUTxWLmdZ0Kiqsjh83Igp5D9UxCvBJH2KB1Lo23vxiTMlN +hXa6Vzs12pSp/xSsWypC7QHCKeqDEWKb4kRhcUmzz+k0oV2pgH3+fxY3ORGRcIft +Esg7Cf9fTB81yvPKOPleFKExh4RzY0rkZmFXXKVV4KB/3vPeafjgUSnVS+0So+bg +roJJo1wH4tmlrq8rJTJrcESZX1r5R9ubBeSZWgO4dp6MYegWjnbtqhDVHarMxOqF +i1rpap+8r2Fy82qlRL+QhR4RunpB27R2kgg+VbZIBsYmxJuiMUlHII97ufVCsfye +swbwUFqQ4bBL+JGoEQJdwKcQ+WhXfnjhFGqiTVe4mUI76Ld2L64jQLEoNU19tMXO +WudHj6ccSlNwuQINBFrqW0gBEADRD52ke0YkffQTN98KhXYrnY2IwAXN+ARhck/Z +VeGt7LjgjGaTLyIiwFRZ89TERv4nLNEFzuWXqdvOOP+H9340GAA1hYGg/uVVapxq +P5IYIPHjHnzeCK4UBid2vAgZSuhLMY7DQpch+aYkdmBBc6gVsrfMj691rSvVEM7k +lLzWkTocLBzH/0UBf9Z1i/Q7vRfRNSZRWo35/NipbO/W78JPJEgIkx2/wjpIW+BA +xWTX9rKK8yHl8hkCQGkiaYAjMC62limcjc+IsC1FleL4XATiExNF134exrbiyiFr +PHppQvLAkktyNtThhfaPdSK20w0AUtQouVHlmbZjvyIyfMUbHjd04euPWZM/lGWi +T4544P17jdR9sskDwPvBsl3kCJ+vc2AISUkHoD0+gisC3hLPAgPzk6b+jRhUqfyi +RMdrNjQjgpUKTgY698p8MowbeAlu2QHp+kMJj5qr/Q+CFQPRWoGEdB4j8mlL1ake +/93j1TVY5DTFv3IK/uiCJEyj5uee2Q5DUwhtV5qZBBZuHSBIlLhePYWILFV4HUJN +vHDR7zMPfNp+I0At02ko3v/Kb2BfZTuQJ3IMnvB5PGkw0yQMRNnY4p600WOACwv9 +Kfiw4/MpML0s+HhV6+ZWlxONaK6GEKEFWfwqCpbu1DP++QtnQWJK7qLt+zC2KcSI ++nm9FQARAQABiQIfBBgBAgAJBQJa6ltIAhsMAAoJEAMuOraC5K+FJCwP/3p0vmje +d2t7nDLITXv+RajT+uUMvySBLNxFTi7U83ZK6yfN922050s6JiD0CpNVUB48iXUU +OIRkVIcmSSavnZQpc7BsozVcAAzw5QO3BVNfPqKdpyLXZ0wgGyACEEhLY5lXU7kg +c59TREiCx84cKXCqsJi5/CazMxL+FU0ZB74HLtuilfQmISkjzMaIf4gGhYIZQaV5 +/amBWoR9JKHSZuB5FzDWIVZzhkyN/SHS0pRQHTpVxfdoKpMq6eJYZDRMTeQ2bO45 +FiZipt4CGok1rQ5DfzDkzOPPt4F5Yau/jeSh7m1nOAJ97/Xn8nE9W8bqxSHScqUc +66gJwj7/tMN3pCgDP0ztrpyAjuXHk1LTeIydoCTtFoOCBvNHmUq4O17LnF8xEwNF +DkcfCooyfQijzapxD/ZH/TJAcAQUMX+rcM9SJSY8YCV0dyQgtYBlC01cJky2mwEe +SOUQsrP2fHHhdrXdmDd/IccMKK0ZVhm7iJRYHsVeqg3ISRtjcYtHtReaK4im4+qk +7oc/+S8HTCP+ybtzN7E+5QTVXEGFXU1lcS0xST0Ue8fgsibeYx9tsnp5w3qJJClJ +mtc+RhQVjKt9mNuPT0rMdNk/v2ibLzN/PYhueRYy6iP1hMU+NdiphaNWY0DNmO8n +8C9XZfWXj3OSfD45FeqISCGE0RSKSzff1yf5 +=tKJr +-----END PGP PUBLIC KEY BLOCK----- diff --git a/contrib/init/README.md b/contrib/init/README.md index 15aacdd701afd..e5a1489519255 100644 --- a/contrib/init/README.md +++ b/contrib/init/README.md @@ -1,10 +1,10 @@ Sample configuration files for: ``` -SystemD: pivxd.service -Upstart: pivxd.conf -OpenRC: pivxd.openrc - pivxd.openrcconf -CentOS: pivxd.init +SystemD: nbxd.service +Upstart: nbxd.conf +OpenRC: nbxd.openrc + nbxd.openrcconf +CentOS: nbxd.init macOS: org.pivx.pivxd.plist ``` have been made available to assist packagers in creating node packages here. diff --git a/contrib/init/pivxd.conf b/contrib/init/nbxd.conf similarity index 81% rename from contrib/init/pivxd.conf rename to contrib/init/nbxd.conf index 42bc6f0f9acf0..ac014bcfc9c9b 100644 --- a/contrib/init/pivxd.conf +++ b/contrib/init/nbxd.conf @@ -3,14 +3,14 @@ description "PIVX Core Daemon" start on runlevel [2345] stop on starting rc RUNLEVEL=[016] -env BITCOIND_BIN="/usr/bin/pivxd" -env BITCOIND_USER="pivx" -env BITCOIND_GROUP="pivx" -env BITCOIND_PIDDIR="/var/run/pivxd" +env BITCOIND_BIN="/usr/bin/nbxd" +env BITCOIND_USER="nbx" +env BITCOIND_GROUP="nbx" +env BITCOIND_PIDDIR="/var/run/nbxd" # upstart can't handle variables constructed with other variables -env BITCOIND_PIDFILE="/var/run/pivxd/pivxd.pid" -env BITCOIND_CONFIGFILE="/etc/pivx/pivx.conf" -env BITCOIND_DATADIR="/var/lib/pivxd" +env BITCOIND_PIDFILE="/var/run/nbxd/nbxd.pid" +env BITCOIND_CONFIGFILE="/etc/nbx/nbx.conf" +env BITCOIND_DATADIR="/var/lib/nbxd" expect fork @@ -20,12 +20,12 @@ kill timeout 60 pre-start script # this will catch non-existent config files - # pivxd will check and exit with this very warning, but it can do so + # nbxd will check and exit with this very warning, but it can do so # long after forking, leaving upstart to think everything started fine. # since this is a commonly encountered case on install, just check and # warn here. if ! grep -qs '^rpcpassword=' "$BITCOIND_CONFIGFILE" ; then - echo "ERROR: You must set a secure rpcpassword to run pivxd." + echo "ERROR: You must set a secure rpcpassword to run nbxd." echo "The setting must appear in $BITCOIND_CONFIGFILE" echo echo "This password is security critical to securing wallets " diff --git a/contrib/init/pivxd.init b/contrib/init/nbxd.init similarity index 64% rename from contrib/init/pivxd.init rename to contrib/init/nbxd.init index 1b339e0ea1f9f..eceb131d0bc86 100644 --- a/contrib/init/pivxd.init +++ b/contrib/init/nbxd.init @@ -1,31 +1,31 @@ #!/bin/bash # -# pivxd The PIVX core server. +# nbxd # # # chkconfig: 345 80 20 -# description: pivxd -# processname: pivxd +# description: nbxd +# processname: nbxd # # Source function library. . /etc/init.d/functions -# you can override defaults in /etc/sysconfig/pivxd, see below -if [ -f /etc/sysconfig/pivxd ]; then - . /etc/sysconfig/pivxd +# you can override defaults in /etc/sysconfig/nbxd, see below +if [ -f /etc/sysconfig/nbxd ]; then + . /etc/sysconfig/nbxd fi RETVAL=0 -prog=pivxd -# you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/pivxd -lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/pivxd} +prog=nbxd +# you can override the lockfile via BITCOIND_LOCKFILE in /etc/sysconfig/nbxd +lockfile=${BITCOIND_LOCKFILE-/var/lock/subsys/nbxd} -# pivxd defaults to /usr/bin/pivxd, override with BITCOIND_BIN -bitcoind=${BITCOIND_BIN-/usr/bin/pivxd} +# nbxd defaults to /usr/bin/nbxd, override with BITCOIND_BIN +bitcoind=${BITCOIND_BIN-/usr/bin/nbxd} -# pivxd opts default to -disablewallet, override with BITCOIND_OPTS +# nbxd opts default to -disablewallet, override with BITCOIND_OPTS bitcoind_opts=${BITCOIND_OPTS} start() { diff --git a/contrib/init/pivxd.openrc b/contrib/init/nbxd.openrc similarity index 81% rename from contrib/init/pivxd.openrc rename to contrib/init/nbxd.openrc index d2a3b0a1383e0..01ae2cb993834 100644 --- a/contrib/init/pivxd.openrc +++ b/contrib/init/nbxd.openrc @@ -3,25 +3,25 @@ # backward compatibility for existing gentoo layout # if [ -d "/var/lib/pivx/.pivx" ]; then - BITCOIND_DEFAULT_DATADIR="/var/lib/pivx/.pivx" + BITCOIND_DEFAULT_DATADIR="/var/lib/nbx/.nbx" else - BITCOIND_DEFAULT_DATADIR="/var/lib/pivxd" + BITCOIND_DEFAULT_DATADIR="/var/lib/nbxd" fi -BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/pivx/pivx.conf} -BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/pivxd} -BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/pivxd.pid} +BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/nbx/nbx.conf} +BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/nbxd} +BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/nbxd.pid} BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}} -BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-pivx} -BITCOIND_GROUP=${BITCOIND_GROUP:-pivx} -BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/pivxd} +BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-nbx} +BITCOIND_GROUP=${BITCOIND_GROUP:-nbx} +BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/nbxd} BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" name="PIVX Core Daemon" description="PIVX crypto-currency p2p network daemon" -command="/usr/bin/pivxd" +command="/usr/bin/nbxd" command_args="-pid=\"${BITCOIND_PIDFILE}\" \ -conf=\"${BITCOIND_CONFIGFILE}\" \ -datadir=\"${BITCOIND_DATADIR}\" \ @@ -71,7 +71,7 @@ checkconfig() { if ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ; then eerror "" - eerror "ERROR: You must set a secure rpcpassword to run pivxd." + eerror "ERROR: You must set a secure rpcpassword to run nbxd." eerror "The setting must appear in ${BITCOIND_CONFIGFILE}" eerror "" eerror "This password is security critical to securing wallets " diff --git a/contrib/init/pivxd.openrcconf b/contrib/init/nbxd.openrcconf similarity index 55% rename from contrib/init/pivxd.openrcconf rename to contrib/init/nbxd.openrcconf index 8c7d09a4e8be1..cd803d53abdf4 100644 --- a/contrib/init/pivxd.openrcconf +++ b/contrib/init/nbxd.openrcconf @@ -1,25 +1,25 @@ -# /etc/conf.d/pivxd: config file for /etc/init.d/pivxd +# /etc/conf.d/nbxd: config file for /etc/init.d/nbxd # Config file location -#BITCOIND_CONFIGFILE="/etc/pivx/pivx.conf" +#BITCOIND_CONFIGFILE="/etc/pivx/nbx.conf" # What directory to write pidfile to? (created and owned by $BITCOIND_USER) -#BITCOIND_PIDDIR="/var/run/pivxd" +#BITCOIND_PIDDIR="/var/run/nbxd" # What filename to give the pidfile -#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/pivxd.pid" +#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/nbxd.pid" -# Where to write pivxd data (be mindful that the blockchain is large) -#BITCOIND_DATADIR="/var/lib/pivxd" +# Where to write nbxd data (be mindful that the blockchain is large) +#BITCOIND_DATADIR="/var/lib/nbxd" -# User and group to own pivxd process -#BITCOIND_USER="pivx" -#BITCOIND_GROUP="pivx" +# User and group to own nbxd process +#BITCOIND_USER="nbx" +#BITCOIND_GROUP="nbx" -# Path to pivxd executable -#BITCOIND_BIN="/usr/bin/pivxd" +# Path to nbxd executable +#BITCOIND_BIN="/usr/bin/nbxd" -# Nice value to run pivxd under +# Nice value to run nbxd under #BITCOIND_NICE=0 # Additional options (avoid -conf and -datadir, use flags above) diff --git a/contrib/init/pivxd.service b/contrib/init/nbxd.service similarity index 80% rename from contrib/init/pivxd.service rename to contrib/init/nbxd.service index 9cb95714466c7..64b706efe6e63 100644 --- a/contrib/init/pivxd.service +++ b/contrib/init/nbxd.service @@ -5,19 +5,19 @@ # See "man systemd.service" for details. # Note that almost all daemon options could be specified in -# /etc/pivx/pivx.conf +# /etc/pivx/nbx.conf [Unit] -Description=PIVX daemon +Description=NBX daemon After=network.target [Service] -ExecStart=/usr/bin/pivxd -daemon -conf=/etc/pivx/pivx.conf -pid=/run/pivxd/pivxd.pid -# Creates /run/pivxd owned by pivx -RuntimeDirectory=pivxd -User=pivx +ExecStart=/usr/bin/nbxd -daemon -conf=/etc/nbx/nbx.conf -pid=/run/nbxd/nbxd.pid +# Creates /run/nbxd owned by nbx +RuntimeDirectory=nbxd +User=nbx Type=forking -PIDFile=/run/pivxd/pivxd.pid +PIDFile=/run/nbxd/nbxd.pid Restart=on-failure # Hardening measures diff --git a/contrib/install_db4.sh b/contrib/install_db4.sh index 890af5c699440..dc5e2b0f7c44d 100755 --- a/contrib/install_db4.sh +++ b/contrib/install_db4.sh @@ -95,7 +95,7 @@ make install echo echo "db4 build complete." echo -echo 'When compiling pivxd, run `./configure` in the following way:' +echo 'When compiling nbxd, run `./configure` in the following way:' echo echo " export BDB_PREFIX='${BDB_PREFIX}'" echo ' ./configure BDB_LIBS="-L${BDB_PREFIX}/lib -ldb_cxx-4.8" BDB_CFLAGS="-I${BDB_PREFIX}/include" ...' diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index 8da9f0164dcca..61fdc1b7288e1 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -96,7 +96,7 @@ def get_block_hashes(settings, max_blocks_per_call=10000): if 'host' not in settings: settings['host'] = '127.0.0.1' if 'port' not in settings: - settings['port'] = 51473 + settings['port'] = 28735 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 0a99cab8d9da6..3dd6a8592441b 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 `Pivx-Qt.dmg`. +When finished, it will produce `NetboxWallet.dmg`. diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py index 091270f7b481c..704f734bd1d6e 100644 --- a/contrib/macdeploy/custom_dsstore.py +++ b/contrib/macdeploy/custom_dsstore.py @@ -53,7 +53,7 @@ ds['.']['vSrn'] = ('long', 1) ds['Applications']['Iloc'] = (370, 156) -ds['PIVX-Qt.app']['Iloc'] = (128, 156) +ds['NetboxWallet.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 df209c409d7db..c547722af3ab1 100755 --- a/contrib/macdeploy/detached-sig-create.sh +++ b/contrib/macdeploy/detached-sig-create.sh @@ -7,7 +7,7 @@ export LC_ALL=C set -e ROOTDIR=dist -BUNDLE=${ROOTDIR}/PIVX-Qt.app +BUNDLE=${ROOTDIR}/NetboxWallet.app CODESIGN=codesign TEMPDIR=sign.temp TEMPLIST=${TEMPDIR}/signatures.txt diff --git a/contrib/macdeploy/fancy.plist b/contrib/macdeploy/fancy.plist index 20021f5d1ff0e..29e5320ea561b 100644 --- a/contrib/macdeploy/fancy.plist +++ b/contrib/macdeploy/fancy.plist @@ -22,7 +22,7 @@ 370 156 - PIVX-Qt.app + NetboxWallet.app 128 156 diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index a64ef2d2de291..e2c4311b2f5f6 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -154,7 +154,7 @@ class FrameworkInfo(object): class ApplicationBundleInfo(object): def __init__(self, path): self.path = path - appName = "PIVX-Qt" + appName = "NetboxWallet" 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) @@ -602,7 +602,7 @@ else: # ------------------------------------------------ -target = os.path.join("dist", "PIVX-Qt.app") +target = os.path.join("dist", "NetboxWallet.app") if verbose >= 2: print("+ Copying source bundle +") diff --git a/contrib/pivx-cli.bash-completion b/contrib/nbx-cli.bash-completion similarity index 86% rename from contrib/pivx-cli.bash-completion rename to contrib/nbx-cli.bash-completion index 3ccecfe201387..0bc9e8f7b8bd5 100644 --- a/contrib/pivx-cli.bash-completion +++ b/contrib/nbx-cli.bash-completion @@ -1,9 +1,9 @@ -# bash programmable completion for pivx-cli(1) +# bash programmable completion for nbx-cli(1) # Copyright (c) 2012-2016 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -# call $pivx-cli for RPC +# call $nbx-cli for RPC _pivx_rpc() { # determine already specified args necessary for RPC local rpcargs=() @@ -14,7 +14,7 @@ _pivx_rpc() { ;; esac done - $pivx_cli "${rpcargs[@]}" "$@" + $nbx_cli "${rpcargs[@]}" "$@" } # Add wallet accounts to COMPREPLY @@ -24,13 +24,13 @@ _pivx_accounts() { COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) ) } -_pivx_cli() { +_nbx_cli() { local cur prev words=() cword - local pivx_cli + local nbx_cli - # save and use original argument to invoke pivx-cli for -help, help and RPC - # as pivx-cli might not be in $PATH - pivx_cli="$1" + # save and use original argument to invoke nbx-cli for -help, help and RPC + # as nbx-cli might not be in $PATH + nbx_cli="$1" COMPREPLY=() _get_comp_words_by_ref -n = cur prev words cword @@ -46,7 +46,7 @@ _pivx_cli() { if ((cword > 4)); then case ${words[cword-4]} in - importaddress|listtransactions|setban) + listtransactions|setban) COMPREPLY=( $( compgen -W "true false" -- "$cur" ) ) return 0 ;; @@ -63,7 +63,7 @@ _pivx_cli() { _pivx_accounts return 0 ;; - getbalance|gettxout|importaddress|importpubkey|importprivkey|listreceivedbyaccount|listreceivedbyaddress|listsinceblock) + getbalance|gettxout|listreceivedbyaccount|listreceivedbyaddress|listsinceblock) COMPREPLY=( $( compgen -W "true false" -- "$cur" ) ) return 0 ;; @@ -92,7 +92,7 @@ _pivx_cli() { fi case "$prev" in - backupwallet|dumpwallet|importwallet) + backupwallet|dumpwallet) _filedir return 0 ;; @@ -125,7 +125,7 @@ _pivx_cli() { # only parse -help if senseful if [[ -z "$cur" || "$cur" =~ ^- ]]; then - helpopts=$($pivx_cli -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) + helpopts=$($nbx_cli -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) fi # only parse help if senseful @@ -143,7 +143,7 @@ _pivx_cli() { ;; esac } && -complete -F _pivx_cli pivx-cli +complete -F _nbx_cli nbx-cli # Local variables: # mode: shell-script diff --git a/contrib/pivx-qt.pro b/contrib/nbx-qt.pro similarity index 94% rename from contrib/pivx-qt.pro rename to contrib/nbx-qt.pro index 26f1a674f2022..7fc81bda2ac83 100644 --- a/contrib/pivx-qt.pro +++ b/contrib/nbx-qt.pro @@ -61,6 +61,7 @@ HEADERS += src/activemasternode.h \ src/alert.h \ src/allocators.h \ src/amount.h \ + src/attributes.h \ src/base58.h \ src/bloom.h \ src/chain.h \ @@ -76,9 +77,8 @@ HEADERS += src/activemasternode.h \ src/compressor.h \ src/core_io.h \ src/crypter.h \ - src/obfuscation-relay.h \ src/obfuscation.h \ - src/pivx-config.h \ + src/nbx-config.h \ src/db.h \ src/eccryptoverify.h \ src/ecwrapper.h \ @@ -91,7 +91,6 @@ HEADERS += src/activemasternode.h \ src/leveldbwrapper.h \ src/limitedmap.h \ src/main.h \ - src/masternode-budget.h \ src/masternode-payments.h \ src/masternode-sync.h \ src/masternode.h \ @@ -99,6 +98,7 @@ HEADERS += src/activemasternode.h \ src/masternodeman.h \ src/merkleblock.h \ src/miner.h \ + src/mnemonic.h \ src/mruset.h \ src/net.h \ src/netbase.h \ @@ -110,7 +110,9 @@ HEADERS += src/activemasternode.h \ src/rpcclient.h \ src/rpcprotocol.h \ src/rpcserver.h \ + src/secure_string.h \ src/serialize.h \ + src/span.h \ src/spork.h \ src/streams.h \ src/sync.h \ @@ -131,7 +133,7 @@ HEADERS += src/activemasternode.h \ src/wallet_ismine.h \ src/walletdb.h \ src/compat/sanity.h \ - src/config/pivx-config.h \ + src/config/nbx-config.h \ src/crypto/common.h \ src/crypto/hmac_sha256.h \ src/crypto/hmac_sha512.h \ @@ -175,7 +177,6 @@ HEADERS += src/activemasternode.h \ src/qt/coincontroldialog.h \ src/qt/coincontroltreewidget.h \ src/qt/csvmodelwriter.h \ - src/qt/obfuscationconfig.h \ src/qt/editaddressdialog.h \ src/qt/guiconstants.h \ src/qt/guiutil.h \ @@ -216,6 +217,7 @@ HEADERS += src/activemasternode.h \ src/qt/walletview.h \ src/qt/winshutdownmonitor.h \ src/script/bitcoinconsensus.h \ + src/script/descriptor.h \ src/script/interpreter.h \ src/script/script.h \ src/script/script_error.h \ @@ -224,6 +226,8 @@ HEADERS += src/activemasternode.h \ src/script/standard.h \ src/univalue/univalue.h \ src/univalue/univalue_escapes.h \ + src/util/bip32.h \ + src/util/memory.h \ src/leveldb/db/builder.h \ src/leveldb/db/db_impl.h \ src/leveldb/db/db_iter.h \ @@ -332,7 +336,7 @@ HEADERS += src/activemasternode.h \ src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.h \ src/crypto/aes_helper.c \ src/qt/bitcoinamountfield.moc \ - src/qt/pivx.moc \ + src/qt/netboxwallet.moc \ src/qt/intro.moc \ src/qt/overviewpage.moc \ src/qt/rpcconsole.moc \ @@ -340,7 +344,6 @@ HEADERS += src/activemasternode.h \ FORMS += src/qt/forms/addressbookpage.ui \ src/qt/forms/askpassphrasedialog.ui \ src/qt/forms/coincontroldialog.ui \ - src/qt/forms/obfuscationconfig.ui \ src/qt/forms/editaddressdialog.ui \ src/qt/forms/helpmessagedialog.ui \ src/qt/forms/intro.ui \ @@ -371,11 +374,10 @@ SOURCES += src/activemasternode.cpp \ src/core_read.cpp \ src/core_write.cpp \ src/crypter.cpp \ - src/obfuscation-relay.cpp \ src/obfuscation.cpp \ - src/pivx-cli.cpp \ - src/pivx-tx.cpp \ - src/pivx.cpp \ + src/nbx-cli.cpp \ + src/nbx-tx.cpp \ + src/netboxwallet.cpp \ src/db.cpp \ src/eccryptoverify.cpp \ src/ecwrapper.cpp \ @@ -388,7 +390,6 @@ SOURCES += src/activemasternode.cpp \ src/keystore.cpp \ src/leveldbwrapper.cpp \ src/main.cpp \ - src/masternode-budget.cpp \ src/masternode-payments.cpp \ src/masternode-sync.cpp \ src/masternode.cpp \ @@ -396,6 +397,8 @@ SOURCES += src/activemasternode.cpp \ src/masternodeman.cpp \ src/merkleblock.cpp \ src/miner.cpp \ + src/mnemonic.cpp \ + src/mnemonic_en.cpp \ src/net.cpp \ src/netbase.cpp \ src/noui.cpp \ @@ -406,8 +409,6 @@ SOURCES += src/activemasternode.cpp \ src/rest.cpp \ src/rpcblockchain.cpp \ src/rpcclient.cpp \ - src/rpcdump.cpp \ - src/rpcmasternode-budget.cpp \ src/rpcmasternode.cpp \ src/rpcmining.cpp \ src/rpcmisc.cpp \ @@ -415,7 +416,7 @@ SOURCES += src/activemasternode.cpp \ src/rpcprotocol.cpp \ src/rpcrawtransaction.cpp \ src/rpcserver.cpp \ - src/rpcwallet.cpp \ + src/secure_string.cpp \ src/spork.cpp \ src/sync.cpp \ src/timedata.cpp \ @@ -469,9 +470,8 @@ SOURCES += src/activemasternode.cpp \ src/qt/coincontroldialog.cpp \ src/qt/coincontroltreewidget.cpp \ src/qt/csvmodelwriter.cpp \ - src/qt/obfuscationconfig.cpp \ - src/qt/pivx.cpp \ - src/qt/pivxstrings.cpp \ + src/qt/netboxwallet.cpp \ + src/qt/nbxstrings.cpp \ src/qt/editaddressdialog.cpp \ src/qt/guiutil.cpp \ src/qt/intro.cpp \ @@ -509,6 +509,7 @@ SOURCES += src/activemasternode.cpp \ src/qt/walletview.cpp \ src/qt/winshutdownmonitor.cpp \ src/script/bitcoinconsensus.cpp \ + src/script/descriptor.cpp \ src/script/interpreter.cpp \ src/script/script.cpp \ src/script/script_error.cpp \ @@ -544,17 +545,17 @@ SOURCES += src/activemasternode.cpp \ src/test/sanity_tests.cpp \ src/test/script_P2SH_tests.cpp \ src/test/script_tests.cpp \ - src/test/scriptnum_tests.cpp \ src/test/serialize_tests.cpp \ src/test/sighash_tests.cpp \ src/test/sigopcount_tests.cpp \ src/test/skiplist_tests.cpp \ - src/test/test_pivx.cpp \ + src/test/test_nbx.cpp \ src/test/timedata_tests.cpp \ src/test/transaction_tests.cpp \ src/test/uint256_tests.cpp \ src/test/univalue_tests.cpp \ src/test/util_tests.cpp \ + src/util/bip32.cpp \ src/test/wallet_tests.cpp \ src/univalue/gen.cpp \ src/univalue/univalue.cpp \ @@ -640,21 +641,21 @@ SOURCES += src/activemasternode.cpp \ src/leveldb/helpers/memenv/memenv.cc \ src/leveldb/helpers/memenv/memenv_test.cc \ src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.c -RESOURCES += src/qt/pivx.qrc src/qt/pivx_locale.qrc +RESOURCES += src/qt/nbx.qrc src/qt/nbx_locale.qrc -TRANSLATIONS += src/qt/locale/pivx_bg.ts \ - src/qt/locale/pivx_de.ts \ - src/qt/locale/pivx_en.ts \ - src/qt/locale/pivx_es.ts \ - src/qt/locale/pivx_fi.ts \ - src/qt/locale/pivx_fr.ts \ - src/qt/locale/pivx_it.ts \ - src/qt/locale/pivx_ja.ts \ - src/qt/locale/pivx_pl.ts \ - src/qt/locale/pivx_pt.ts \ - src/qt/locale/pivx_ru.ts \ - src/qt/locale/pivx_sk.ts \ - src/qt/locale/pivx_sv.ts \ - src/qt/locale/pivx_vi.ts \ - src/qt/locale/pivx_zh_CN.ts \ - src/qt/locale/pivx_zh_TW.ts +TRANSLATIONS += src/qt/locale/nbx_bg.ts \ + src/qt/locale/nbx_de.ts \ + src/qt/locale/nbx_en.ts \ + src/qt/locale/nbx_es.ts \ + src/qt/locale/nbx_fi.ts \ + src/qt/locale/nbx_fr.ts \ + src/qt/locale/nbx_it.ts \ + src/qt/locale/nbx_ja.ts \ + src/qt/locale/nbx_pl.ts \ + src/qt/locale/nbx_pt.ts \ + src/qt/locale/nbx_ru.ts \ + src/qt/locale/nbx_sk.ts \ + src/qt/locale/nbx_sv.ts \ + src/qt/locale/nbx_vi.ts \ + src/qt/locale/nbx_zh_CN.ts \ + src/qt/locale/nbx_zh_TW.ts diff --git a/contrib/pivx-tx.bash-completion b/contrib/nbx-tx.bash-completion similarity index 100% rename from contrib/pivx-tx.bash-completion rename to contrib/nbx-tx.bash-completion diff --git a/contrib/pivxd.bash-completion b/contrib/nbxd.bash-completion similarity index 81% rename from contrib/pivxd.bash-completion rename to contrib/nbxd.bash-completion index 00382780daeb7..d99d4962efe67 100644 --- a/contrib/pivxd.bash-completion +++ b/contrib/nbxd.bash-completion @@ -1,15 +1,15 @@ -# bash programmable completion for pivxd(1) and pivx-qt(1) +# bash programmable completion for nbxd(1) and netboxwallet(1) # Copyright (c) 2012-2016 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. -_pivxd() { +_nbxd() { local cur prev words=() cword - local pivxd + local nbxd - # save and use original argument to invoke pivxd for -help + # save and use original argument to invoke nbxd for -help # it might not be in $PATH - pivxd="$1" + nbxd="$1" COMPREPLY=() _get_comp_words_by_ref -n = cur prev words cword @@ -33,7 +33,7 @@ _pivxd() { # only parse -help if sensible if [[ -z "$cur" || "$cur" =~ ^- ]]; then local helpopts - helpopts=$($pivxd -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) + helpopts=$($nbxd -help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' ) COMPREPLY=( $( compgen -W "$helpopts" -- "$cur" ) ) fi @@ -45,7 +45,7 @@ _pivxd() { ;; esac } && -complete -F _pivxd pivxd pivx-qt +complete -F _nbxd nbxd netboxwallet # Local variables: # mode: shell-script diff --git a/contrib/qos/README.md b/contrib/qos/README.md index 983ec2ad91ad5..39f0230fb7915 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 Bitcoin network. It limits outbound TCP traffic with a source or destination port of 51472, 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 Bitcoin network. It limits outbound TCP traffic with a source or destination port of 28734, but not if the destination IP is within a LAN (defined as 192.168.x.x). -This means one can have an always-on pivxd instance running, and another local pivxd/pivx-qt instance which connects to this node and receives blocks from it. +This means one can have an always-on nbxd instance running, and another local nbxd/netboxwallet instance which connects to this node and receives blocks from it. diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index 1b03b69821c41..3b2a8b0d776b7 100644 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -32,10 +32,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 51472. but not when dealing with a host on the local network +#limit outgoing traffic to and from port 28734. 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 51472 ! -d ${LOCALNET} -j MARK --set-mark 0x2 -iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 51472 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 28734 ! -d ${LOCALNET} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 28734 ! -d ${LOCALNET} -j MARK --set-mark 0x2 diff --git a/contrib/rpm/nbx.fc b/contrib/rpm/nbx.fc new file mode 100644 index 0000000000000..8b05093606d2f --- /dev/null +++ b/contrib/rpm/nbx.fc @@ -0,0 +1,8 @@ +/usr/bin/nbx-cli -- gen_context(system_u:object_r:nbx_exec_t,s0) +/usr/sbin/nbxd -- gen_context(system_u:object_r:nbx_exec_t,s0) +/usr/lib(64)?/nbx/nbxd -- gen_context(system_u:object_r:nbx_exec_t,s0) + +/etc/nbx(/.*)? gen_context(system_u:object_r:nbx_conf_t,s0) +/var/lib/nbx(/.*)? gen_context(system_u:object_r:nbx_var_lib_t,s0) + +(/var)?/run/nbxd(/.*)? gen_context(system_u:object_r:nbx_var_run_t,s0) diff --git a/contrib/rpm/pivx.if b/contrib/rpm/nbx.if similarity index 100% rename from contrib/rpm/pivx.if rename to contrib/rpm/nbx.if diff --git a/contrib/rpm/pivx.spec b/contrib/rpm/nbx.spec similarity index 63% rename from contrib/rpm/pivx.spec rename to contrib/rpm/nbx.spec index e49e20c122638..42eb4192343af 100644 --- a/contrib/rpm/pivx.spec +++ b/contrib/rpm/nbx.spec @@ -13,7 +13,7 @@ %endif %endif -Name: pivx +Name: nbx Version: 0.12.0 Release: 2%{?dist} Summary: Peer to Peer Cryptographic Currency @@ -24,7 +24,7 @@ URL: https://pivx.org/ Source0: https://pivx.org/bin/pivx-core-%{version}/pivx-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db-%{bdbv}.NC.tar.gz -Source10: https://raw.githubusercontent.com/pivx-project/pivx/v%{version}/contrib/debian/examples/pivx.conf +Source10: https://raw.githubusercontent.com/pivx-project/pivx/v%{version}/contrib/debian/examples/nbx.conf #man pages Source20: https://raw.githubusercontent.com/pivx-project/pivx/v%{version}/doc/man/pivxd.1 @@ -33,7 +33,7 @@ Source22: https://raw.githubusercontent.com/pivx-project/pivx/v%{version}/doc/ma #selinux Source30: https://raw.githubusercontent.com/pivx-project/pivx/v%{version}/contrib/rpm/pivx.te -# Source31 - what about pivx-tx and bench_pivx ??? +# Source31 - what about nbx-tx and bench_nbx ??? Source31: https://raw.githubusercontent.com/pivx-project/pivx/v%{version}/contrib/rpm/pivx.fc Source32: https://raw.githubusercontent.com/pivx-project/pivx/v%{version}/contrib/rpm/pivx.if @@ -50,13 +50,13 @@ BuildRequires: autoconf automake libtool BuildRequires: libevent-devel -Patch0: pivx-0.12.0-libressl.patch +Patch0: nbx-0.12.0-libressl.patch %description -Bitcoin is a digital cryptographic currency that uses peer-to-peer technology to +Netbox.Wallet is a digital cryptographic currency that uses peer-to-peer technology to operate with no central authority or banks; managing transactions and the -issuing of pivxs is carried out collectively by the network. +issuing of nbxs is carried out collectively by the network. %if %{_buildqt} %package core @@ -79,9 +79,9 @@ BuildRequires: %{_bindir}/inkscape BuildRequires: %{_bindir}/convert %description core -Bitcoin is a digital cryptographic currency that uses peer-to-peer technology to +Netbox.Wallet is a digital cryptographic currency that uses peer-to-peer technology to operate with no central authority or banks; managing transactions and the -issuing of pivxs is carried out collectively by the network. +issuing of nbxs is carried out collectively by the network. This package contains the Qt based graphical client and node. If you are looking to run a Bitcoin wallet, this is probably the package you want. @@ -93,28 +93,28 @@ Summary: Bitcoin shared libraries Group: System Environment/Libraries %description libs -This package provides the pivxconsensus shared libraries. These libraries +This package provides consensus shared libraries. These libraries may be used by third party software to provide consensus verification functionality. Unless you know need this package, you probably do not. %package devel -Summary: Development files for pivx +Summary: Development files for nbx Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel -This package contains the header files and static library for the -pivxconsensus shared library. If you are developing or compiling software +This package contains the header files and static library for +consensus shared library. If you are developing or compiling software that wants to link against that library, then you need this package installed. Most people do not need this package installed. %package server -Summary: The pivx daemon +Summary: NBX daemon Group: System Environment/Daemons -Requires: pivx-utils = %{version}-%{release} +Requires: nbxx-utils = %{version}-%{release} Requires: selinux-policy policycoreutils-python Requires(pre): shadow-utils Requires(post): %{_sbindir}/semodule %{_sbindir}/restorecon %{_sbindir}/fixfiles %{_sbindir}/sestatus @@ -124,13 +124,13 @@ BuildRequires: checkpolicy BuildRequires: %{_datadir}/selinux/devel/Makefile %description server -This package provides a stand-alone pivx-core daemon. For most users, this +This package provides a stand-alone core daemon. For most users, this package is only needed if they need a full-node without the graphical client. Some third party wallet software will want this package to provide the actual -pivx-core node they use to connect to the network. +core node they use to connect to the network. -If you use the graphical pivx-core client then you almost certainly do not +If you use the graphical core client then you almost certainly do not need this package. %package utils @@ -139,19 +139,19 @@ Group: Applications/System %description utils This package provides several command line utilities for interacting with a -pivx-core daemon. +core daemon. -The pivx-cli utility allows you to communicate and control a pivx daemon -over RPC, the pivx-tx utility allows you to create a custom transaction, and -the bench_pivx utility can be used to perform some benchmarks. +The nbx-cli utility allows you to communicate and control a nbx daemon +over RPC, the nbx-tx utility allows you to create a custom transaction, and +the bench_nbx utility can be used to perform some benchmarks. -This package contains utilities needed by the pivx-server package. +This package contains utilities needed by the nbx-server package. %prep %setup -q %patch0 -p1 -b .libressl -cp -p %{SOURCE10} ./pivx.conf.example +cp -p %{SOURCE10} ./nbx.conf.example tar -zxf %{SOURCE1} cp -p db-%{bdbv}.NC/LICENSE ./db-%{bdbv}.NC-LICENSE mkdir db4 SELinux @@ -172,7 +172,7 @@ make %{?_smp_mflags} pushd SELinux for selinuxvariant in %{selinux_variants}; do make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile - mv pivx.pp pivx.pp.${selinuxvariant} + mv nbx.pp nbx.pp.${selinuxvariant} make NAME=${selinuxvariant} -f %{_datadir}/selinux/devel/Makefile clean done popd @@ -182,42 +182,42 @@ popd make install DESTDIR=%{buildroot} mkdir -p -m755 %{buildroot}%{_sbindir} -mv %{buildroot}%{_bindir}/pivxd %{buildroot}%{_sbindir}/pivxd +mv %{buildroot}%{_bindir}/nbxd %{buildroot}%{_sbindir}/nbxd # systemd stuff mkdir -p %{buildroot}%{_tmpfilesdir} -cat < %{buildroot}%{_tmpfilesdir}/pivx.conf -d /run/pivxd 0750 pivx pivx - +cat < %{buildroot}%{_tmpfilesdir}/nbx.conf +d /run/nbxd 0750 nbx nbx - EOF -touch -a -m -t 201504280000 %{buildroot}%{_tmpfilesdir}/pivx.conf +touch -a -m -t 201504280000 %{buildroot}%{_tmpfilesdir}/nbx.conf mkdir -p %{buildroot}%{_sysconfdir}/sysconfig -cat < %{buildroot}%{_sysconfdir}/sysconfig/pivx -# Provide options to the pivx daemon here, for example +cat < %{buildroot}%{_sysconfdir}/sysconfig/nbx +# Provide options to the nbx daemon here, for example # OPTIONS="-testnet -disable-wallet" OPTIONS="" # System service defaults. # Don't change these unless you know what you're doing. -CONFIG_FILE="%{_sysconfdir}/pivx/pivx.conf" -DATA_DIR="%{_localstatedir}/lib/pivx" -PID_FILE="/run/pivxd/pivxd.pid" +CONFIG_FILE="%{_sysconfdir}/nbx/nbx.conf" +DATA_DIR="%{_localstatedir}/lib/nbx" +PID_FILE="/run/nbxd/nbxd.pid" EOF -touch -a -m -t 201504280000 %{buildroot}%{_sysconfdir}/sysconfig/pivx +touch -a -m -t 201504280000 %{buildroot}%{_sysconfdir}/sysconfig/nbx mkdir -p %{buildroot}%{_unitdir} -cat < %{buildroot}%{_unitdir}/pivx.service +cat < %{buildroot}%{_unitdir}/nbx.service [Unit] -Description=Bitcoin daemon +Description=NBX daemon After=syslog.target network.target [Service] Type=forking -ExecStart=%{_sbindir}/pivxd -daemon -conf=\${CONFIG_FILE} -datadir=\${DATA_DIR} -pid=\${PID_FILE} \$OPTIONS -EnvironmentFile=%{_sysconfdir}/sysconfig/pivx -User=pivx -Group=pivx +ExecStart=%{_sbindir}/nbxd -daemon -conf=\${CONFIG_FILE} -datadir=\${DATA_DIR} -pid=\${PID_FILE} \$OPTIONS +EnvironmentFile=%{_sysconfdir}/sysconfig/nbx +User=nbx +Group=nbx Restart=on-failure PrivateTmp=true @@ -229,63 +229,63 @@ StartLimitBurst=5 [Install] WantedBy=multi-user.target EOF -touch -a -m -t 201504280000 %{buildroot}%{_unitdir}/pivx.service +touch -a -m -t 201504280000 %{buildroot}%{_unitdir}/nbx.service #end systemd stuff -mkdir %{buildroot}%{_sysconfdir}/pivx -mkdir -p %{buildroot}%{_localstatedir}/lib/pivx +mkdir %{buildroot}%{_sysconfdir}/nbx +mkdir -p %{buildroot}%{_localstatedir}/lib/nbx #SELinux for selinuxvariant in %{selinux_variants}; do install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant} - install -p -m 644 SELinux/pivx.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/pivx.pp + install -p -m 644 SELinux/nbx.pp.${selinuxvariant} %{buildroot}%{_datadir}/selinux/${selinuxvariant}/nbx.pp done %if %{_buildqt} # qt icons -install -D -p share/pixmaps/pivx.ico %{buildroot}%{_datadir}/pixmaps/pivx.ico +install -D -p share/pixmaps/nbx.ico %{buildroot}%{_datadir}/pixmaps/nbx.ico install -p share/pixmaps/nsis-header.bmp %{buildroot}%{_datadir}/pixmaps/ install -p share/pixmaps/nsis-wizard.bmp %{buildroot}%{_datadir}/pixmaps/ -install -p %{SOURCE100} %{buildroot}%{_datadir}/pixmaps/pivx.svg -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/pivx16.png -w16 -h16 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/pivx32.png -w32 -h32 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/pivx64.png -w64 -h64 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/pivx128.png -w128 -h128 -%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/pivx256.png -w256 -h256 -%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/pivx256.png %{buildroot}%{_datadir}/pixmaps/pivx16.xpm -%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/pivx256.png %{buildroot}%{_datadir}/pixmaps/pivx32.xpm -%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/pivx256.png %{buildroot}%{_datadir}/pixmaps/pivx64.xpm -%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/pivx256.png %{buildroot}%{_datadir}/pixmaps/pivx128.xpm -%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/pivx256.png %{buildroot}%{_datadir}/pixmaps/pivx256.xpm +install -p %{SOURCE100} %{buildroot}%{_datadir}/pixmaps/nbx.svg +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/nbx16.png -w16 -h16 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/nbx32.png -w32 -h32 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/nbx64.png -w64 -h64 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/nbx128.png -w128 -h128 +%{_bindir}/inkscape %{SOURCE100} --export-png=%{buildroot}%{_datadir}/pixmaps/nbx256.png -w256 -h256 +%{_bindir}/convert -resize 16x16 %{buildroot}%{_datadir}/pixmaps/nbx256.png %{buildroot}%{_datadir}/pixmaps/nbx16.xpm +%{_bindir}/convert -resize 32x32 %{buildroot}%{_datadir}/pixmaps/nbx256.png %{buildroot}%{_datadir}/pixmaps/nbx32.xpm +%{_bindir}/convert -resize 64x64 %{buildroot}%{_datadir}/pixmaps/nbx256.png %{buildroot}%{_datadir}/pixmaps/nbx64.xpm +%{_bindir}/convert -resize 128x128 %{buildroot}%{_datadir}/pixmaps/nbx256.png %{buildroot}%{_datadir}/pixmaps/nbx128.xpm +%{_bindir}/convert %{buildroot}%{_datadir}/pixmaps/nbx256.png %{buildroot}%{_datadir}/pixmaps/nbx256.xpm touch %{buildroot}%{_datadir}/pixmaps/*.png -r %{SOURCE100} touch %{buildroot}%{_datadir}/pixmaps/*.xpm -r %{SOURCE100} # Desktop File - change the touch timestamp if modifying mkdir -p %{buildroot}%{_datadir}/applications -cat < %{buildroot}%{_datadir}/applications/pivx-core.desktop +cat < %{buildroot}%{_datadir}/applications/netboxwallet.desktop [Desktop Entry] Encoding=UTF-8 Name=Bitcoin Comment=Bitcoin P2P Cryptocurrency Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi -Exec=pivx-qt %u +Exec=netboxwallet %u Terminal=false Type=Application -Icon=pivx128 -MimeType=x-scheme-handler/pivx; +Icon=nbx128 +MimeType=x-scheme-handler/nbx; Categories=Office;Finance; EOF # change touch date when modifying desktop -touch -a -m -t 201511100546 %{buildroot}%{_datadir}/applications/pivx-core.desktop -%{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/pivx-core.desktop +touch -a -m -t 201511100546 %{buildroot}%{_datadir}/applications/netboxwallet.desktop +%{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/netboxwallet.desktop # KDE protocol - change the touch timestamp if modifying mkdir -p %{buildroot}%{_datadir}/kde4/services -cat < %{buildroot}%{_datadir}/kde4/services/pivx-core.protocol +cat < %{buildroot}%{_datadir}/kde4/services/netboxwallet.protocol [Protocol] -exec=pivx-qt '%u' -protocol=pivx +exec=netboxwallet '%u' +protocol=nbx input=none output=none helper=true @@ -296,14 +296,14 @@ makedir=false deleting=false EOF # change touch date when modifying protocol -touch -a -m -t 201511100546 %{buildroot}%{_datadir}/kde4/services/pivx-core.protocol +touch -a -m -t 201511100546 %{buildroot}%{_datadir}/kde4/services/netboxwallet.protocol %endif # man pages -install -D -p %{SOURCE20} %{buildroot}%{_mandir}/man1/pivxd.1 -install -p %{SOURCE21} %{buildroot}%{_mandir}/man1/pivx-cli.1 +install -D -p %{SOURCE20} %{buildroot}%{_mandir}/man1/nbxd.1 +install -p %{SOURCE21} %{buildroot}%{_mandir}/man1/nbx-cli.1 %if %{_buildqt} -install -p %{SOURCE22} %{buildroot}%{_mandir}/man1/pivx-qt.1 +install -p %{SOURCE22} %{buildroot}%{_mandir}/man1/netboxwallet.1 %endif # nuke these, we do extensive testing of binaries in %%check before packaging @@ -311,7 +311,7 @@ rm -f %{buildroot}%{_bindir}/test_* %check make check -srcdir=src test/pivx-util-test.py +srcdir=src test/nbx-util-test.py test/functional/test_runner.py --extended %post libs -p /sbin/ldconfig @@ -319,37 +319,37 @@ test/functional/test_runner.py --extended %postun libs -p /sbin/ldconfig %pre server -getent group pivx >/dev/null || groupadd -r pivx -getent passwd pivx >/dev/null || - useradd -r -g pivx -d /var/lib/pivx -s /sbin/nologin \ - -c "Bitcoin wallet server" pivx +getent group nbx >/dev/null || groupadd -r nbx +getent passwd nbx >/dev/null || + useradd -r -g nbx -d /var/lib/nbx -s /sbin/nologin \ + -c "Bitcoin wallet server" nbx exit 0 %post server -%systemd_post pivx.service +%systemd_post nbx.service # SELinux if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then for selinuxvariant in %{selinux_variants}; do - %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/pivx.pp &> /dev/null || : + %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/nbx.pp &> /dev/null || : done -%{_sbindir}/semanage port -a -t pivx_port_t -p tcp 8332 -%{_sbindir}/semanage port -a -t pivx_port_t -p tcp 8333 -%{_sbindir}/semanage port -a -t pivx_port_t -p tcp 18332 -%{_sbindir}/semanage port -a -t pivx_port_t -p tcp 18333 -%{_sbindir}/semanage port -a -t pivx_port_t -p tcp 18443 -%{_sbindir}/semanage port -a -t pivx_port_t -p tcp 18444 -%{_sbindir}/fixfiles -R pivx-server restore &> /dev/null || : -%{_sbindir}/restorecon -R %{_localstatedir}/lib/pivx || : +%{_sbindir}/semanage port -a -t nbx_port_t -p tcp 8332 +%{_sbindir}/semanage port -a -t nbx_port_t -p tcp 8333 +%{_sbindir}/semanage port -a -t nbx_port_t -p tcp 18332 +%{_sbindir}/semanage port -a -t nbx_port_t -p tcp 18333 +%{_sbindir}/semanage port -a -t nbx_port_t -p tcp 18443 +%{_sbindir}/semanage port -a -t nbx_port_t -p tcp 18444 +%{_sbindir}/fixfiles -R nbx-server restore &> /dev/null || : +%{_sbindir}/restorecon -R %{_localstatedir}/lib/nbx || : fi %posttrans server %{_bindir}/systemd-tmpfiles --create %preun server -%systemd_preun pivx.service +%systemd_preun nbx.service %postun server -%systemd_postun pivx.service +%systemd_postun nbx.service # SELinux if [ $1 -eq 0 ]; then if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then @@ -360,11 +360,11 @@ if [ $1 -eq 0 ]; then %{_sbindir}/semanage port -d -p tcp 18443 %{_sbindir}/semanage port -d -p tcp 18444 for selinuxvariant in %{selinux_variants}; do - %{_sbindir}/semodule -s ${selinuxvariant} -r pivx &> /dev/null || : + %{_sbindir}/semodule -s ${selinuxvariant} -r nbx &> /dev/null || : done - %{_sbindir}/fixfiles -R pivx-server restore &> /dev/null || : - [ -d %{_localstatedir}/lib/pivx ] && \ - %{_sbindir}/restorecon -R %{_localstatedir}/lib/pivx &> /dev/null || : + %{_sbindir}/fixfiles -R nbx-server restore &> /dev/null || : + [ -d %{_localstatedir}/lib/nbx ] && \ + %{_sbindir}/restorecon -R %{_localstatedir}/lib/nbx &> /dev/null || : fi fi @@ -375,16 +375,16 @@ rm -rf %{buildroot} %files core %defattr(-,root,root,-) %license COPYING db-%{bdbv}.NC-LICENSE -%doc COPYING pivx.conf.example doc/README.md doc/bips.md doc/files.md doc/multiwallet-qt.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md -%attr(0755,root,root) %{_bindir}/pivx-qt -%attr(0644,root,root) %{_datadir}/applications/pivx-core.desktop -%attr(0644,root,root) %{_datadir}/kde4/services/pivx-core.protocol +%doc COPYING nbx.conf.example doc/README.md doc/bips.md doc/files.md doc/multiwallet-qt.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md +%attr(0755,root,root) %{_bindir}/netboxwallet +%attr(0644,root,root) %{_datadir}/applications/netboxwallet.desktop +%attr(0644,root,root) %{_datadir}/kde4/services/netboxwallet.protocol %attr(0644,root,root) %{_datadir}/pixmaps/*.ico %attr(0644,root,root) %{_datadir}/pixmaps/*.bmp %attr(0644,root,root) %{_datadir}/pixmaps/*.svg %attr(0644,root,root) %{_datadir}/pixmaps/*.png %attr(0644,root,root) %{_datadir}/pixmaps/*.xpm -%attr(0644,root,root) %{_mandir}/man1/pivx-qt.1* +%attr(0644,root,root) %{_mandir}/man1/netboxwallet.1* %endif %files libs @@ -406,30 +406,30 @@ rm -rf %{buildroot} %files server %defattr(-,root,root,-) %license COPYING db-%{bdbv}.NC-LICENSE -%doc COPYING pivx.conf.example doc/README.md doc/REST-interface.md doc/bips.md doc/dnsseed-policy.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md -%attr(0755,root,root) %{_sbindir}/pivxd -%attr(0644,root,root) %{_tmpfilesdir}/pivx.conf -%attr(0644,root,root) %{_unitdir}/pivx.service -%dir %attr(0750,pivx,pivx) %{_sysconfdir}/pivx -%dir %attr(0750,pivx,pivx) %{_localstatedir}/lib/pivx -%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/pivx +%doc COPYING nbx.conf.example doc/README.md doc/REST-interface.md doc/bips.md doc/dnsseed-policy.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/tor.md +%attr(0755,root,root) %{_sbindir}/nbxd +%attr(0644,root,root) %{_tmpfilesdir}/nbx.conf +%attr(0644,root,root) %{_unitdir}/nbx.service +%dir %attr(0750,nbx,nbx) %{_sysconfdir}/nbx +%dir %attr(0750,nbx,nbx) %{_localstatedir}/lib/nbx +%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/nbx %attr(0644,root,root) %{_datadir}/selinux/*/*.pp -%attr(0644,root,root) %{_mandir}/man1/pivxd.1* +%attr(0644,root,root) %{_mandir}/man1/nbxd.1* %files utils %defattr(-,root,root,-) %license COPYING -%doc COPYING pivx.conf.example doc/README.md -%attr(0755,root,root) %{_bindir}/pivx-cli -%attr(0755,root,root) %{_bindir}/pivx-tx -%attr(0755,root,root) %{_bindir}/bench_pivx -%attr(0644,root,root) %{_mandir}/man1/pivx-cli.1* +%doc COPYING nbx.conf.example doc/README.md +%attr(0755,root,root) %{_bindir}/nbx-cli +%attr(0755,root,root) %{_bindir}/nbx-tx +%attr(0755,root,root) %{_bindir}/bench_nbx +%attr(0644,root,root) %{_mandir}/man1/nbx-cli.1* %changelog * Fri Feb 26 2016 Alice Wonder - 0.12.0-2 -- Rename Qt package from pivx to pivx-core +- Rename Qt package from nbx to nbx-core - Make building of the Qt package optional - When building the Qt package, default to Qt5 but allow building - against Qt4 @@ -439,4 +439,4 @@ rm -rf %{buildroot} - Initial spec file for 0.12.0 release # This spec file is written from scratch but a lot of the packaging decisions are directly -# based upon the 0.11.2 package spec file from https://www.ringingliberty.com/pivx/ +# based upon the 0.11.2 package spec file from https://www.ringingliberty.com/nbx/ diff --git a/contrib/rpm/pivx.te b/contrib/rpm/nbx.te similarity index 100% rename from contrib/rpm/pivx.te rename to contrib/rpm/nbx.te diff --git a/contrib/rpm/pivx.fc b/contrib/rpm/pivx.fc deleted file mode 100644 index 0e3450782e6d4..0000000000000 --- a/contrib/rpm/pivx.fc +++ /dev/null @@ -1,8 +0,0 @@ -/usr/bin/pivx-cli -- gen_context(system_u:object_r:pivx_exec_t,s0) -/usr/sbin/pivxd -- gen_context(system_u:object_r:pivx_exec_t,s0) -/usr/lib(64)?/pivx/pivxd -- gen_context(system_u:object_r:pivx_exec_t,s0) - -/etc/pivx(/.*)? gen_context(system_u:object_r:pivx_conf_t,s0) -/var/lib/pivx(/.*)? gen_context(system_u:object_r:pivx_var_lib_t,s0) - -(/var)?/run/pivxd(/.*)? gen_context(system_u:object_r:pivx_var_run_t,s0) diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py index 0b24237d74dca..085118debc623 100644 --- a/contrib/seeds/generate-seeds.py +++ b/contrib/seeds/generate-seeds.py @@ -127,10 +127,10 @@ def main(): 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', 51472) + process_nodes(g, f, 'pnSeed6_main', 28734) g.write('\n') with open(os.path.join(indir,'nodes_test.txt'),'r') as f: - process_nodes(g, f, 'pnSeed6_test', 51474) + process_nodes(g, f, 'pnSeed6_test', 28754) g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n') if __name__ == '__main__': diff --git a/contrib/spendfrom/README.md b/contrib/spendfrom/README.md index b19f0a18db708..dc92813bbe907 100644 --- a/contrib/spendfrom/README.md +++ b/contrib/spendfrom/README.md @@ -7,7 +7,7 @@ address (or addresses). Depends on [jsonrpc](http://json-rpc.org/). spendfrom.py --from=FROMADDRESS1[,FROMADDRESS2] --to=TOADDRESS --amount=amount \ - --fee=fee --datadir=/path/to/.pivx --testnet --dry_run + --fee=fee --datadir=/path/to/.NetboxWallet --testnet --dry_run With no arguments, outputs a list of amounts associated with addresses. diff --git a/contrib/spendfrom/spendfrom.py b/contrib/spendfrom/spendfrom.py index 5f091cd122753..a2ca3df17abf4 100755 --- a/contrib/spendfrom/spendfrom.py +++ b/contrib/spendfrom/spendfrom.py @@ -1,13 +1,13 @@ #!/usr/bin/env python # -# Use the raw transactions API to spend PIVs received on particular addresses, +# Use the raw transactions API to spend NBXs received on particular addresses, # and send any change back to that same address. # # Example usage: # spendfrom.py # Lists available funds # spendfrom.py --from=ADDRESS --to=ADDRESS --amount=11.00 # -# Assumes it will talk to a pivxd or pivx-Qt running +# Assumes it will talk to a nbxd or netboxwallet running # on localhost. # # Depends on jsonrpc @@ -33,15 +33,15 @@ def check_json_precision(): raise RuntimeError("JSON encode/decode loses precision") def determine_db_dir(): - """Return the default location of the pivx data directory""" + """Return the default location of data directory""" if platform.system() == "Darwin": - return os.path.expanduser("~/Library/Application Support/PIVX/") + return os.path.expanduser("~/Library/Application Support/NetboxWallet/") elif platform.system() == "Windows": - return os.path.join(os.environ['APPDATA'], "PIVX") - return os.path.expanduser("~/.pivx") + return os.path.join(os.environ['APPDATA'], "NetboxWallet") + return os.path.expanduser("~/.NetboxWallet") def read_bitcoin_config(dbdir): - """Read the pivx.conf file from dbdir, returns dictionary of settings""" + """Read the nbx.conf file from dbdir, returns dictionary of settings""" from ConfigParser import SafeConfigParser class FakeSecHead(object): @@ -59,20 +59,20 @@ def readline(self): return s config_parser = SafeConfigParser() - config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "pivx.conf")))) + config_parser.readfp(FakeSecHead(open(os.path.join(dbdir, "nbx.conf")))) return dict(config_parser.items("all")) def connect_JSON(config): - """Connect to a pivx JSON-RPC server""" + """Connect to 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'] = 51475 if testnet else 51473 + config['rpcport'] = 28755 if testnet else 28735 connect = "http://%s:%s@127.0.0.1:%s"%(config['rpcuser'], config['rpcpassword'], config['rpcport']) try: result = ServiceProxy(connect) # ServiceProxy is lazy-connect, so send an RPC command mostly to catch connection errors, - # but also make sure the pivxd we're talking to is/isn't testnet: + # but also make sure the nbxd we're talking to is/isn't testnet: if result.getmininginfo()['testnet'] != testnet: sys.stderr.write("RPC server at "+connect+" testnet setting mismatch\n") sys.exit(1) @@ -81,36 +81,36 @@ def connect_JSON(config): sys.stderr.write("Error connecting to RPC server at "+connect+"\n") sys.exit(1) -def unlock_wallet(pivxd): - info = pivxd.getinfo() +def unlock_wallet(nbxd): + info = nbxd.getinfo() if 'unlocked_until' not in info: return True # wallet is not encrypted t = int(info['unlocked_until']) if t <= time.time(): try: passphrase = getpass.getpass("Wallet is locked; enter passphrase: ") - pivxd.walletpassphrase(passphrase, 5) + nbxd.walletpassphrase(passphrase, 5) except: sys.stderr.write("Wrong passphrase\n") - info = pivxd.getinfo() + info = nbxd.getinfo() return int(info['unlocked_until']) > time.time() -def list_available(pivxd): +def list_available(nbxd): address_summary = dict() address_to_account = dict() - for info in pivxd.listreceivedbyaddress(0): + for info in nbxd.listreceivedbyaddress(0): address_to_account[info["address"]] = info["account"] - unspent = pivxd.listunspent(0) + unspent = nbxd.listunspent(0) for output in unspent: # listunspent doesn't give addresses, so: - rawtx = pivxd.getrawtransaction(output['txid'], 1) + rawtx = nbxd.getrawtransaction(output['txid'], 1) vout = rawtx["vout"][output['vout']] pk = vout["scriptPubKey"] - # This code only deals with ordinary pay-to-pivx-address + # This code only deals with ordinary pay-to-nbx-address # or pay-to-script-hash outputs right now; anything exotic is ignored. if pk["type"] != "pubkeyhash" and pk["type"] != "scripthash": continue @@ -139,8 +139,8 @@ def select_coins(needed, inputs): n += 1 return (outputs, have-needed) -def create_tx(pivxd, fromaddresses, toaddress, amount, fee): - all_coins = list_available(pivxd) +def create_tx(nbxd, fromaddresses, toaddress, amount, fee): + all_coins = list_available(nbxd) total_available = Decimal("0.0") needed = amount+fee @@ -159,7 +159,7 @@ def create_tx(pivxd, fromaddresses, toaddress, amount, fee): # Note: # Python's json/jsonrpc modules have inconsistent support for Decimal numbers. # Instead of wrestling with getting json.dumps() (used by jsonrpc) to encode - # Decimals, I'm casting amounts to float before sending them to pivxd. + # Decimals, I'm casting amounts to float before sending them to nbxd. # outputs = { toaddress : float(amount) } (inputs, change_amount) = select_coins(needed, potential_inputs) @@ -170,8 +170,8 @@ def create_tx(pivxd, fromaddresses, toaddress, amount, fee): else: outputs[change_address] = float(change_amount) - rawtx = pivxd.createrawtransaction(inputs, outputs) - signed_rawtx = pivxd.signrawtransaction(rawtx) + rawtx = nbxd.createrawtransaction(inputs, outputs) + signed_rawtx = nbxd.signrawtransaction(rawtx) if not signed_rawtx["complete"]: sys.stderr.write("signrawtransaction failed\n") sys.exit(1) @@ -179,10 +179,10 @@ def create_tx(pivxd, fromaddresses, toaddress, amount, fee): return txdata -def compute_amount_in(pivxd, txinfo): +def compute_amount_in(nbxd, txinfo): result = Decimal("0.0") for vin in txinfo['vin']: - in_info = pivxd.getrawtransaction(vin['txid'], 1) + in_info = nbxd.getrawtransaction(vin['txid'], 1) vout = in_info['vout'][vin['vout']] result = result + vout['value'] return result @@ -193,12 +193,12 @@ def compute_amount_out(txinfo): result = result + vout['value'] return result -def sanity_test_fee(pivxd, txdata_hex, max_fee): +def sanity_test_fee(nbxd, txdata_hex, max_fee): class FeeError(RuntimeError): pass try: - txinfo = pivxd.decoderawtransaction(txdata_hex) - total_in = compute_amount_in(pivxd, txinfo) + txinfo = nbxd.decoderawtransaction(txdata_hex) + total_in = compute_amount_in(nbxd, txinfo) total_out = compute_amount_out(txinfo) if total_in-total_out > max_fee: raise FeeError("Rejecting transaction, unreasonable fee of "+str(total_in-total_out)) @@ -221,15 +221,15 @@ def main(): parser = optparse.OptionParser(usage="%prog [options]") parser.add_option("--from", dest="fromaddresses", default=None, - help="addresses to get PIVs from") + help="addresses to get NBXs from") parser.add_option("--to", dest="to", default=None, - help="address to get send PIVs to") + help="address to get send NBXs 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 pivx.conf file with RPC username/password (default: %default)") + help="location of nbx.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", @@ -240,10 +240,10 @@ def main(): check_json_precision() config = read_bitcoin_config(options.datadir) if options.testnet: config['testnet'] = True - pivxd = connect_JSON(config) + nbxd = connect_JSON(config) if options.amount is None: - address_summary = list_available(pivxd) + address_summary = list_available(nbxd) for address,info in address_summary.iteritems(): n_transactions = len(info['outputs']) if n_transactions > 1: @@ -253,14 +253,14 @@ def main(): else: fee = Decimal(options.fee) amount = Decimal(options.amount) - while unlock_wallet(pivxd) == False: + while unlock_wallet(nbxd) == False: pass # Keep asking for passphrase until they get it right - txdata = create_tx(pivxd, options.fromaddresses.split(","), options.to, amount, fee) - sanity_test_fee(pivxd, txdata, amount*Decimal("0.01")) + txdata = create_tx(nbxd, options.fromaddresses.split(","), options.to, amount, fee) + sanity_test_fee(nbxd, txdata, amount*Decimal("0.01")) if options.dry_run: print(txdata) else: - txid = pivxd.sendrawtransaction(txdata) + txid = nbxd.sendrawtransaction(txdata) print(txid) if __name__ == '__main__': diff --git a/contrib/valgrind.supp b/contrib/valgrind.supp index adf876139224a..db8627541d1c8 100644 --- a/contrib/valgrind.supp +++ b/contrib/valgrind.supp @@ -4,9 +4,9 @@ # in-tree. # # Example use: -# $ valgrind --suppressions=contrib/valgrind.supp src/test/test_pivx +# $ valgrind --suppressions=contrib/valgrind.supp src/test/test_nbx # $ valgrind --suppressions=contrib/valgrind.supp --leak-check=full \ -# --show-leak-kinds=all src/test/test_pivx --log_level=test_suite +# --show-leak-kinds=all src/test/test_nbx --log_level=test_suite { Suppress libstdc++ warning - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65434 Memcheck:Leak diff --git a/depends/README.md b/depends/README.md index 626a480a8dbf8..6918d5605e56e 100644 --- a/depends/README.md +++ b/depends/README.md @@ -58,7 +58,7 @@ For linux RISC-V 64-bit cross compilation (there are no packages for 32-bit): sudo apt-get install g++-riscv64-linux-gnu binutils-riscv64-linux-gnu -RISC-V known issue: gcc-7.3.0 and gcc-7.3.1 result in a broken `test_pivx` executable (see https://github.com/bitcoin/bitcoin/pull/13543), +RISC-V known issue: gcc-7.3.0 and gcc-7.3.1 result in a broken `test_nbx` executable (see https://github.com/bitcoin/bitcoin/pull/13543), this is apparently fixed in gcc-8.1.0. ### Dependency Options diff --git a/doc/README.md b/doc/README.md deleted file mode 100644 index 092e65d187a79..0000000000000 --- a/doc/README.md +++ /dev/null @@ -1,72 +0,0 @@ -PIVX Core -============= - -Setup ---------------------- -[PIVX Core](http://pivx.org/wallet) is the original PIVX client and it builds the backbone of the network. However, it downloads and stores the entire history of PIVX 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. Thankfully you only have to do this once. - -Running ---------------------- -The following are some helpful notes on how to run PIVX Core on your native platform. - -### Unix - -Unpack the files into a directory and run: - -- `bin/pivx-qt` (GUI) or -- `bin/pivxd` (headless) - -### Windows - -Unpack the files into a directory, and then run pivx-qt.exe. - -### macOS - -Drag PIVX-Qt to your applications folder, and then run PIVX-Qt. - -### Need Help? - -* See the documentation at the [PIVX Wiki](https://github.com/PIVX-Project/PIVX/wiki) -for help and more information. -* Ask for help on [BitcoinTalk](https://bitcointalk.org/index.php?topic=1262920.0) or on the [PIVX Forum](http://forum.pivx.org/). -* Join our Discord server [Discord Server](https://discord.pivx.org) - -Building ---------------------- -The following are developer notes on how to build PIVX Core on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc. - -- [Dependencies](dependencies.md) -- [macOS Build Notes](build-osx.md) -- [Unix Build Notes](build-unix.md) -- [Windows Build Notes](build-windows.md) -- [Gitian Building Guide](gitian-building.md) - -Development ---------------------- -The PIVX repo's [root README](/README.md) contains relevant information on the development process and automated testing. - -- [Developer Notes](developer-notes.md) -- [Multiwallet Qt Development](multiwallet-qt.md) -- [Release Notes](release-notes.md) -- [Release Process](release-process.md) -- [Source Code Documentation (External Link)](https://www.fuzzbawls.pw/pivx/doxygen/) -- [Translation Process](translation_process.md) -- [Unit Tests](unit-tests.md) -- [Unauthenticated REST Interface](REST-interface.md) -- [Dnsseed Policy](dnsseed-policy.md) - -### Resources -* Discuss on the [BitcoinTalk](https://bitcointalk.org/index.php?topic=1262920.0) or the [PIVX](http://forum.pivx.org/) forum. -* Join the [PIVX Discord](https://discord.pivx.org). - -### Miscellaneous -- [Assets Attribution](assets-attribution.md) -- [Files](files.md) -- [Tor Support](tor.md) -- [Init Scripts (systemd/upstart/openrc)](init.md) - -License ---------------------- -Distributed under the [MIT software license](/COPYING). -This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](https://www.openssl.org/). This product includes -cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard. diff --git a/doc/README_windows.txt b/doc/README_windows.txt deleted file mode 100644 index a0e5dba15ae73..0000000000000 --- a/doc/README_windows.txt +++ /dev/null @@ -1,19 +0,0 @@ -PIVX Core -===================== - -Intro ------ -PIVX 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. - - -Setup ------ -Unpack the files into a directory and run pivx-qt.exe. - -PIVX Core is the original PIVX client and it builds the backbone of the network. -However, it downloads and stores the entire history of PIVX 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. diff --git a/doc/REST-interface.md b/doc/REST-interface.md deleted file mode 100644 index f4fb8ee57cfe1..0000000000000 --- a/doc/REST-interface.md +++ /dev/null @@ -1,92 +0,0 @@ -Unauthenticated REST Interface -============================== - -The REST API can be enabled with the `-rest` option. - -Supported API -------------- - -#### Transactions -`GET /rest/tx/.` - -Given a transaction hash: returns a transaction in binary, hex-encoded binary, or JSON formats. - -For full TX query capability, one must enable the transaction index via "txindex=1" command line / configuration option. (enabled by default) - -#### Blocks -`GET /rest/block/.` -`GET /rest/block/notxdetails/.` - -Given a block hash: returns a block, in binary, hex-encoded binary or JSON formats. - -The HTTP request and response are both handled entirely in-memory, thus making maximum memory usage at least 4.66MB (2 MB max block, plus hex encoding) per request. - -With the /notxdetails/ option JSON response will only contain the transaction hash instead of the complete transaction details. The option only affects the JSON response. - -#### Blockheaders -`GET /rest/headers//.` - -Given a block hash: returns amount of blockheaders in upward direction. - -#### Chaininfos -`GET /rest/chaininfo.json` - -Returns various state info regarding block chain processing. -Only supports JSON as output format. -* chain : (string) current network name as defined in BIP70 (main, test, regtest) -* blocks : (numeric) the current number of blocks processed in the server -* headers : (numeric) the current number of headers we have validated -* bestblockhash : (string) the hash of the currently best block -* difficulty : (numeric) the current difficulty -* verificationprogress : (numeric) estimate of verification progress [0..1] -* chainwork : (string) total amount of work in active chain, in hexadecimal - -#### Query UTXO set -`GET /rest/getutxos//-/-/.../-.` - -The getutxo command allows querying of the UTXO set given a set of outpoints. -See BIP64 for input and output serialisation: -https://github.com/bitcoin/bips/blob/master/bip-0064.mediawiki - -Example: -``` -$ curl localhost:18332/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp -{ - "chaintipHash" : "00000000fb01a7f3745a717f8caebee056c484e6e0bfe4a9591c235bb70506fb", - "chainHeight" : 325347, - "utxos" : [ - { - "scriptPubKey" : { - "addresses" : [ - "mi7as51dvLJsizWnTMurtRmrP8hG2m1XvD" - ], - "type" : "pubkeyhash", - "hex" : "76a9141c7cebb529b86a04c683dfa87be49de35bcf589e88ac", - "reqSigs" : 1, - "asm" : "OP_DUP OP_HASH160 1c7cebb529b86a04c683dfa87be49de35bcf589e OP_EQUALVERIFY OP_CHECKSIG" - }, - "value" : 8.8687, - "height" : 2147483647, - "txvers" : 1 - } - ], - "bitmap" : "1" -} -``` - -#### Memory pool -`GET /rest/mempool/info.json` - -Returns various information about the TX mempool. -Only supports JSON as output format. -* size : (numeric) the number of transactions in the TX mempool -* bytes : (numeric) size of the TX mempool in bytes - -`GET /rest/mempool/contents.json` - -Returns transactions in the TX mempool. -Only supports JSON as output format. - -Risks -------------- -Running a web browser on the same node with a REST enabled pivxd can be a risk. Accessing prepared XSS websites could read out tx/block data of your node by placing links like `