Commit dc7521bf authored by artem-bv's avatar artem-bv

Merge branch 'master' into Current-dev

# Conflicts:
#	src/main.cpp
parents f9f1e43b 6423fbc6
Pipeline #1196 failed with stage
in 27 minutes and 13 seconds
### Summary
(Summarise the symptoms of the bug you encountered.)
(Summarize the symptoms of the bug you encountered.)
### Steps to reproduce
(How one can reproduce the issue, step by step.)
......@@ -14,7 +14,7 @@
(The OS version, like Ubuntu 16.04.)
### Crown-core application info
(The wallet version, like v0.14.0; link to the pipeline/build if possible.)
(The wallet version, like v0.12.4.1; link to the pipeline/build if possible.)
### Relevant logs, dumps and/or screenshots
(Paste any relevant logs - please use code blocks (```) to format console output,
......
......@@ -6,7 +6,7 @@
(If you can - please define the requirements, if not - skip it).
### Tasks
- [ ] (To be defnied by devs)
- [ ] (To be defined by devs)
- [ ] Unit-tests
- [ ] Refactor
- [ ] Code Review
......
......@@ -22,7 +22,7 @@ For more information, as well as an immediately usable, binary version Crown see
Crown is ultimately a community-driven platform. Its potential to bring social and technological growth is contingent on the ideas and support its users provide. We invite you to lend your voice and imagination to this burgeoning platform and share in its success. Together, there’s no limit to what we can accomplish.
* Crown Forum: https://forum.crownplatform.com
* Crown Forum: https://forum.crown.tech
* Discord: https://discord.gg/Tcrkazc
* Telegram: https://t.me/crownplatform
* Guides & How-to: https://forum.crownplatform.com/index.php?board=5.0
......@@ -61,7 +61,7 @@ Bugs can be reported via the Gitlab issues page: https://gitlab.crownplatform.co
When describing a bug please include following information:
* **Issue summary** - an issue header which outlines the actual defect to be solved
* **Product** - for example *Desktop Wallet x64, Windows 10*
* **Build Found In** - for example *0.13.0.0*; this is very important as you may be using an old build and the issue may already have been resolved.
* **Build Found In** - for example *0.13.4.0*; this is very important as you may be using an old build and the issue may already have been resolved.
* **Steps to reproduce** - the steps to recreate exactly how the error occurred when you found the issue
* **Expected behavior** - what you would expect to see instead of the issue; this can be useful as it may trigger a conversation between yourself and the developer (or the team) about a better fix or possible solutions.
......
#!/bin/bash
# Copyright (c) 2018-2019 The Crown developers
# Copyright (c) 2018-2020 The Crown developers
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
......@@ -7,7 +7,7 @@
#
# Setup crown server or update existing one
LATEST_RELEASE="0.13.4.0"
LATEST_RELEASE="0.14.0.0"
systemnode=false
masternode=false
......@@ -208,9 +208,9 @@ download_package() {
echo "Downloading pipeline job $job"
wget "https://gitlab.crownplatform.com/crown/crown-core/-/jobs/$job/artifacts/download" -O $dir/crown.zip
else
# Change this later to take latest release version.
# Pull the latest release version.
echo "Downloading $BITS bit Crown package version $LATEST_RELEASE."
wget "https://github.com/Crowndev/crowncoin/releases/download/v$LATEST_RELEASE/Crown-$LATEST_RELEASE-Linux$BITS.zip" -O $dir/crown.zip
wget "https://github.com/Crowndev/crowncoin/releases/download/v$LATEST_RELEASE-Emerald/Crown-$LATEST_RELEASE-Linux$BITS.zip" -O $dir/crown.zip
fi
wget "https://raw.githubusercontent.com/Crowndev/crowncoin/master/scripts/crownwatch.sh" -O $dir/crownwatch.sh
if [ -s "$dir/crown.zip" ]; then
......@@ -271,6 +271,11 @@ configure_conf() {
echo "masternode=1" >>.crown/crown.conf
echo "masternodeprivkey="$privkey >>.crown/crown.conf
fi
if [ "$LATEST_RELEASE" = "0.13.4.0" ] ; then
echo "addnode=92.60.44.40" >>.crown/crown.conf
echo "addnode=149.248.53.3" >>.crown/crown.conf
echo "addnode=139.180.141.215" >>.crown/crown.conf
fi
echo "This is the config file:"
cat .crown/crown.conf
echo
......
......@@ -60,7 +60,7 @@ void CActiveMasternode::ManageStatus()
}
if(pwalletMain->GetBalance() == 0){
notCapableReason = "Hot node, waiting for remote activation.";
notCapableReason = "Masternode configured correctly and ready, please use your local wallet to start it -Start alias-.";
LogPrintf("CActiveMasternode::ManageStatus() - not capable: %s\n", notCapableReason);
return;
}
......
......@@ -62,7 +62,7 @@ void CActiveSystemnode::ManageStatus()
}
if(pwalletMain->GetBalance() == 0){
notCapableReason = "Hot node, waiting for remote activation.";
notCapableReason = "Systemnode configured correctly and ready, please use your local wallet to start it -Start alias-.";
LogPrintf("CActiveSystemnode::ManageStatus() - not capable: %s\n", notCapableReason);
return;
}
......
......@@ -253,14 +253,21 @@ public:
assert(hashGenesisBlock == uint256S("0x0000000085370d5e122f64f4ab19c68614ff3df78c8d13cb814fd7e69a1dc6da"));
assert(genesis.hashMerkleRoot == uint256S("0x80ad356118a9ab8db192db66ef77146cc36d958f959251feace550e4ca3d1446"));
vSeeds.push_back(CDNSSeedData("fra-crwdns", "fra-crwdns.crowndns.info"));
vSeeds.push_back(CDNSSeedData("blr-crwdns", "blr-crwdns.crowndns.info"));
vSeeds.push_back(CDNSSeedData("sgp-crwdns", "sgp-crwdns.crowndns.info"));
vSeeds.push_back(CDNSSeedData("lon-crwdns", "lon-crwdns.crowndns.info"));
vSeeds.push_back(CDNSSeedData("nyc-crwdns", "nyc-crwdns.crowndns.info"));
vSeeds.push_back(CDNSSeedData("tor-crwdns", "tor-crwdns.crowndns.info"));
vSeeds.push_back(CDNSSeedData("sfo-crwdns", "sfo-crwdns.crowndns.info"));
vSeeds.push_back(CDNSSeedData("ams-crwdns", "ams-crwdns.crowndns.info"));
/** Main net nameservers defined here, they are geographic strategic and redundant through 2 domains.
* The nameservers are location-XXseedNS.crownplatform. net/org they will point to main net dns seed VPS's
* through location-XX.seeder.crowncoin.net which can be set up by community members, and also wil be set up by the infra team.
* Community members wanting to contribute a VPS will request (outside of public view) for a DNS entry to be made to the main nameservers for their dns seed's IP,
* getting help setting it up from the infra team.
*/
vSeeds.push_back(CDNSSeedData("eur1-crwdns", "europe-01seedns.crowncoin.org"));
vSeeds.push_back(CDNSSeedData("eur2-crwdns", "europe-02seedns.crowncoin.net"));
vSeeds.push_back(CDNSSeedData("nam1-crwdns", "canada-01seedns.crowncoin.org"));
vSeeds.push_back(CDNSSeedData("ltm1-crwdns", "latam-01seedns.crowncoin.net"));
vSeeds.push_back(CDNSSeedData("sea1-crwdns", "SEAsia-01seedns.crowncoin.org"));
vSeeds.push_back(CDNSSeedData("pac1-crwdns", "pacific-01seedns.crowncoin.net"));
// Crown addresses start with 'CRW'
base58Prefixes[PUBKEY_ADDRESS] = list_of(0x01)(0x75)(0x07).convert_to_container<std::vector<unsigned char> >();
......@@ -382,7 +389,7 @@ public:
vFixedSeeds.clear();
vSeeds.clear();
// Testnet seeders update is outside of current hotfix scope
vSeeds.push_back(CDNSSeedData("fra-testnet-crwdns", "fra-testnet-crwdns.crowndns.info"));
vSeeds.push_back(CDNSSeedData("blr-testnet-crwdns", "blr-testnet-crwdns.crowndns.info"));
vSeeds.push_back(CDNSSeedData("sgp-testnet-crwdns", "sgp-testnet-crwdns.crowndns.info"));
......
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2014 The Bitcoin developers
// Copyright (c) 2014-2015 The Dash developers
// Copyright (c) 2014-2018 The Crown developers
// Copyright (c) 2014-2020 The Crown developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
......@@ -992,11 +992,6 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
if (tx.IsCoinBase() && tx.nType != TRANSACTION_NORMAL)
return state.DoS(100, false, REJECT_INVALID, "bad-txns-cb-type");
}
// all version 1 transactions are normal
else if (tx.nType != TRANSACTION_NORMAL)
{
return state.DoS(100, false, REJECT_INVALID, "bad-txns-type");
}
// Basic checks that don't depend on any context
if (tx.vin.empty())
......
......@@ -9,15 +9,15 @@
/**
* network protocol versioning
*/
static const int PROTOCOL_VERSION = 70059;
static const int PROTOCOL_VERSION = 70058;
static const int PROTOCOL_POS_START = 70057;
//! initial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209;
//! disconnect from peers older than this proto version
static const int MIN_PEER_PROTO_VERSION_PREV = 70058;
static const int MIN_PEER_PROTO_VERSION_CURR = 70059;
static const int MIN_PEER_PROTO_VERSION_PREV = 70057;
static const int MIN_PEER_PROTO_VERSION_CURR = 70058;
//! minimum peer version accepted by legacySigner
static const int MIN_POOL_PEER_PROTO_VERSION = 70057;
......
{
"Linux32":{
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.13.4.0/Crown-0.13.4.0-Linux32.zip",
"sha256sum":"d92b5256ae2e35b38dc08cee3fafc94b351353ba32ee30c0dffd9760baceb7f7"
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.14.0.0-Emerald/Crown-0.14.0.0-Linux32.zip",
"sha256sum":"fe8dc6fdd8af7c7be514baf4eb194025c41024e3e1b170316c47bae817a9c86f"
},
"Linux64":{
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.13.4.0/Crown-0.13.4.0-Linux64.zip",
"sha256sum":"52d321423031edbb1de1832c440272a18d050294f3649eaf6267ebc6bd52da2e"
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.14.0.0-Emerald/Crown-0.14.0.0-Linux64.zip",
"sha256sum":"81c085975ab647574f54deb466ff2cc5b4f92f7b20de5067f0b8d53be5244dfb"
},
"Osx":{
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.13.4.0/Crown-0.13.4.0-Osx-dmg.zip",
"sha256sum":"fe5709b288267e7708245d9fe2deb331eaef64404ab238162fb418203f7cd82a"
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.14.0.0-Emerald/Crown-0.14.0.0-Osx.zip",
"sha256sum":"82038fa65edd5e3ad39e9e0104bf3efede73e294d41f545c9dbeb7df29558456"
},
"Win32":{
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.13.4.0/Crown-0.13.4.0-Win32.zip",
"sha256sum":"5c930c3612c11584dcf2db804ad9242d37e2f688ad407f7e88624505cd6574e9"
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.14.0.0-Emerald/Crown-0.14.0.0-Win32.zip",
"sha256sum":"859025705deca49aada84c6c403a6c275d73e93cc2ddb65ed850ca37160f2454"
},
"Win64":{
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.13.4.0/Crown-0.13.4.0-Win64.zip",
"sha256sum":"815e9ef927845d242663de5c9a5dc78be923eda0720c2dd8eb3737ba3d7a49aa"
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.14.0.0-Emerald/Crown-0.14.0.0-Win64.zip",
"sha256sum":"b5cbdb249546c7193e81036d0631102f0a3d5f2fde1dba912c3d37692353040f"
},
"RaspberryPi":{
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.13.4.0/Crown-0.13.4.0-RaspberryPi.zip",
"sha256sum":"26310a9a0d1407106ce618fe07a86a75d9bd59f3fa86d651f9536fb75d67e79d"
"Osx-dmg":{
"Url":"https://github.com/Crowndev/crown-core/releases/download/v0.14.0.0-Emerald/Crown-0.14.0.0-Osx-dmg.zip",
"sha256sum":"a4a0cc434bfa7d0e0f7a4e4b92d40be3cb8636c2ff8e3d82311d8211547a3616"
},
"Version":130400,
"Version":140000,
"NeedToBeUpdated": true
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment