Skip to content

Commit

Permalink
Merge pull request #1 from zenanticipate/36901
Browse files Browse the repository at this point in the history
36901
  • Loading branch information
TripleZen committed Jun 23, 2023
2 parents 0082647 + 89ac455 commit 74a1e94
Show file tree
Hide file tree
Showing 108 changed files with 534 additions and 510 deletions.
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- master
- 36901
pull_request:
branches:
- master
Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -6,8 +6,8 @@ CyberDollar Core [CYBER, Ð]

<div align="center">

[![CyberDollarBadge](https://img.shields.io/badge/Cyber-Coin-yellow.svg)](https://cyberdollar.com)
[![MuchWow](https://img.shields.io/badge/Much-Wow-yellow.svg)](https://cyberdollar.com)
[![CyberDollarBadge](https://img.shields.io/badge/Cyber-Coin-yellow.svg)](https://cyberchain.info)
[![MuchWow](https://img.shields.io/badge/Much-Wow-yellow.svg)](https://cyberchain.info)

</div>

Expand All @@ -18,7 +18,7 @@ CyberDollar is a community-driven cryptocurrency that was inspired by a Shiba In
For information about the default fees used on the CyberDollar network, please
refer to the [fee recommendation](doc/fee-recommendation.md).

**Website:** [cyberdollar.com](https://cyberdollar.com)
**Website:** [cyberchain.info](https://cyberchain.info)

## Usage 💻

Expand Down
6 changes: 3 additions & 3 deletions README_fa_IR.md
Expand Up @@ -6,8 +6,8 @@ CyberDollar Core [CYBER, Ð]

<div align="center">

[![CyberDollarBadge](https://img.shields.io/badge/Cyber-Coin-yellow.svg)](https://cyberdollar.com)
[![MuchWow](https://img.shields.io/badge/Much-Wow-yellow.svg)](https://cyberdollar.com)
[![CyberDollarBadge](https://img.shields.io/badge/Cyber-Coin-yellow.svg)](https://cyberchain.info)
[![MuchWow](https://img.shields.io/badge/Much-Wow-yellow.svg)](https://cyberchain.info)

</div>

Expand All @@ -21,7 +21,7 @@ Select language: [EN](./README.md) | [CN](./README_zh_CN.md) | [PT](./README_pt_
[پیشنهادهای هزینه‌ای](doc/fee-recommendation.md)
مراجعه نمایید.

**سایت اینترنتی:** [cyberdollar.com](https://cyberdollar.com)
**سایت اینترنتی:** [cyberchain.info](https://cyberchain.info)

## استفاده 💻

Expand Down
6 changes: 3 additions & 3 deletions README_pt_BR.md
Expand Up @@ -6,8 +6,8 @@ CyberDollar Core [CYBER, Ð]

<div align="center">

[![CyberDollarBadge](https://img.shields.io/badge/Cyber-Coin-yellow.svg)](https://cyberdollar.com)
[![MuchWow](https://img.shields.io/badge/Much-Wow-yellow.svg)](https://cyberdollar.com)
[![CyberDollarBadge](https://img.shields.io/badge/Cyber-Coin-yellow.svg)](https://cyberchain.info)
[![MuchWow](https://img.shields.io/badge/Much-Wow-yellow.svg)](https://cyberchain.info)

</div>

Expand All @@ -18,7 +18,7 @@ CyberDollar é uma criptomoeda gerida pela comunidade que foi inspirada no meme
Para maiores informações acerca das taxas de transação usadas na rede CyberDollar, por favor acesse:
[taxas recomendadas](doc/fee-recommendation.md).

**Website:** [cyberdollar.com](https://cyberdollar.com)
**Website:** [cyberchain.info](https://cyberchain.info)

## Uso 💻

Expand Down
6 changes: 3 additions & 3 deletions README_zh_CN.md
Expand Up @@ -6,8 +6,8 @@

<div align="center">

[![CyberDollarBadge](https://img.shields.io/badge/Cyber-Coin-yellow.svg)](https://cyberdollar.com)
[![MuchWow](https://img.shields.io/badge/Much-Wow-yellow.svg)](https://cyberdollar.com)
[![CyberDollarBadge](https://img.shields.io/badge/Cyber-Coin-yellow.svg)](https://cyberchain.info)
[![MuchWow](https://img.shields.io/badge/Much-Wow-yellow.svg)](https://cyberchain.info)

</div>

Expand All @@ -17,7 +17,7 @@

狗狗币网络默认交易费的相关信息请查看[收费建议](doc/fee-recommendation.md)

**网址:** [cyberdollar.com](https://cyberdollar.com)
**网址:** [cyberchain.info](https://cyberchain.info)

## 使用指南 💻

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -8,7 +8,7 @@ define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2023)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core and CyberDollar Core]])
AC_INIT([CyberDollar Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/CyberDollar/CyberDollar/issues],[cyberdollar],[https://cyberdollar.com/])
AC_INIT([CyberDollar Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/CyberDollar/CyberDollar/issues],[cyberdollar],[https://cyberchain.info/])
AC_CONFIG_SRCDIR([src/validation.cpp])
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
AC_CONFIG_AUX_DIR([build-aux])
Expand Down
2 changes: 1 addition & 1 deletion contrib/README.md
Expand Up @@ -50,4 +50,4 @@ Test and Verify Tools
Utilities to generate test vectors for the data-driven CyberDollar tests.

### [Verify Binaries](/contrib/verifybinaries) ###
This script attempts to download and verify the signature file SHA256SUMS.asc from cyberdollar.com.
This script attempts to download and verify the signature file SHA256SUMS.asc from cyberchain.info.
2 changes: 1 addition & 1 deletion contrib/debian/control
Expand Up @@ -26,7 +26,7 @@ Build-Depends: debhelper,
python,
libzmq3-dev
Standards-Version: 3.9.2
Homepage: http://www.cyberdollar.com/
Homepage: http://www.cyberchain.info/
Vcs-Git: git://github.com/cyberdollar/cyberdollar.git
Vcs-Browser: http://github.com/cyberdollar/cyberdollar

Expand Down
54 changes: 27 additions & 27 deletions doc/getting-started.md
Expand Up @@ -5,7 +5,7 @@ This tutorial will help you to go through the basics to use CyberDollar Core aft
> **Note:** For simplicity, this guide assumes that executables can be found under the `PATH` environment variable.
If needed, you can specify their location by typing `PATH=$PATH:/path/to/executables`, or prepend the full path to the command like:
> ```console
> shibetoshi:~$ /path/to/cyberdollar-cli [arguments ...]
> cybertoshi:~$ /path/to/cyberdollar-cli [arguments ...]
> ```
### Table of contents
Expand All @@ -28,12 +28,12 @@ If needed, you can specify their location by typing `PATH=$PATH:/path/to/executa
To start your node, you can run an headless server using `cyberdollard`:
```console
shibetoshi:~$ cyberdollard -daemon
cybertoshi:~$ cyberdollard -daemon
```
Or you can use the Graphical User Interface (GUI), `cyberdollar-qt`:
```console
shibetoshi:~$ cyberdollar-qt
cybertoshi:~$ cyberdollar-qt
```

Detailed logging is recorded in `debug.log`, located in the [data directory](#data-directory).
Expand All @@ -53,10 +53,10 @@ To have an overview of the available commands, use the `help` command:

```console
#List all commands
shibetoshi:~$ cyberdollar-cli help
cybertoshi:~$ cyberdollar-cli help

#Get help for a specific command
shibetoshi:~$ cyberdollar-cli help COMMAND
cybertoshi:~$ cyberdollar-cli help COMMAND
```

Some commands are different, but it's possible to use the [bitcoin RPC API documentation](https://developer.bitcoin.org/reference/rpc/).
Expand All @@ -70,22 +70,22 @@ By default, the CyberDollar Core software will automatically create an address f
You can list wallet addresses using `getaddressesbyaccount`:

```console
shibetoshi:~$ cyberdollar-cli getaddressesbyaccount ""
cybertoshi:~$ cyberdollar-cli getaddressesbyaccount ""
[
"DA2fBazU8Y4epNJ2fQRZCcWpxKZY9HrhLN"
]
```

Using `getnewaddress` will generate a new wallet address:
```console
shibetoshi:~$ cyberdollar-cli getnewaddress
cybertoshi:~$ cyberdollar-cli getnewaddress
DNnGtXk9khadE7EKCmQzxjnehenX92PKAv
```

Private keys are stored in the `wallet.dat` file. You can use `backupwallet` to save a copy:

```console
shibetoshi:~$ cyberdollar-cli backupwallet /path/of/wallet/backup
cybertoshi:~$ cyberdollar-cli backupwallet /path/of/wallet/backup
```

**Tip:** CyberDollar addresses start with the letter `D`.
Expand All @@ -98,14 +98,14 @@ The total balance of all addresses held in your wallet can be found with the `ge

```console
#Syntax
shibetoshi:~$ cyberdollar-cli getbalance "*" minconf
cybertoshi:~$ cyberdollar-cli getbalance "*" minconf
```

`minconf` stands for minimum confirmations.
For example, to see current balance with transaction having at least 5 confirmations:

```console
shibetoshi:~$ cyberdollar-cli getbalance "*" 5
cybertoshi:~$ cyberdollar-cli getbalance "*" 5
421.552000
```

Expand All @@ -118,10 +118,10 @@ CyberDollar implements the [Unspent Transaction Output (UTXO)](https://en.wikipe
It's possible to use a single command to create, sign and send a transaction :
```console
#Syntax
shibetoshi:~$ cyberdollar-cli sendtoaddress address amount
cybertoshi:~$ cyberdollar-cli sendtoaddress address amount

#Example
shibetoshi:~$ cyberdollar-cli sendtoaddress nWSYUqtimF7B6qW4GBdczaG6jvqKutS1Nh 420
cybertoshi:~$ cyberdollar-cli sendtoaddress nWSYUqtimF7B6qW4GBdczaG6jvqKutS1Nh 420
```

So much spending power !
Expand All @@ -134,10 +134,10 @@ This displays a list of UTXOs associated to addresses kept in the wallet.

```console
#Syntax
shibetoshi:~$ cyberdollar-cli listunspent minconf maxconf '["address", ...]'
cybertoshi:~$ cyberdollar-cli listunspent minconf maxconf '["address", ...]'

#Example
shibetoshi:~$ cyberdollar-cli listunspent 1 9999999 '["nnJDY1xCRgWQc7vBXHUPMPsEynuZW23Y3P"]'
cybertoshi:~$ cyberdollar-cli listunspent 1 9999999 '["nnJDY1xCRgWQc7vBXHUPMPsEynuZW23Y3P"]'
[
{
"txid": "b869ed6606d52e6446dc12db02cf868ab693dd5b9f661116269536f0f8fa2433",
Expand All @@ -163,25 +163,25 @@ You can now build a new transaction using the available UTXOs from above.

```console
#Syntax
shibetoshi:~$ utxos_to_use='
cybertoshi:~$ utxos_to_use='
[
{
"txid": "id",
"vout": n
},
...
]'
shibetoshi:~$ cyberdollar-cli createrawtransaction "$utxos_to_use" '{"address":amount, ...}'
cybertoshi:~$ cyberdollar-cli createrawtransaction "$utxos_to_use" '{"address":amount, ...}'

#Example
shibetoshi:~$ utxos_to_use='
cybertoshi:~$ utxos_to_use='
[
{
"txid": "b869ed6606d52e6446dc12db02cf868ab693dd5b9f661116269536f0f8fa2433",
"vout": 0
}
]'
shibetoshi:~$ cyberdollar-cli createrawtransaction "$utxos_to_use" '{"nWSYUqtimF7B6qW4GBdczaG6jvqKutS1Nh":69, "nnJDY1xCRgWQc7vBXHUPMPsEynuZW23Y3P": 30.999}'
cybertoshi:~$ cyberdollar-cli createrawtransaction "$utxos_to_use" '{"nWSYUqtimF7B6qW4GBdczaG6jvqKutS1Nh":69, "nnJDY1xCRgWQc7vBXHUPMPsEynuZW23Y3P": 30.999}'
01000000013324faf8f03695261611669f5bdd93b68a86cf02db12dc46642ed50666ed69b80000000000ffffffff0200a5459b010000001976a91418a89ee36293f15c4db4c01173babd579243161188ac60b8c4b8000000001976a914c6977da37560e1432c2e14e16952981a4c272cac88ac00000000
```

Expand All @@ -195,10 +195,10 @@ Before sending a transaction, it must be signed by the private key that the addr

```console
#Syntax
shibetoshi:~$ cyberdollar-cli signrawtransaction encoded_transaction
cybertoshi:~$ cyberdollar-cli signrawtransaction encoded_transaction

#Example
shibetoshi:~$ cyberdollar-cli signrawtransaction "01000000013324faf8f03695261611669f5bdd93b68a86cf02db12dc46642ed50666ed69b80000000000ffffffff0200a5459b010000001976a91418a89ee36293f15c4db4c01173babd579243161188ac60b8c4b8000000001976a914c6977da37560e1432c2e14e16952981a4c272cac88ac00000000"
cybertoshi:~$ cyberdollar-cli signrawtransaction "01000000013324faf8f03695261611669f5bdd93b68a86cf02db12dc46642ed50666ed69b80000000000ffffffff0200a5459b010000001976a91418a89ee36293f15c4db4c01173babd579243161188ac60b8c4b8000000001976a914c6977da37560e1432c2e14e16952981a4c272cac88ac00000000"
{
"hex": "01000000013324faf8f03695261611669f5bdd93b68a86cf02db12dc46642ed50666ed69b8000000006a47304402200e1bf722d4335179de170f7c762755b463b3f7b8f026f30950f701bc834f0e6e022036295fdd5e607ca41c4e0e62e59d0911b607bfabedde2424665ffae13564d0e001210388f8f226d12eccd3ba93c1454ec4498b065cea96e29b918fbdb517872ebbf581ffffffff0200a5459b010000001976a91418a89ee36293f15c4db4c01173babd579243161188ac60b8c4b8000000001976a914c6977da37560e1432c2e14e16952981a4c272cac88ac00000000",
"complete": true
Expand All @@ -211,10 +211,10 @@ Finally, broadcast the transaction to the network so that it can be included in

```console
#Syntax
shibetoshi:~$ cyberdollar-cli sendrawtransaction signed_transaction
cybertoshi:~$ cyberdollar-cli sendrawtransaction signed_transaction

#Example
shibetoshi:~$ cyberdollar-cli sendrawtransaction 01000000013324faf8f03695261611669f5bdd93b68a86cf02db12dc46642ed50666ed69b8000000006a47304402200e1bf722d4335179de170f7c762755b463b3f7b8f026f30950f701bc834f0e6e022036295fdd5e607ca41c4e0e62e59d0911b607bfabedde2424665ffae13564d0e001210388f8f226d12eccd3ba93c1454ec4498b065cea96e29b918fbdb517872ebbf581ffffffff0200a5459b010000001976a91418a89ee36293f15c4db4c01173babd579243161188ac60b8c4b8000000001976a914c6977da37560e1432c2e14e16952981a4c272cac88ac00000000
cybertoshi:~$ cyberdollar-cli sendrawtransaction 01000000013324faf8f03695261611669f5bdd93b68a86cf02db12dc46642ed50666ed69b8000000006a47304402200e1bf722d4335179de170f7c762755b463b3f7b8f026f30950f701bc834f0e6e022036295fdd5e607ca41c4e0e62e59d0911b607bfabedde2424665ffae13564d0e001210388f8f226d12eccd3ba93c1454ec4498b065cea96e29b918fbdb517872ebbf581ffffffff0200a5459b010000001976a91418a89ee36293f15c4db4c01173babd579243161188ac60b8c4b8000000001976a914c6977da37560e1432c2e14e16952981a4c272cac88ac00000000
b4fae2a43cb35f8016a547e9658e061f1da4a043efafecc42f739d46d95dee21
```

Expand All @@ -229,11 +229,11 @@ First, request the information about block 69:

```console
#Find block hash from his height
shibetoshi:~$ cyberdollar-cli getblockhash 69
cybertoshi:~$ cyberdollar-cli getblockhash 69
3d2def20cd0d3aca148741ef469bda11647a3040d7669c82745d03c728706a8b

#Get block data
shibetoshi:~$ cyberdollar-cli getblock 3d2def20cd0d3aca148741ef469bda11647a3040d7669c82745d03c728706a8b
cybertoshi:~$ cyberdollar-cli getblock 3d2def20cd0d3aca148741ef469bda11647a3040d7669c82745d03c728706a8b
{
"hash": "3d2def20cd0d3aca148741ef469bda11647a3040d7669c82745d03c728706a8b",
"confirmations": 7816,
Expand Down Expand Up @@ -264,10 +264,10 @@ We can see the entire transaction by querying for its identifier:

```console
#Syntax
shibetoshi:~$ cyberdollar-cli getrawtransaction txid verbose
cybertoshi:~$ cyberdollar-cli getrawtransaction txid verbose

#Example
shibetoshi:~$ cyberdollar-cli getrawtransaction 695ce4208fa7a87ef9e99805b0910dc129058ecdceb5cef7e25f71dcdc7936db 1
cybertoshi:~$ cyberdollar-cli getrawtransaction 695ce4208fa7a87ef9e99805b0910dc129058ecdceb5cef7e25f71dcdc7936db 1
{
"hex": "01000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0e04d9eea3520101062f503253482fffffffff0100ac6156be23000023210340a42a5ad6c4c0cd5ae539657032e0a359bd3e0f95771f34d71691b13460a624ac00000000",
"txid": "695ce4208fa7a87ef9e99805b0910dc129058ecdceb5cef7e25f71dcdc7936db",
Expand Down Expand Up @@ -314,7 +314,7 @@ Using `cyberdollard -help` will display all available configuration parameters t

**Command example :**
```console
shibetoshi:~$ cyberdollard -daemon -paytxfee=0.01 -sendfreetransactions=1 -maxconnections=150
cybertoshi:~$ cyberdollard -daemon -paytxfee=0.01 -sendfreetransactions=1 -maxconnections=150
```

Configuration can be persisted by creating a `cyberdollar.conf` file. Create it in the directory defined with the `datadir` setting, `$HOME/.cyberdollar` by default, or specify the file location with `-conf`.
Expand Down
2 changes: 1 addition & 1 deletion doc/gitian-building.md
Expand Up @@ -121,7 +121,7 @@ If you want to do the PGP signing on another device, that's also possible; just
and follow the steps in the build process as normal.

```bash
gpg: skipped "shibetoshi": secret key not available
gpg: skipped "cybertoshi": secret key not available
```

When you execute `gsign` you will get an error from GPG, which can be ignored. Copy the resulting `.assert` files in `gitian.sigs` to your signing machine and do
Expand Down
2 changes: 1 addition & 1 deletion doc/man/cyberdollar-cli.1
Expand Up @@ -79,7 +79,7 @@ Read extra arguments from standard input, one per line until EOF/Ctrl\-D
Copyright (C) 2013-2021 The Bitcoin Core and CyberDollar Core developers

Please contribute if you find CyberDollar Core useful. Visit
<https://cyberdollar.com> for further information about the software.
<https://cyberchain.info> for further information about the software.
The source code is available from <https://github.com/cyberdollar/cyberdollar>.

This is experimental software.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/cyberdollar-qt.1
Expand Up @@ -554,7 +554,7 @@ Reset all settings changed in the GUI
Copyright (C) 2013-2021 The Bitcoin Core and CyberDollar Core developers

Please contribute if you find CyberDollar Core useful. Visit
<https://cyberdollar.com> for further information about the software.
<https://cyberchain.info> for further information about the software.
The source code is available from <https://github.com/cyberdollar/cyberdollar>.

This is experimental software.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/cyberdollar-tx.1
Expand Up @@ -110,7 +110,7 @@ Set register NAME to given JSON\-STRING
Copyright (C) 2013-2021 The Bitcoin Core and CyberDollar Core developers

Please contribute if you find CyberDollar Core useful. Visit
<https://cyberdollar.com> for further information about the software.
<https://cyberchain.info> for further information about the software.
The source code is available from <https://github.com/cyberdollar/cyberdollar>.

This is experimental software.
Expand Down
2 changes: 1 addition & 1 deletion doc/man/cyberdollard.1
Expand Up @@ -533,7 +533,7 @@ Set the number of threads to service RPC calls (default: 4)
Copyright (C) 2013-2021 The Bitcoin Core and CyberDollar Core developers

Please contribute if you find CyberDollar Core useful. Visit
<https://cyberdollar.com> for further information about the software.
<https://cyberchain.info> for further information about the software.
The source code is available from <https://github.com/cyberdollar/cyberdollar>.

This is experimental software.
Expand Down
2 changes: 1 addition & 1 deletion doc/release-notes/RELEASE_NOTES_1.8.2.md
Expand Up @@ -9,7 +9,7 @@ CyberDollar Core 1.8.2 is a bugfix release. It updates OpenSSL to 1.0.1l, mainly

## OpenSSL Warning

The main takeaway is that builds from http://cyberdollar.com are not affected. But if you build your own version,
The main takeaway is that builds from http://cyberchain.info are not affected. But if you build your own version,
please make sure you update to 1.8.2 **before** updating your OpenSSL!

Please refer to this section in the Bitcoin Core release notes for further info: https://github.com/bitcoin/bitcoin/blob/0.9/doc/release-notes.md#openssl-warning
Expand Down
8 changes: 4 additions & 4 deletions doc/release-process.md
Expand Up @@ -234,7 +234,7 @@ The `*-debug*` files generated by the gitian build contain debug symbols
for troubleshooting by developers. It is assumed that anyone that is interested
in debugging can run gitian to generate the files for themselves. To avoid
end-user confusion about which file to pick, as well as save storage
space *do not upload these to the cyberdollar.com server, nor put them in the torrent*.
space *do not upload these to the cyberchain.info server, nor put them in the torrent*.

- GPG-sign it, delete the unsigned file:
```
Expand All @@ -244,15 +244,15 @@ rm SHA256SUMS
(the digest algorithm is forced to sha256 to avoid confusion of the `Hash:` header that GPG adds with the SHA256 used for the files)
Note: check that SHA256SUMS itself doesn't end up in SHA256SUMS, which is a spurious/nonsensical entry.

- Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the cyberdollar.com Github repo
- Upload zips and installers, as well as `SHA256SUMS.asc` from last step, to the cyberchain.info Github repo

- Create a [new GitHub release](https://github.com/cyberdollar/cyberdollar/releases/new) with a link to the archived release notes.

- Update cyberdollar.com version - Langerhans to do
- Update cyberchain.info version - Langerhans to do

- Announce the release:

- Release sticky on CyberDollar Forums: http://forum.cyberdollar.com/forum/news-community/community-announcements
- Release sticky on CyberDollar Forums: http://forum.cyberchain.info/forum/news-community/community-announcements

- CyberDollar-development mailing list

Expand Down

0 comments on commit 74a1e94

Please sign in to comment.