Commit 25dbaaee authored by barrystyle's avatar barrystyle

MERGE correctional pass (mainly filelevel)

parent f88a9b3b
......@@ -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; MERGE-qt frontend will not be built])
fi
bitcoin_enable_qt=no
bitcoin_enable_qt_test=no
......@@ -54,7 +54,7 @@ AC_DEFUN([BITCOIN_QT_INIT],[
dnl enable qt support
AC_ARG_WITH([gui],
[AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@],
[build pivx-qt GUI (default=auto, qt5 tried first)])],
[build MERGE-qt GUI (default=auto, qt5 tried first)])],
[
bitcoin_qt_want_version=$withval
if test x$bitcoin_qt_want_version = xyes; then
......
......@@ -78,7 +78,7 @@ HEADERS += src/activemasternode.h \
src/crypter.h \
src/obfuscation-relay.h \
src/obfuscation.h \
src/pivx-config.h \
src/MERGE-config.h \
src/db.h \
src/eccryptoverify.h \
src/ecwrapper.h \
......@@ -131,7 +131,7 @@ HEADERS += src/activemasternode.h \
src/wallet_ismine.h \
src/walletdb.h \
src/compat/sanity.h \
src/config/pivx-config.h \
src/config/MERGE-config.h \
src/crypto/common.h \
src/crypto/hmac_sha256.h \
src/crypto/hmac_sha512.h \
......@@ -332,7 +332,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/MERGE.moc \
src/qt/intro.moc \
src/qt/overviewpage.moc \
src/qt/rpcconsole.moc \
......@@ -373,9 +373,9 @@ SOURCES += src/activemasternode.cpp \
src/crypter.cpp \
src/obfuscation-relay.cpp \
src/obfuscation.cpp \
src/pivx-cli.cpp \
src/pivx-tx.cpp \
src/pivx.cpp \
src/MERGE-cli.cpp \
src/MERGE-tx.cpp \
src/MERGE.cpp \
src/db.cpp \
src/eccryptoverify.cpp \
src/ecwrapper.cpp \
......@@ -470,8 +470,8 @@ SOURCES += src/activemasternode.cpp \
src/qt/coincontroltreewidget.cpp \
src/qt/csvmodelwriter.cpp \
src/qt/obfuscationconfig.cpp \
src/qt/pivx.cpp \
src/qt/pivxstrings.cpp \
src/qt/MERGE.cpp \
src/qt/MERGEstrings.cpp \
src/qt/editaddressdialog.cpp \
src/qt/guiutil.cpp \
src/qt/intro.cpp \
......@@ -549,7 +549,7 @@ SOURCES += src/activemasternode.cpp \
src/test/sighash_tests.cpp \
src/test/sigopcount_tests.cpp \
src/test/skiplist_tests.cpp \
src/test/test_pivx.cpp \
src/test/test_MERGE.cpp \
src/test/timedata_tests.cpp \
src/test/transaction_tests.cpp \
src/test/uint256_tests.cpp \
......@@ -640,21 +640,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/MERGE.qrc src/qt/MERGE_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/MERGE_bg.ts \
src/qt/locale/MERGE_de.ts \
src/qt/locale/MERGE_en.ts \
src/qt/locale/MERGE_es.ts \
src/qt/locale/MERGE_fi.ts \
src/qt/locale/MERGE_fr.ts \
src/qt/locale/MERGE_it.ts \
src/qt/locale/MERGE_ja.ts \
src/qt/locale/MERGE_pl.ts \
src/qt/locale/MERGE_pt.ts \
src/qt/locale/MERGE_ru.ts \
src/qt/locale/MERGE_sk.ts \
src/qt/locale/MERGE_sv.ts \
src/qt/locale/MERGE_vi.ts \
src/qt/locale/MERGE_zh_CN.ts \
src/qt/locale/MERGE_zh_TW.ts
# bash programmable completion for pivxd(1) and pivx-cli(1)
# bash programmable completion for MERGEd(1) and MERGE-cli(1)
# Copyright (c) 2012,2014 Christian von Roques <roques@mti.ag>
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
have pivxd && {
have MERGEd && {
# call $pivxd for RPC
_pivx_rpc() {
# call $MERGEd for RPC
_MERGE_rpc() {
# determine already specified args necessary for RPC
local rpcargs=()
for i in ${COMP_LINE}; do
......@@ -16,23 +16,23 @@ _pivx_rpc() {
;;
esac
done
$pivxd "${rpcargs[@]}" "$@"
$MERGEd "${rpcargs[@]}" "$@"
}
# Add pivx accounts to COMPREPLY
_pivx_accounts() {
# Add MERGE accounts to COMPREPLY
_MERGE_accounts() {
local accounts
accounts=$(_pivx_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}')
accounts=$(_MERGE_rpc listaccounts | awk '/".*"/ { a=$1; gsub(/"/, "", a); print a}')
COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "$accounts" -- "$cur" ) )
}
_pivxd() {
_MERGEd() {
local cur prev words=() cword
local pivxd
local MERGEd
# save and use original argument to invoke pivxd
# pivxd might not be in $PATH
pivxd="$1"
# save and use original argument to invoke MERGEd
# MERGEd might not be in $PATH
MERGEd="$1"
COMPREPLY=()
_get_comp_words_by_ref -n = cur prev words cword
......@@ -53,7 +53,7 @@ _pivxd() {
if ((cword > 3)); then
case ${words[cword-3]} in
addmultisigaddress)
_pivx_accounts
_MERGE_accounts
return 0
;;
getbalance|gettxout|importaddress|importprivkey|listreceivedbyaccount|listreceivedbyaddress|listsinceblock)
......@@ -74,7 +74,7 @@ _pivxd() {
return 0
;;
move|setaccount)
_pivx_accounts
_MERGE_accounts
return 0
;;
esac
......@@ -90,7 +90,7 @@ _pivxd() {
return 0
;;
getaccountaddress|getaddressesbyaccount|getbalance|getnewaddress|getreceivedbyaccount|listtransactions|move|sendfrom|sendmany)
_pivx_accounts
_MERGE_accounts
return 0
;;
esac
......@@ -114,12 +114,12 @@ _pivxd() {
# only parse --help if senseful
if [[ -z "$cur" || "$cur" =~ ^- ]]; then
helpopts=$($pivxd --help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' )
helpopts=$($MERGEd --help 2>&1 | awk '$1 ~ /^-/ { sub(/=.*/, "="); print $1 }' )
fi
# only parse help if senseful
if [[ -z "$cur" || "$cur" =~ ^[a-z] ]]; then
commands=$(_pivx_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }')
commands=$(_MERGE_rpc help 2>/dev/null | awk '$1 ~ /^[a-z]/ { print $1; }')
fi
COMPREPLY=( $( compgen -W "$helpopts $commands" -- "$cur" ) )
......@@ -133,7 +133,7 @@ _pivxd() {
esac
}
complete -F _pivxd pivxd pivx-cli
complete -F _MERGEd MERGEd MERGE-cli
}
# Local variables:
......
[Desktop Entry]
Encoding=UTF-8
Name=MERGE
Comment=MERGE P2P Cryptocurrency
Comment[fr]=MERGE, monnaie virtuelle cryptographique pair à pair
Comment[tr]=MERGE, eşten eşe kriptografik sanal para birimi
Exec=MERGE-qt %u
Terminal=false
Type=Application
Icon=MERGE128
MimeType=x-scheme-handler/MERGE;
Categories=Office;Finance;
usr/local/bin/pivx-qt usr/bin
usr/local/bin/MERGE-qt usr/bin
share/pixmaps/bitcoin32.xpm usr/share/pixmaps
share/pixmaps/bitcoin16.xpm usr/share/pixmaps
share/pixmaps/bitcoin128.png usr/share/pixmaps
debian/pivx-qt.desktop usr/share/applications
debian/pivx-qt.protocol usr/share/kde4/services/
debian/MERGE-qt.desktop usr/share/applications
debian/MERGE-qt.protocol usr/share/kde4/services/
# Linked code is Expat - only Debian packaging is GPL-2+
pivx-qt: possible-gpl-code-linked-with-openssl
MERGE-qt: possible-gpl-code-linked-with-openssl
[Protocol]
exec=pivx-qt '%u'
protocol=pivx
exec=MERGE-qt '%u'
protocol=MERGE
input=none
output=none
helper=true
......
contrib/MERGEd.bash-completion MERGEd
debian/examples/MERGE.conf
usr/local/bin/MERGEd usr/bin
usr/local/bin/MERGE-cli usr/bin
# Linked code is Expat - only Debian packaging is GPL-2+
pivxd: possible-gpl-code-linked-with-openssl
MERGEd: possible-gpl-code-linked-with-openssl
debian/manpages/MERGEd.1
debian/manpages/MERGE.conf.5
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 MERGEd/MERGE-qt
for Debian-based Linux systems. If you compile MERGEd/MERGE-qt yourself, there are some useful files here.
## pivx: URI support ##
## MERGE: URI support ##
pivx-qt.desktop (Gnome / Open Desktop)
MERGE-qt.desktop (Gnome / Open Desktop)
To install:
sudo desktop-file-install pivx-qt.desktop
sudo desktop-file-install MERGE-qt.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 pivxqt binary to `/usr/bin`
and the `../../share/pixmaps/pivx128.png` to `/usr/share/pixmaps`
the .desktop file or copy or symlink your MERGEqt binary to `/usr/bin`
and the `../../share/pixmaps/MERGE128.png` to `/usr/share/pixmaps`
pivx-qt.protocol (KDE)
MERGE-qt.protocol (KDE)
......@@ -365,8 +365,8 @@ bitcoin (0.3.19~dfsg-5) unstable; urgency=low
bitcoin (0.3.19~dfsg-4) unstable; urgency=low
[ Micah Anderson ]
* Provide example pivx.conf.
* Add bitcoind(1) and pivx.conf(5) man pages.
* Provide example MERGE.conf.
* Add bitcoind(1) and MERGE.conf(5) man pages.
[ Jonas Smedegaard ]
* Ease backporting:
......
Source: pivx
Source: MERGE
Section: utils
Priority: optional
Maintainer: Jonas Smedegaard <dr@jones.dk> ***TODO***
......@@ -22,15 +22,15 @@ Build-Depends: debhelper,
libqrencode-dev,
libprotobuf-dev, protobuf-compiler
Standards-Version: 3.9.2
Homepage: http://www.pivx.org
Homepage: http://www.MERGE.org
Vcs-Git: git://github.com/PIVX-Project/PIVX.git
Vcs-Browser: http://github.com/PIVX-Project/PIVX
Package: pivxd
Package: MERGEd
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
MERGE 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
......@@ -39,14 +39,14 @@ Description: peer-to-peer network based digital currency - daemon
Full transaction history is stored locally at each client. This
requires 1+ 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, MERGEd, and the CLI tool
MERGE-cli to interact with the daemon.
Package: pivx-qt
Package: MERGE-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
MERGE 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
......@@ -55,4 +55,4 @@ Description: peer-to-peer network based digital currency - Qt GUI
Full transaction history is stored locally at each client. This
requires 1+ GB of space, slowly growing.
.
This package provides Pivx-Qt, a GUI for Pivx based on Qt.
This package provides MERGE-Qt, a GUI for MERGE based on Qt.
##
## pivx.conf configuration file. Lines beginning with # are comments.
## MERGE.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 MERGE network.
#testnet=0
# Run a regression test network
......@@ -51,17 +51,17 @@
#maxconnections=
#
# JSON-RPC options (for controlling a running Pivx/pivxd process)
# JSON-RPC options (for controlling a running MERGE/MERGEd process)
#
# server=1 tells Pivx-QT and pivxd to accept JSON-RPC commands
# server=1 tells MERGE-QT and MERGEd to accept JSON-RPC commands
#server=0
# You must set rpcuser and rpcpassword to secure the JSON-RPC api
#rpcuser=Ulysseys
#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
# How many seconds pivx will wait for a complete RPC HTTP request.
# How many seconds MERGE will wait for a complete RPC HTTP request.
# after the HTTP connection is established.
#rpctimeout=30
......@@ -72,8 +72,8 @@
# 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 MERGE-QT to accept JSON-RPC commands.
# it is also read by MERGEd 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
......@@ -81,12 +81,12 @@
# Listen for RPC connections on this TCP port:
#rpcport=51473
# You can use Pivx or pivxd to send commands to Pivx/pivxd
# You can use MERGE or MERGEd to send commands to MERGE/MERGEd
# running on another host using this option:
#rpcconnect=127.0.0.1
# Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate
# with Pivx -server or pivxd
# with MERGE -server or MERGEd
#rpcssl=1
# OpenSSL settings used when rpcssl=1
......@@ -108,7 +108,7 @@
# User interface options
# Start Pivx minimized
# Start MERGE minimized
#min=1
# Minimize to the system tray
......
.TH PIV-QT "1" "February 2017" "pivx-qt 1"
.TH PIV-QT "1" "February 2017" "MERGE-qt 1"
.SH NAME
pivx-qt \- peer-to-peer network based digital currency
MERGE-qt \- peer-to-peer network based digital currency
.SH DESCRIPTION
.SS "Usage:"
.IP
pivx\-qt [command\-line options]
MERGE\-qt [command\-line options]
.SH OPTIONS
.TP
\-?
This help message
.TP
\fB\-conf=\fR<file>
Specify configuration file (default: pivx.conf)
Specify configuration file (default: MERGE.conf)
.TP
\fB\-pid=\fR<file>
Specify pid file (default: pivxd.pid)
Specify pid file (default: MERGEd.pid)
.TP
\fB\-gen\fR
Generate coins
......
.TH PIV.CONF "5" "January 2011" "pivx.conf 3.19"
.TH PIV.CONF "5" "January 2011" "MERGE.conf 3.19"
.SH NAME
pivx.conf \- pivx configuration file
MERGE.conf \- MERGE configuration file
.SH SYNOPSIS
All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file.
.TP
The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character.
.TP
The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, pivxd(1) will look for a file named pivx.conf(5) in the pivx data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments.
The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, MERGEd(1) will look for a file named MERGE.conf(5) in the MERGE data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments.
.SH LOCATION
pivx.conf should be located in $HOME/.pivx
MERGE.conf should be located in $HOME/.MERGE
.SH NETWORK-RELATED SETTINGS
.TP
.TP
\fBtestnet=\fR[\fI'1'\fR|\fI'0'\fR]
Enable or disable run on the test network instead of the real *pivx* network.
Enable or disable run on the test network instead of the real *MERGE* network.
.TP
\fBproxy=\fR\fI'127.0.0.1:9050'\fR
Connect via a socks4 proxy.
......@@ -29,7 +29,7 @@ Maximum number of inbound+outbound connections.
.SH JSON-RPC OPTIONS
.TP
\fBserver=\fR[\fI'1'\fR|\fI'0'\fR]
Tells *pivx* to accept or not accept JSON-RPC commands.
Tells *MERGE* to accept or not accept JSON-RPC commands.
.TP
\fBrpcuser=\fR\fI'username'\fR
You must set *rpcuser* to secure the JSON-RPC api.
......@@ -44,10 +44,10 @@ By default, only RPC connections from localhost are allowed. Specify as many *rp
Listen for RPC connections on this TCP port.
.TP
\fBrpcconnect=\fR\fI'127.0.0.1'\fR
You can use *pivx* or *pivxd(1)* to send commands to *pivx*/*pivxd(1)* running on another host using this option.
You can use *MERGE* or *MERGEd(1)* to send commands to *MERGE*/*MERGEd(1)* running on another host using this option.
.TP
\fBrpcssl=\fR\fI'1'\fR
Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate with *pivx* '\-server' or *pivxd(1)*. Example of OpenSSL settings used when *rpcssl*='1':
Use Secure Sockets Layer (also known as TLS or HTTPS) to communicate with *MERGE* '\-server' or *MERGEd(1)*. Example of OpenSSL settings used when *rpcssl*='1':
.TP
\fB\-rpcsslciphers=\fR<ciphers>
Acceptable ciphers (default: TLSv1+HIGH:\:!SSLv2:\:!aNULL:\:!eNULL:\:!AH:\:!3DES:\:@STRENGTH)
......@@ -76,12 +76,12 @@ Allow direct connections for the 'pay via IP address' feature.
.SH USER INTERFACE OPTIONS
.TP
\fBmin=\fR[\fI'0'\fR|\fI'1'\fR]
Enable or disable start pivxd minimized.
Enable or disable start MERGEd minimized.
.TP
\fBminimizetotray=\fR[\fI'0'\fR|\fI'1'\fR]
Enable or disable minimize to the system tray.
.SH "SEE ALSO"
pivxd(1)
MERGEd(1)
.SH AUTHOR
This manual page was written by Micah Anderson <micah@debian.org> for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation.
......
.TH PIVD "1" "February 2017" "pivxd 2.1.4.1"
.TH PIVD "1" "February 2017" "MERGEd 2.1.4.1"
.SH NAME
Pivx \- peer-to-peer network based digital currency
MERGE \- peer-to-peer network based digital currency
.SH SYNOPSIS
pivxd [options] <command> [params]
MERGEd [options] <command> [params]
.TP
pivxd [options] help <command> \- Get help for a command
MERGEd [options] help <command> \- Get help for a command
.SH DESCRIPTION
This manual page documents the pivxd program. Pivx is a peer-to-peer digital currency. Peer-to-peer (P2P) means that there is no central authority to issue new money or keep track of transactions. Instead, these tasks are managed collectively by the nodes of the network. Advantages:
This manual page documents the MERGEd program. MERGE is a peer-to-peer digital currency. Peer-to-peer (P2P) means that there is no central authority to issue new money or keep track of transactions. Instead, these tasks are managed collectively by the nodes of the network. Advantages:
Pivx can be sent easily through the Internet, without having to trust middlemen. Transactions are designed to be irreversible. Be safe from instability caused by fractional reserve banking and central banks. The limited inflation of the Pivx system’s money supply is distributed evenly (by CPU power) throughout the network, not monopolized by banks.
MERGE can be sent easily through the Internet, without having to trust middlemen. Transactions are designed to be irreversible. Be safe from instability caused by fractional reserve banking and central banks. The limited inflation of the MERGE system’s money supply is distributed evenly (by CPU power) throughout the network, not monopolized by banks.
.SH OPTIONS
.TP
\fB\-conf=\fR<file>
Specify configuration file (default: pivx.conf)
Specify configuration file (default: MERGE.conf)
.TP
\fB\-gen\fR
Generate coins
......@@ -84,14 +84,14 @@ This help message
\fBbackupwallet 'destination'\fR
Safely copies *wallet.dat* to 'destination', which can be a directory or a path with filename.
.TP
\fBgetaccount 'pivxaddress'\fR
\fBgetaccount 'MERGEaddress'\fR
Returns the account associated with the given address.
.TP
\fBsetaccount 'pivxaddress' ['account']\fR
\fBsetaccount 'MERGEaddress' ['account']\fR
Sets the ['account'] associated with the given address. ['account'] may be omitted to remove an address from ['account'].
.TP
\fBgetaccountaddress 'account'\fR
Returns a new pivx address for 'account'.
Returns a new MERGE address for 'account'.
.TP
\fBgetaddressesbyaccount 'account'\fR
Returns the list of addresses associated with the given 'account'.
......@@ -124,13 +124,13 @@ Returns a recent hashes per second performance measurement while generating.
Returns an object containing server information.
.TP
\fBgetnewaddress 'account'\fR
Returns a new pivx address for receiving payments. If 'account' is specified (recommended), it is added to the address book so payments received with the address will be credited to 'account'.
Returns a new MERGE address for receiving payments. If 'account' is specified (recommended), it is added to the address book so payments received with the address will be credited to 'account'.
.TP
\fBgetreceivedbyaccount 'account' ['minconf=1']\fR
Returns the total amount received by addresses associated with 'account' in transactions with at least ['minconf'] confirmations.
.TP
\fBgetreceivedbyaddress 'pivxaddress' ['minconf=1']\fR
Returns the total amount received by 'pivxaddress' in transactions with at least ['minconf'] confirmations.
\fBgetreceivedbyaddress 'MERGEaddress' ['minconf=1']\fR
Returns the total amount received by 'MERGEaddress' in transactions with at least ['minconf'] confirmations.
.TP
\fBgettransaction 'txid'\fR
Returns information about a specific transaction, given hexadecimal transaction ID.
......@@ -148,7 +148,7 @@ List commands, or get help for a command.
.TP
\fBlistaccounts ['minconf=1']\fR
List accounts and their current balances.
*note: requires pivx 1.0.2.1 or later.
*note: requires MERGE 1.0.2.1 or later.
.TP
\fBlistreceivedbyaccount ['minconf=1'] ['includeempty=false']\fR
['minconf'] is the minimum number of confirmations before payments are included. ['includeempty'] whether to include addresses that haven't received any payments. Returns an array of objects containing:
......@@ -177,31 +177,31 @@ Returns a list of the last ['count'] transactions for 'account' \- for all accou
"message" : message associated with transaction (only for send).
"to" : message-to associated with transaction (only for send).
*note: requires pivx 1.0.2.1 or later.
*note: requires MERGE 1.0.2.1 or later.
.TP
\fBmove <'fromaccount'> <'toaccount'> <'amount'> ['minconf=1'] ['comment']\fR
Moves funds between accounts.
.TP
\fBsendfrom* <'account'> <'pivxaddress'> <'amount'> ['minconf=1'] ['comment'] ['comment-to']\fR
Sends amount from account's balance to 'pivxaddress'. This method will fail if there is less than amount PIV with ['minconf'] confirmations in the account's balance (unless account is the empty-string-named default account; it behaves like the *sendtoaddress* method). Returns transaction ID on success.
\fBsendfrom* <'account'> <'MERGEaddress'> <'amount'> ['minconf=1'] ['comment'] ['comment-to']\fR
Sends amount from account's balance to 'MERGEaddress'. This method will fail if there is less than amount PIV with ['minconf'] confirmations in the account's balance (unless account is the empty-string-named default account; it behaves like the *sendtoaddress* method). Returns transaction ID on success.
.TP
\fBsendtoaddress 'pivxaddress' 'amount' ['comment'] ['comment-to']\fR
Sends amount from the server's available balance to 'pivxaddress'. amount is a real and is rounded to the nearest 0.01. Returns transaction id on success.
\fBsendtoaddress 'MERGEaddress' 'amount' ['comment'] ['comment-to']\fR
Sends amount from the server's available balance to 'MERGEaddress'. amount is a real and is rounded to the nearest 0.01. Returns transaction id on success.
.TP
\fBstop\fR
Stops the pivx server.
Stops the MERGE server.
.TP
\fBvalidateaddress 'pivxaddress'\fR
Checks that 'pivxaddress' looks like a proper Pivx address. Returns an object containing:
\fBvalidateaddress 'MERGEaddress'\fR
Checks that 'MERGEaddress' looks like a proper MERGE address. Returns an object containing:
"isvalid" : true or false.
"ismine" : true if the address is in the server's wallet.
"address" : pivxaddress.
"address" : MERGEaddress.
*note: ismine and address are only returned if the address is valid.
.SH "SEE ALSO"
pivx.conf(5)
MERGE.conf(5)
.SH AUTHOR
This manual page was written by Micah Anderson <micah@debian.org> for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation.
......
[Desktop Entry]
Encoding=UTF-8
Name=Pivx
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;
contrib/pivxd.bash-completion pivxd
usr/local/bin/pivxd usr/bin
usr/local/bin/pivx-cli usr/bin
debian/manpages/pivxd.1
debian/manpages/pivx.conf.5
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
#DEB_MAKE_CHECK_TARGET = test_pivx
#DEB_MAKE_CHECK_TARGET = test_MERGE
#build/bitcoind::
# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_pivx)
# $(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,src/test_MERGE)
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/MERGE-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:
......
......@@ -93,10 +93,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_MERGE: symbol memcpy from unsupported version GLIBC_2.14
.../64/test_MERGE: symbol __fdelt_chk from unsupported version GLIBC_2.15
.../64/test_MERGE: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15
.../64/test_MERGE: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15
update-translations.py
======================
......