Skip to content

Commit

Permalink
Merge remote-tracking branch 'other/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
butkcore-dev committed Jan 22, 2023
2 parents 3949594 + 0678ef1 commit 875c6cb
Show file tree
Hide file tree
Showing 35 changed files with 113 additions and 79 deletions.
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 3)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 2)
define(_CLIENT_VERSION_BUILD, 3)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2022)
define(_COPYRIGHT_YEAR, 2023)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[But Core]])
AC_INIT([But Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/ButKoin/but/issues],[but],[https://butcoin.tech/])
AC_INIT([But Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/ButKoin/but/issues],[but],[https://butkoin.com/])
AC_CONFIG_SRCDIR([src/validation.cpp])
AC_CONFIG_HEADERS([src/config/but-config.h])
AC_CONFIG_AUX_DIR([build-aux])
Expand Down
2 changes: 1 addition & 1 deletion depends/packages/boost.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package=boost
$(package)_version=1_64_0
$(package)_download_path=https://dl.bintray.com/boostorg/release/1.64.0/source/
$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/1.64.0/source/
$(package)_file_name=$(package)_$($(package)_version).tar.bz2
$(package)_sha256_hash=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332

Expand Down
8 changes: 4 additions & 4 deletions doc/man/but-cli.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH BUT-CLI "1" "November 2022" "but-cli v1.3.0.2" "User Commands"
.TH BUT-CLI "1" "January 2023" "but-cli v1.3.0.3" "User Commands"
.SH NAME
but-cli \- manual page for but-cli v1.3.0.2
but-cli \- manual page for but-cli v1.3.0.3
.SH DESCRIPTION
But Core RPC client version v1.3.0.2
But Core RPC client version v1.3.0.3
.SS "Usage:"
.TP
but\-cli [options] <command> [params]
Expand Down Expand Up @@ -86,7 +86,7 @@ Copyright (C) 2022 The But Core developers
Copyright (C) 2014-2022 The Dash Core developers
Copyright (C) 2009-2022 The Bitcoin Core developers

Please contribute if you find But Core useful. Visit <https://butcoin.tech> for
Please contribute if you find But Core useful. Visit <https://butkoin.com> for
further information about the software.
The source code is available from <https://github.com/Butkoin/but>.

Expand Down
6 changes: 3 additions & 3 deletions doc/man/but-qt.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH BUT-QT "1" "November 2022" "but-qt v1.3.0.2" "User Commands"
.TH BUT-QT "1" "November 2022" "but-qt v1.3.0.3" "User Commands"
.SH NAME
but-qt \- manual page for butd v1.3.0.2
but-qt \- manual page for butd v1.3.0.3
.SH DESCRIPTION
But Core Daemon version v1.3.0.2
But Core Daemon version v1.3.0.3
Usage:
.IP
but\-qt [command\-line options]
Expand Down
8 changes: 4 additions & 4 deletions doc/man/but-tx.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH BUT-TX "1" "November 2022" "but-tx v1.3.0.2" "User Commands"
.TH BUT-TX "1" "November 2022" "but-tx v1.3.0.3" "User Commands"
.SH NAME
but-tx \- manual page for but-tx v1.3.0.2
but-tx \- manual page for but-tx v1.3.0.3
.SH DESCRIPTION
But Core but\-tx utility version v1.3.0.2
But Core but\-tx utility version v1.3.0.3
.SS "Usage:"
.TP
but\-tx [options] <hex\-tx> [commands]
Expand Down Expand Up @@ -112,7 +112,7 @@ Copyright (C) 2022 The But Core developers
Copyright (C) 2014-2022 The Dash Core developers
Copyright (C) 2009-2022 The Bitcoin Core developers

Please contribute if you find But Core useful. Visit <https://butcoin.tech> for
Please contribute if you find But Core useful. Visit <https://butkoin.com> for
further information about the software.
The source code is available from <https://github.com/Butkoin/but>.

Expand Down
8 changes: 4 additions & 4 deletions doc/man/butd.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH BUTD "1" "November 2022" "butd v1.3.0.2" "User Commands"
.TH BUTD "1" "November 2022" "butd v1.3.0.3" "User Commands"
.SH NAME
butd \- manual page for butd v1.3.0.2
butd \- manual page for butd v1.3.0.3
.SH DESCRIPTION
But Core Daemon version v1.3.0.2
But Core Daemon version v1.3.0.3
.SS "Usage:"
.TP
butd [options]
Expand Down Expand Up @@ -693,7 +693,7 @@ Copyright (C) 2022 The But Core developers
Copyright (C) 2014-2022 The Dash Core developers
Copyright (C) 2009-2022 The Bitcoin Core developers

Please contribute if you find But Core useful. Visit <https://butcoin.tech> for
Please contribute if you find But Core useful. Visit <https://butkoin.com> for
further information about the software.
The source code is available from <https://github.com/Butkoin/but>.

Expand Down
2 changes: 1 addition & 1 deletion doc/release-notes/but/release-notes-0.1.2.15.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ But Core version 0.1.2.15

Release is now available from:

<https://www.butcoin.tech/downloads/#wallets>
<https://www.butkoin.com/downloads/#wallets>

This is a new minor version release, bringing various bugfixes and other improvements.

Expand Down
2 changes: 1 addition & 1 deletion doc/release-notes/but/release-notes-0.1.2.16.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ But Core version 0.1.2.16

Release is now available from:

<https://www.butcoin.tech/downloads/#wallets>
<https://www.butkoin.com/downloads/#wallets>

This is a new minor version release, bringing various bugfixes and other improvements.

Expand Down
2 changes: 1 addition & 1 deletion doc/release-notes/but/release-notes-0.1.2.17.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ But Core version 0.1.2.17

Release is now available from:

<https://www.butcoin.tech/downloads/#wallets>
<https://www.butkoin.com/downloads/#wallets>

This is a new minor version release, bringing various bugfixes and other improvements.

Expand Down
24 changes: 24 additions & 0 deletions doc/release-notes/but/release-notes-1.3.0.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
But Core version 1.3.0.3 Mandatory Butk Moon Walker Bug-Fix Release !!!
==============================================================================

Release is now available from:

<https://github.com/miningplanet/but/releases>

Update to this release is ** MANDATORY ** because the increase of MAX_MONEY to 21.000.000.000 BUTK and TX b9f42854fc7f326d194e50d48e4bbc3d022a9098dc05320e96497dd5f460b626 to XgKgmUvPanD5vyESuqfpehy2Bebqfr6FZG with txout of 26,766,044.28 BUTK.

Do not use release v1.3.0.1 Butk Modac Release from https://github.com/Butkoin/but/releases, since it is outdated with MAX_MONEY of 21.000.000 BUTK or v1.3.0.2 Butk Moon Walker. v1.3.0.2 has a bug in the sendto / sendmany function, fixed with pull request https://github.com/Butkoin/but/pull/25. This release could only be used for Smartnodes not for wallets !!!

Use 1.3.0.3 Mandatory Butk Moon Walker Bug-Fix Release with the latest bootstrap at https://github.com/miningplanet/but/releases.

This is a new minor version release, bringing various bugfixes and other improvements.

- disconnects old 1.2.x node,
- increaeses the MAX_MONEY to 21.000.000.000 BUTK
- adds CLI functionality for the network hash rate per mining algorithm.

Please report bugs using the issue tracker at github:

<https://github.com/ButKoin/but/issues>


34 changes: 18 additions & 16 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -500,21 +500,20 @@ class CMainParams : public CChainParams {
assert(consensus.hashGenesisBlock == uint256S("0x001787e5f9c3cd249f84f0142071f6098d9e3b7ec8591ff73543ddc4900c1dc2"));
assert(genesis.hashMerkleRoot == uint256S("0xc083fb7c3b6936c15dc2685a522ffa685247e8c665c818888b51b0771584d7b4"));


vSeeds.emplace_back("113.125.38.80","113.125.38.80");
vSeeds.emplace_back("116.203.130.246","116.203.130.246");
vSeeds.emplace_back("135.181.34.18","135.181.34.18");
vSeeds.emplace_back("139.198.168.107","139.198.168.107");
vSeeds.emplace_back("157.90.168.255","157.90.168.255");
vSeeds.emplace_back("159.69.111.55","159.69.111.55");
vSeeds.emplace_back("167.86.124.240","167.86.124.240");
vSeeds.emplace_back("188.34.194.136","188.34.194.136");
vSeeds.emplace_back("42.192.12.170","42.192.12.170");
vSeeds.emplace_back("49.232.149.16","49.232.149.16");
vSeeds.emplace_back("5.161.93.58","5.161.93.58");
vSeeds.emplace_back("65.108.91.65","65.108.91.65");
vSeeds.emplace_back("81.70.52.126","81.70.52.126");
vSeeds.emplace_back("95.216.204.251","95.216.204.251");
vSeeds.emplace_back("135.181.34.18","135.181.34.18");
vSeeds.emplace_back("135.181.36.174","135.181.36.174");
vSeeds.emplace_back("65.108.91.65","65.108.91.65");
vSeeds.emplace_back("95.216.204.251","95.216.204.251");
vSeeds.emplace_back("135.181.249.150","135.181.249.150");
vSeeds.emplace_back("116.203.130.246","116.203.130.246");
vSeeds.emplace_back("159.69.111.55","159.69.111.55");
vSeeds.emplace_back("88.99.186.230","88.99.186.230");
vSeeds.emplace_back("157.90.168.255","157.90.168.255");
vSeeds.emplace_back("188.34.194.136","188.34.194.136");
vSeeds.emplace_back("5.161.93.58","5.161.93.58");
vSeeds.emplace_back("5.161.93.62","5.161.93.62");
vSeeds.emplace_back("5.161.54.85","5.161.54.85");
vSeeds.emplace_back("5.161.97.150","5.161.97.150");

// But addresses start with 'x'
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,76);
Expand Down Expand Up @@ -578,7 +577,10 @@ class CMainParams : public CChainParams {
{10, uint256S("0x005cab51de3bef6840c7866dbc1d2f69738cff67155a975fa3f1800aa4bbfcf9")},
{50, uint256S("0x0037fcf4a01c6c445f2ca1201aa67bca5c3a769cd9225199764c5d2b20e10e9f")},
{100, uint256S("0x00008474034c9e03197c723b565b14cfdbedefbac17b6f25fb0a37214be66062")},
}
{406423, uint256S("0xff7f4f9a259661351a52cde70c8717bab47ffe0e2ac3e598a7811d64544a2659")},
{406901, uint256S("0xdb4c6a37c176ebc6ce1fa0cd90c1c82877af0c64a8cf5e289d967efdc52221f7")},
{406903, uint256S("0x0000000000000911608ed6953991fcfeb01d70e8da606e57a20f21467470a4da")},
}
};

chainTxData = ChainTxData{
Expand Down
2 changes: 1 addition & 1 deletion src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ std::string HelpMessage(HelpMessageMode mode)
std::string LicenseInfo()
{
const std::string URL_SOURCE_CODE = "<https://github.com/Butkoin/but>";
const std::string URL_WEBSITE = "<https://butcoin.tech>";
const std::string URL_WEBSITE = "<https://butkoin.com>";

return CopyrightHolders(_("Copyright (C)"), 2014, COPYRIGHT_YEAR) + "\n" +
"\n" +
Expand Down
2 changes: 1 addition & 1 deletion src/qt/guiconstants.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static const int MAX_URI_LENGTH = 255;
#define SPINNER_FRAMES 36

#define QAPP_ORG_NAME "But"
#define QAPP_ORG_DOMAIN "butcoin.tech"
#define QAPP_ORG_DOMAIN "butkoin.com"
#define QAPP_APP_NAME_DEFAULT "But-Qt"
#define QAPP_APP_NAME_TESTNET "But-Qt-testnet"
#define QAPP_APP_NAME_DEVNET "But-Qt-%s"
Expand Down
Loading

0 comments on commit 875c6cb

Please sign in to comment.