maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Misc updates to match Dogecoin (#1460)

Browse source 
* Updated linearize for Dogecoin 🐕

* Update qt forms. 🎉 🐕

* Replaced occasions of bitcoin to dogecoin in contrib files consistent with previous changes. 🎉

* Changing to the proper ports for Dogecoin.
This commit is contained in:
Ross Nicoll 2018-02-04 19:50:03 +00:00
parent 3a8a6051f2
commit 45e286d005
13 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contrib/README.md
View file

@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain.
### [Qos](/contrib/qos) ### ### [Qos](/contrib/qos) ###
A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Dogecoin network. This means one can have an always-on dogecoind instance running, and another local dogecoind/dogecoin-qt instance which connects to this node and receives blocks from it.
### [Seeds](/contrib/seeds) ### ### [Seeds](/contrib/seeds) ###
Utility to generate the pnSeed[] array that is compiled into the client. Utility to generate the pnSeed[] array that is compiled into the client.
@ -22,20 +22,20 @@ Build Tools and Keys
--------------------- ---------------------
### [Debian](/contrib/debian) ### ### [Debian](/contrib/debian) ###
Contains files used to package bitcoind/bitcoin-qt Contains files used to package dogecoind/dogecoin-qt
for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here. for Debian-based Linux systems. If you compile dogecoind/dogecoin-qt yourself, there are some useful files here.
### [Gitian-descriptors](/contrib/gitian-descriptors) ### ### [Gitian-descriptors](/contrib/gitian-descriptors) ###
Notes on getting Gitian builds up and running using KVM. Notes on getting Gitian builds up and running using KVM.
### [Gitian-keys](/contrib/gitian-keys) ### [Gitian-keys](/contrib/gitian-keys)
PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results. PGP keys used for signing Dogecoin Core [Gitian release](/doc/release-process.md) results.
### [MacDeploy](/contrib/macdeploy) ### ### [MacDeploy](/contrib/macdeploy) ###
Scripts and notes for Mac builds. Scripts and notes for Mac builds.
### [RPM](/contrib/rpm) ### ### [RPM](/contrib/rpm) ###
RPM spec file for building bitcoin-core on RPM based distributions RPM spec file for building dogecoin-core on RPM based distributions
### [Gitian-build](/contrib/gitian-build.sh) ### ### [Gitian-build](/contrib/gitian-build.sh) ###
Script for running full Gitian builds. Script for running full Gitian builds.
@ -44,7 +44,7 @@ Test and Verify Tools
--------------------- ---------------------
### [TestGen](/contrib/testgen) ### ### [TestGen](/contrib/testgen) ###
Utilities to generate test vectors for the data-driven Bitcoin tests. Utilities to generate test vectors for the data-driven Dogecoin tests.
### [Verify Binaries](/contrib/verifybinaries) ### ### [Verify Binaries](/contrib/verifybinaries) ###
This script attempts to download and verify the signature file SHA256SUMS.asc from bitcoin.org. This script attempts to download and verify the signature file SHA256SUMS.asc from dogecoin.com.

6
contrib/linearize/README.md
View file

@ -11,7 +11,7 @@ Required configuration file settings for linearize-hashes:
Optional config file setting for linearize-hashes: Optional config file setting for linearize-hashes:
* RPC: `host` (Default: `127.0.0.1`) * RPC: `host` (Default: `127.0.0.1`)
* RPC: `port` (Default: `8332`) * RPC: `port` (Default: `22555`)
* Blockchain: `min_height`, `max_height` * Blockchain: `min_height`, `max_height`
* `rev_hash_bytes`: If true, the written block hash list will be * `rev_hash_bytes`: If true, the written block hash list will be
byte-reversed. (In other words, the hash returned by getblockhash will have its byte-reversed. (In other words, the hash returned by getblockhash will have its
@ -20,7 +20,7 @@ standalone hash lists but safe to use with linearize-data.py, which will output
the same data no matter which byte format is chosen. the same data no matter which byte format is chosen.
The `linearize-hashes` script requires a connection, local or remote, to a The `linearize-hashes` script requires a connection, local or remote, to a
JSON-RPC server. Running `bitcoind` or `bitcoin-qt -server` will be sufficient. JSON-RPC server. Running `dogecoind` or `dogecoin-qt -server` will be sufficient.
## Step 2: Copy local block data ## Step 2: Copy local block data
@ -38,7 +38,7 @@ will be printed.
respectively, to the current time and to the timestamp of the most recent block respectively, to the current time and to the timestamp of the most recent block
written to the script's blockchain. written to the script's blockchain.
* `genesis`: The hash of the genesis block in the blockchain. * `genesis`: The hash of the genesis block in the blockchain.
* `input`: bitcoind blocks/ directory containing blkNNNNN.dat * `input`: dogecoind blocks/ directory containing blkNNNNN.dat
* `hashlist`: text file containing list of block hashes created by * `hashlist`: text file containing list of block hashes created by
linearize-hashes.py. linearize-hashes.py.
* `max_out_sz`: Maximum size for files created by the `output_file` option. * `max_out_sz`: Maximum size for files created by the `output_file` option.

20
contrib/linearize/example-linearize.cfg
View file

@ -1,24 +1,24 @@
# bitcoind RPC settings (linearize-hashes) # dogecoind RPC settings (linearize-hashes)
rpcuser=someuser rpcuser=someuser
rpcpassword=somepassword rpcpassword=somepassword
host=127.0.0.1 host=127.0.0.1
port=8332 port=22555
#port=18332 #port=44555
# bootstrap.dat hashlist settings (linearize-hashes) # bootstrap.dat hashlist settings (linearize-hashes)
max_height=313000 max_height=2000000
# bootstrap.dat input/output settings (linearize-data) # bootstrap.dat input/output settings (linearize-data)
# mainnet # mainnet
netmagic=f9beb4d9 netmagic=c0c0c0c0
genesis=000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f genesis=1a91e3dace36e2be3bf030a65679fe821aa1d6ef92e7c9902eb318182c355691
input=/home/example/.bitcoin/blocks input=/home/example/.dogecoin/blocks
# testnet # testnet
#netmagic=0b110907 #netmagic=fcc1b7dc
#genesis=000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943 #genesis=bb0a78264637406b6360aad926284d544d7049f45189db5664f3c4d07350559e
#input=/home/example/.bitcoin/testnet3/blocks #input=/home/example/.dogecoin/testnet3/blocks
# "output" option causes blockchain files to be written to the given location, # "output" option causes blockchain files to be written to the given location,
# with "output_file" ignored. If not used, "output_file" is used instead. # with "output_file" ignored. If not used, "output_file" is used instead.

4
contrib/linearize/linearize-data.py
View file

@ -283,9 +283,9 @@ if __name__ == '__main__':
settings['rev_hash_bytes'] = settings['rev_hash_bytes'].lower() settings['rev_hash_bytes'] = settings['rev_hash_bytes'].lower()
if 'netmagic' not in settings: if 'netmagic' not in settings:
settings['netmagic'] = 'f9beb4d9' settings['netmagic'] = 'c0c0c0c0'
if 'genesis' not in settings: if 'genesis' not in settings:
settings['genesis'] = '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f' settings['genesis'] = '1a91e3dace36e2be3bf030a65679fe821aa1d6ef92e7c9902eb318182c355691'
if 'input' not in settings: if 'input' not in settings:
settings['input'] = 'input' settings['input'] = 'input'
if 'hashlist' not in settings: if 'hashlist' not in settings:

4
contrib/linearize/linearize-hashes.py
View file

@ -115,11 +115,11 @@ if __name__ == '__main__':
if 'host' not in settings: if 'host' not in settings:
settings['host'] = '127.0.0.1' settings['host'] = '127.0.0.1'
if 'port' not in settings: if 'port' not in settings:
settings['port'] = 8332 settings['port'] = 22555
if 'min_height' not in settings: if 'min_height' not in settings:
settings['min_height'] = 0 settings['min_height'] = 0
if 'max_height' not in settings: if 'max_height' not in settings:
settings['max_height'] = 313000 settings['max_height'] = 2000000
if 'rev_hash_bytes' not in settings: if 'rev_hash_bytes' not in settings:
settings['rev_hash_bytes'] = 'false' settings['rev_hash_bytes'] = 'false'
if 'rpcuser' not in settings or 'rpcpassword' not in settings: if 'rpcuser' not in settings or 'rpcpassword' not in settings:

4
contrib/qos/README.md
View file

@ -1,5 +1,5 @@
### QoS (Quality of service) ### ### QoS (Quality of service) ###
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 8333, but not if the destination IP is within a LAN. This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Dogecoin network. It limits outbound TCP traffic with a source or destination port of 22556, but not if the destination IP is within a LAN.
This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it. This means one can have an always-on dogecoind instance running, and another local dogecoind/dogecoin-qt instance which connects to this node and receives blocks from it.

10
contrib/qos/tc.sh
View file

@ -44,16 +44,16 @@ fi
# ret=$? # ret=$?
#done #done
#limit outgoing traffic to and from port 8333. but not when dealing with a host on the local network #limit outgoing traffic to and from port 22556. but not when dealing with a host on the local network
# (defined by $LOCALNET_V4 and $LOCALNET_V6) # (defined by $LOCALNET_V4 and $LOCALNET_V6)
# --set-mark marks packages matching these criteria with the number "2" (v4) # --set-mark marks packages matching these criteria with the number "2" (v4)
# --set-mark marks packages matching these criteria with the number "4" (v6) # --set-mark marks packages matching these criteria with the number "4" (v6)
# these packets are filtered by the tc filter with "handle 2" # these packets 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} # 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 8333 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2 iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 22556 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2
iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2 iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 22556 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2
if [ ! -z "${LOCALNET_V6}" ] ; then if [ ! -z "${LOCALNET_V6}" ] ; then
ip6tables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4 ip6tables -t mangle -A OUTPUT -p tcp -m tcp --dport 22556 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4
ip6tables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4 ip6tables -t mangle -A OUTPUT -p tcp -m tcp --sport 22556 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4
fi fi

16
contrib/rpm/bitcoin.spec
View file

@ -334,10 +334,10 @@ if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then
for selinuxvariant in %{selinux_variants}; do for selinuxvariant in %{selinux_variants}; do
%{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/bitcoin.pp &> /dev/null || : %{_sbindir}/semodule -s ${selinuxvariant} -i %{_datadir}/selinux/${selinuxvariant}/bitcoin.pp &> /dev/null || :
done done
%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 8332 %{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 22555
%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 8333 %{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 22556
%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18332 %{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 44555
%{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 18333 %{_sbindir}/semanage port -a -t bitcoin_port_t -p tcp 44556
%{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || : %{_sbindir}/fixfiles -R bitcoin-server restore &> /dev/null || :
%{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || : %{_sbindir}/restorecon -R %{_localstatedir}/lib/bitcoin || :
fi fi
@ -353,10 +353,10 @@ fi
# SELinux # SELinux
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then if [ `%{_sbindir}/sestatus |grep -c "disabled"` -eq 0 ]; then
%{_sbindir}/semanage port -d -p tcp 8332 %{_sbindir}/semanage port -d -p tcp 22555
%{_sbindir}/semanage port -d -p tcp 8333 %{_sbindir}/semanage port -d -p tcp 22556
%{_sbindir}/semanage port -d -p tcp 18332 %{_sbindir}/semanage port -d -p tcp 44555
%{_sbindir}/semanage port -d -p tcp 18333 %{_sbindir}/semanage port -d -p tcp 44556
for selinuxvariant in %{selinux_variants}; do for selinuxvariant in %{selinux_variants}; do
%{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || : %{_sbindir}/semodule -s ${selinuxvariant} -r bitcoin &> /dev/null || :
done done

6
contrib/seeds/generate-seeds.py
View file

@ -120,17 +120,17 @@ def main():
g.write('#ifndef BITCOIN_CHAINPARAMSSEEDS_H\n') g.write('#ifndef BITCOIN_CHAINPARAMSSEEDS_H\n')
g.write('#define BITCOIN_CHAINPARAMSSEEDS_H\n') g.write('#define BITCOIN_CHAINPARAMSSEEDS_H\n')
g.write('/**\n') g.write('/**\n')
g.write(' * List of fixed seed nodes for the bitcoin network\n') g.write(' * List of fixed seed nodes for the dogecoin network\n')
g.write(' * AUTOGENERATED by contrib/seeds/generate-seeds.py\n') g.write(' * AUTOGENERATED by contrib/seeds/generate-seeds.py\n')
g.write(' *\n') g.write(' *\n')
g.write(' * Each line contains a 16-byte IPv6 address and a port.\n') g.write(' * Each line contains a 16-byte IPv6 address and a port.\n')
g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n') g.write(' * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.\n')
g.write(' */\n') g.write(' */\n')
with open(os.path.join(indir,'nodes_main.txt'),'r') as f: with open(os.path.join(indir,'nodes_main.txt'),'r') as f:
process_nodes(g, f, 'pnSeed6_main', 8333) process_nodes(g, f, 'pnSeed6_main', 22556)
g.write('\n') g.write('\n')
with open(os.path.join(indir,'nodes_test.txt'),'r') as f: with open(os.path.join(indir,'nodes_test.txt'),'r') as f:
process_nodes(g, f, 'pnSeed6_test', 18333) process_nodes(g, f, 'pnSeed6_test', 44556)
g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n') g.write('#endif // BITCOIN_CHAINPARAMSSEEDS_H\n')
if __name__ == '__main__': if __name__ == '__main__':

4
src/qt/forms/modaloverlay.ui
View file

@ -130,7 +130,7 @@ QLabel { color: rgb(40,40,40); }</string>
<item> <item>
<widget class="QLabel" name="infoText"> <widget class="QLabel" name="infoText">
<property name="text"> <property name="text">
<string>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the bitcoin network, as detailed below.</string> <string>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the dogecoin network, as detailed below.</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>
@ -149,7 +149,7 @@ QLabel { color: rgb(40,40,40); }</string>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Attempting to spend bitcoins that are affected by not-yet-displayed transactions will not be accepted by the network.</string> <string>Attempting to spend dogecoins that are affected by not-yet-displayed transactions will not be accepted by the network.</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::RichText</enum> <enum>Qt::RichText</enum>

4
src/qt/forms/sendcoinsdialog.ui
View file

@ -875,7 +875,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBoxMinimumFee"> <widget class="QCheckBox" name="checkBoxMinimumFee">
<property name="toolTip"> <property name="toolTip">
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</string> <string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for dogecoin transactions than the network can process.</string>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
@ -888,7 +888,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</string> <string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for dogecoin transactions than the network can process.</string>
</property> </property>
<property name="text"> <property name="text">
<string>(read the tooltip)</string> <string>(read the tooltip)</string>

4
src/qt/forms/sendcoinsentry.ui
View file

@ -170,7 +170,7 @@
<item> <item>
<widget class="QCheckBox" name="checkboxSubtractFeeFromAmount"> <widget class="QCheckBox" name="checkboxSubtractFeeFromAmount">
<property name="toolTip"> <property name="toolTip">
<string>The fee will be deducted from the amount being sent. The recipient will receive less bitcoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</string> <string>The fee will be deducted from the amount being sent. The recipient will receive less dogecoins than you enter in the amount field. If multiple recipients are selected, the fee is split equally.</string>
</property> </property>
<property name="text"> <property name="text">
<string>S&amp;ubtract fee from amount</string> <string>S&amp;ubtract fee from amount</string>
@ -192,7 +192,7 @@
<item row="3" column="1"> <item row="3" column="1">
<widget class="QLabel" name="messageTextLabel"> <widget class="QLabel" name="messageTextLabel">
<property name="toolTip"> <property name="toolTip">
<string>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dogecoin network.</string> <string>A message that was attached to the dogecoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Dogecoin network.</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>

2
src/qt/forms/signverifymessagedialog.ui
View file

@ -30,7 +30,7 @@
<item> <item>
<widget class="QLabel" name="infoLabel_SM"> <widget class="QLabel" name="infoLabel_SM">
<property name="text"> <property name="text">
<string>You can sign messages/agreements with your addresses to prove you can receive bitcoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</string> <string>You can sign messages/agreements with your addresses to prove you can receive dogecoins sent to them. Be careful not to sign anything vague or random, as phishing attacks may try to trick you into signing your identity over to them. Only sign fully-detailed statements you agree to.</string>
</property> </property>
<property name="textFormat"> <property name="textFormat">
<enum>Qt::PlainText</enum> <enum>Qt::PlainText</enum>