Skip to content

Commit

Permalink
removed darkcoin spam
Browse files Browse the repository at this point in the history
removed all darkcoin, darksend, masternode references and dormant functionality. Not needed for Zettelkasten. Ever.
  • Loading branch information
zettel-kasten committed Dec 28, 2020
1 parent da63802 commit b9f96de
Show file tree
Hide file tree
Showing 15 changed files with 132 additions and 481 deletions.
91 changes: 86 additions & 5 deletions doc/release-notes.md
@@ -1,3 +1,84 @@
0.9.20.2 changes PART 2 (New Wallet UI Design)
=============

-) No protocol changes, so this upgrade is not mandatory,

Simply a new wallet UI design with a few fancy features, like a mempool visualizer.

This will help with the testing of the upcoming tx-appendix feature.


0.9.20.2 changes
=============

-) Introduction of a "Full Node Reward System" that lets users defined and broadcast a donation-address, that is visible and shared on the entire network and tied to its specific IP.

Use zettelkasten.conf file to add following line:

donation=X

(where X is your ZTTL-Address)
e.g.:
donation=ZbT9debLiUeur2JVVBrowHM4DcZueTTaUY

You can then see your donation-address when typing getinfo, and see everyone's donation-address (if defined) with getpeerinfo.


0.9.20.1 changes
=============

-) new Burgerhash V6 POW algorithm:
SDKPGABSPCSSWSSBP-ACE-LIGHT (SpreadDoubleKetchupPrimeGradeABeefStickyPuffyCheeseSomethingSomethingWordSaladSenoritaBonitaPepita-ACE-LIGHT)
-) new protocol version: 70024

Introducing the new "Algo Composer Engine".
Starting with block #555555, every 360 blocks (ca 6 hours) a new instruction is added to the ACE-LIGHT-part of the POW-Code.
(POW is now soft-forking 4 times a day sotospeak.)


0.9.19.1 changes
=============

-) introducing new Burgerhash V5 algorithm starting with block >= 400k
SDKPGABSPCSSWSSBP (SpreadDoubleKetchupPrimeGradeABeefStickyPuffyCheeseSomethingSomethingWordSaladSenoritaBonitaPepita)

-) new protocol version 70023


0.9.18.2 changes
=============

This version fixes the sudden forking issue we had for a while.
All credit to elbandi


0.9.18.1 changes
=============

-) introducing new Burgerhash V4 algorithm starting with block >= 300k
SDKPGABSPCSSWS (SpreadDoubleKetchupPrimeGradeABeefStickyPuffyCheeseSomethingSomethingWordSalad)

-) new protocol version 70022

-) new rpccommand "getwordsalad"


0.9.17.1 changes
=============
-) introducing new Burgerhash V3 algorithm starting with block >= 200k
SDKPGABSPC (SpreadDoubleKetchupPrimeGradeABeefStickyPuffyCheese)

-) new protocol version 70021


0.9.16.2 changes
=============

- BurgerHashV2-Release v0.9.16.2

- (fixed resync problem)


0.8.6.2 changes
=============

Expand All @@ -6,7 +87,7 @@
- Cleanup of SSE2 scrypt detection.

- Minor fixes:
- s/Bitcoin/DarkCoin/ in the Coin Control example
- s/Bitcoin/BitCoin/ in the Coin Control example
- Fix custom build on MacOS X 10.9
- Fix QT5 custom build
- Update Debian build instructions
Expand All @@ -25,7 +106,7 @@

- Peers older than protocol version 70002 are disconnected. 0.8.3.7 is the oldest compatible client.

- Internal miner added back to DarkCoin. setgenerate now works, although it is generally a bad idea as it is significantly slower than external CPU miners.
- Internal miner added back to BitCoin. setgenerate now works, although it is generally a bad idea as it is significantly slower than external CPU miners.

- New RPC commands: getbestblockhash and verifychain

Expand All @@ -50,13 +131,13 @@

Workaround negative version numbers serialization bug.

Fix out-of-bounds check (DarkCoin currently does not use this codepath, but we apply this
Fix out-of-bounds check (BitCoin currently does not use this codepath, but we apply this
patch just to match Bitcoin 0.8.5.)

0.8.4.1 changes
===============

CVE-2013-5700 Bloom: filter crash issue - DarkCoin 0.8.3.7 disabled bloom by default so was
CVE-2013-5700 Bloom: filter crash issue - BitCoin 0.8.3.7 disabled bloom by default so was
unaffected by this issue, but we include their patches anyway just in case folks want to
enable bloomfilter=1.

Expand All @@ -67,7 +148,7 @@ CVE-2013-4627: Better fix for the fill-memory-with-orphaned-tx attack
Fix multi-block reorg transaction resurrection.

Fix non-standard disconnected transactions causing mempool orphans. This bug could cause
nodes running with the -debug flag to crash, although it was lot less likely on DarkCoin
nodes running with the -debug flag to crash, although it was lot less likely on BitCoin
as we disabled IsDust() in 0.8.3.x.

Mac OSX: use 'FD_FULLSYNC' with LevelDB, which will (hopefully!) prevent the database
Expand Down
78 changes: 39 additions & 39 deletions doc/release-process.md
Expand Up @@ -23,11 +23,11 @@ Release Process

##perform gitian builds

From a directory containing the darkcoin source, gitian-builder and gitian.sigs
From a directory containing the bitcoin source, gitian-builder and gitian.sigs

export SIGNER=(your gitian key, ie bluematt, sipa, etc)
export VERSION=(new version, e.g. 0.9.11.0)
pushd ./darkcoin
pushd ./bitcoin
git checkout v${VERSION}
popd
pushd ./gitian-builder
Expand Down Expand Up @@ -63,25 +63,25 @@ Release Process
wget 'http://llvm.org/releases/3.2/clang+llvm-3.2-x86-linux-ubuntu-12.04.tar.gz' -O clang-llvm-3.2-x86-linux-ubuntu-12.04.tar.gz
wget 'https://raw.githubusercontent.com/theuni/osx-cross-depends/master/patches/cdrtools/genisoimage.diff' -O cdrkit-deterministic.patch
cd ..
./bin/gbuild ../darkcoin/contrib/gitian-descriptors/linux/gitian-linux-boost.yml
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/linux/gitian-linux-boost.yml
mv build/out/boost-*.zip inputs/
./bin/gbuild ../darkcoin/contrib/gitian-descriptors/linux/gitian-linux-deps.yml
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/linux/gitian-linux-deps.yml
mv build/out/bitcoin-deps-*.zip inputs/
./bin/gbuild ../darkcoin/contrib/gitian-descriptors/linux/gitian-linux-qt.yml
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/linux/gitian-linux-qt.yml
mv build/out/qt-*.tar.gz inputs/
./bin/gbuild ../darkcoin/contrib/gitian-descriptors/windows/gitian-win-boost.yml
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/windows/gitian-win-boost.yml
mv build/out/boost-*.zip inputs/
./bin/gbuild ../darkcoin/contrib/gitian-descriptors/windows/gitian-win-deps.yml
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/windows/gitian-win-deps.yml
mv build/out/bitcoin-deps-*.zip inputs/
./bin/gbuild ../darkcoin/contrib/gitian-descriptors/windows/gitian-win-qt4.yml
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/windows/gitian-win-qt4.yml
mv build/out/qt-*.zip inputs/
./bin/gbuild ../darkcoin/contrib/gitian-descriptors/windows/gitian-win-protobuf.yml
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/windows/gitian-win-protobuf.yml
mv build/out/protobuf-*.zip inputs/
./bin/gbuild ../darkcoin/contrib/gitian-descriptors/osx/gitian-osx-native.yml
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/osx/gitian-osx-native.yml
mv build/out/osx-*.tar.gz inputs/
./bin/gbuild ../darkcoin/contrib/gitian-descriptors/osx/gitian-osx-depends.yml
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/osx/gitian-osx-depends.yml
mv build/out/osx-*.tar.gz inputs/
./bin/gbuild ../darkcoin/contrib/gitian-descriptors/osx/gitian-osx-qt.yml
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/osx/gitian-osx-qt.yml
mv build/out/osx-*.tar.gz inputs/

The expected SHA256 hashes of the intermediate inputs are:
Expand All @@ -105,48 +105,48 @@ Release Process
d6bec84c7ac8c3aa5aa2ea728bc3561f6fdfb4c58bc616ddfca757d6f4b03198 osx-depends-qt-5.2.1-r4.tar.gz


Build darkcoind and darkcoin-qt on Linux32, Linux64, Win32 and OSX:
Build bitcoind and bitcoin-qt on Linux32, Linux64, Win32 and OSX:

./bin/gbuild --commit darkcoin=v${VERSION} ../darkcoin/contrib/gitian-descriptors/linux/gitian-linux-darkcoin.yml
./bin/gsign --signer $SIGNER --release ${VERSION} --destination ../gitian.sigs/ ../darkcoin/contrib/gitian-descriptors/linux/gitian-linux-darkcoin.yml
./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/linux/gitian-linux-bitcoin.yml
./bin/gsign --signer $SIGNER --release ${VERSION} --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/linux/gitian-linux-bitcoin.yml
pushd build/out
zip -r darkcoin-${VERSION}-linux-gitian.zip *
mv darkcoin-${VERSION}-linux-gitian.zip ../../../
zip -r bitcoin-${VERSION}-linux-gitian.zip *
mv bitcoin-${VERSION}-linux-gitian.zip ../../../
popd
./bin/gbuild --commit darkcoin=v${VERSION} ../darkcoin/contrib/gitian-descriptors/windows/gitian-win-darkcoin.yml
./bin/gsign --signer $SIGNER --release ${VERSION}-win --destination ../gitian.sigs/ ../darkcoin/contrib/gitian-descriptors/windows/gitian-win-darkcoin.yml
./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/windows/gitian-win-bitcoin.yml
./bin/gsign --signer $SIGNER --release ${VERSION}-win --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/windows/gitian-win-bitcoin.yml
pushd build/out
zip -r darkcoin-${VERSION}-win-gitian.zip *
mv darkcoin-${VERSION}-win-gitian.zip ../../../
zip -r bitcoin-${VERSION}-win-gitian.zip *
mv bitcoin-${VERSION}-win-gitian.zip ../../../
popd
./bin/gbuild --commit darkcoin=v${VERSION} ../darkcoin/contrib/gitian-descriptors/osx/gitian-osx-darkcoin.yml
./bin/gsign --signer $SIGNER --release ${VERSION}-osx --destination ../gitian.sigs/ ../darkcoin/contrib/gitian-descriptors/osx/gitian-osx-darkcoin.yml
./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/osx/gitian-osx-bitcoin.yml
./bin/gsign --signer $SIGNER --release ${VERSION}-osx --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/osx/gitian-osx-bitcoin.yml
pushd build/out
mv DarkCoin-Qt.dmg ../../../
mv BitCoin-Qt.dmg ../../../
popd
popd

Build output expected:

1. linux 32-bit and 64-bit binaries + source (darkcoin-${VERSION}-linux-gitian.zip)
2. windows 32-bit binaries + installer + source (darkcoin-${VERSION}-win-gitian.zip)
3. OSX installer (DarkCoin-Qt.dmg)
1. linux 32-bit and 64-bit binaries + source (bitcoin-${VERSION}-linux-gitian.zip)
2. windows 32-bit binaries + installer + source (bitcoin-${VERSION}-win-gitian.zip)
3. OSX installer (BitCoin-Qt.dmg)
4. Gitian signatures (in gitian.sigs/${VERSION}[-win|-osx]/(your gitian key)/

repackage gitian builds for release as stand-alone zip/tar/installer exe

**Linux .tar.gz:**

unzip darkcoin-${VERSION}-linux-gitian.zip -d darkcoin-${VERSION}-linux
tar czvf darkcoin-${VERSION}-linux.tar.gz darkcoin-${VERSION}-linux
rm -rf darkcoin-${VERSION}-linux
unzip bitcoin-${VERSION}-linux-gitian.zip -d bitcoin-${VERSION}-linux
tar czvf bitcoin-${VERSION}-linux.tar.gz bitcoin-${VERSION}-linux
rm -rf bitcoin-${VERSION}-linux

**Windows .zip and setup.exe:**

unzip darkcoin-${VERSION}-win-gitian.zip -d darkcoin-${VERSION}-win
mv darkcoin-${VERSION}-win/darkcoin-*-setup.exe .
zip -r darkcoin-${VERSION}-win.zip darkcoin-${VERSION}-win
rm -rf darkcoin-${VERSION}-win
unzip bitcoin-${VERSION}-win-gitian.zip -d bitcoin-${VERSION}-win
mv bitcoin-${VERSION}-win/bitcoin-*-setup.exe .
zip -r bitcoin-${VERSION}-win.zip bitcoin-${VERSION}-win
rm -rf bitcoin-${VERSION}-win

###Next steps:

Expand All @@ -156,10 +156,10 @@ repackage gitian builds for release as stand-alone zip/tar/installer exe

* create SHA256SUMS for builds, and PGP-sign it

* update darkcoin.io version
* update bitcoin.io version
make sure all OS download links go to the right versions

* update download sizes on darkcoin.io
* update download sizes on bitcoin.io

* update forum version

Expand All @@ -184,11 +184,11 @@ Commit your signature to gitian.sigs:

- Announce the release:

- Add the release to darkcoin.io: https://github.com/darkcoinproject/darkcoin.io/tree/master/_releases
- Add the release to bitcoin.io: https://github.com/bitcoinproject/bitcoin.io/tree/master/_releases

- Release sticky on darkcointalk
- Release sticky on bitcointalk

- Darkcoin-development mailing list
- bitcoin-development mailing list

- Optionally reddit /r/DRKCoin, ...

Expand Down
2 changes: 1 addition & 1 deletion share/qt/Info.plist
Expand Up @@ -3,7 +3,7 @@
<plist version="0.9">
<dict>
<key>CFBundleIconFile</key>
<string>darkcoin.icns</string>
<string>zettelkasten.icns</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
Expand Down
3 changes: 0 additions & 3 deletions src/bitcoinrpc.cpp
Expand Up @@ -213,9 +213,6 @@ static const CRPCCommand vRPCCommands[] =
{ "getconnectioncount", &getconnectioncount, true, false, false },
{ "getpeerinfo", &getpeerinfo, true, false, false },
{ "addnode", &addnode, true, true, false },
#if ENABLE_DARKSEND_FEATURES
{ "masternode", &masternode, false, false, true },
#endif
{ "getaddednodeinfo", &getaddednodeinfo, true, true, false },
{ "getdifficulty", &getdifficulty, true, false, false },
{ "getnetworkhashps", &getnetworkhashps, true, false, false },
Expand Down
2 changes: 0 additions & 2 deletions src/bitcoinrpc.h
Expand Up @@ -136,8 +136,6 @@ extern std::string HexBits(unsigned int nBits);
extern std::string HelpRequiringPassphrase();
extern void EnsureWalletIsUnlocked();

extern json_spirit::Value masternode(const json_spirit::Array& params, bool fHelp);

extern json_spirit::Value getconnectioncount(const json_spirit::Array& params, bool fHelp); // in rpcnet.cpp
extern json_spirit::Value getpeerinfo(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value addnode(const json_spirit::Array& params, bool fHelp);
Expand Down
2 changes: 1 addition & 1 deletion src/init.cpp
Expand Up @@ -385,7 +385,7 @@ std::string HelpMessage()
" -blockmaxsize=<n> " + _("Set maximum block size in bytes (default: 250000)") + "\n" +
" -blockprioritysize=<n> " + _("Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)") + "\n" +

"\n" + _("SSL options: (see the DarkCoin Wiki for SSL setup instructions)") + "\n" +
"\n" + _("SSL options: (see the Zettelkasten Wiki for SSL setup instructions)") + "\n" +
" -rpcssl " + _("Use OpenSSL (https) for JSON-RPC connections") + "\n" +
" -rpcsslcertificatechainfile=<file.cert> " + _("Server certificate file (default: server.cert)") + "\n" +
" -rpcsslprivatekeyfile=<file.pem> " + _("Server private key (default: server.pem)") + "\n" +
Expand Down
9 changes: 2 additions & 7 deletions src/main.cpp
Expand Up @@ -57,7 +57,6 @@ bool fReindex = false;
bool fBenchmark = false;
bool fTxIndex = false;
bool fAddrIndex = false;
int RequestedMasterNodeList = 0;
unsigned int nCoinCacheSize = 5000;


Expand Down Expand Up @@ -384,7 +383,7 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans)

bool CTxOut::IsDust() const
{
// DarkCoin: IsDust() detection disabled, allows any valid dust to be relayed.
// IsDust() detection disabled, allows any valid dust to be relayed.
// The fees imposed on each dust txo is considered sufficient spam deterrant.
return false;
}
Expand Down Expand Up @@ -641,7 +640,6 @@ int64 CTransaction::GetMinFee(unsigned int nBlockSize, bool fAllowFree,
nMinFee = 0;
}

// DarkCoin
// To limit dust spam, add nBaseFee for each output less than DUST_SOFT_LIMIT
BOOST_FOREACH(const CTxOut& txout, vout)
if (txout.nValue < DUST_SOFT_LIMIT)
Expand Down Expand Up @@ -2879,7 +2877,7 @@ bool CBlock::AcceptBlock(CValidationState &state, CDiskBlockPos *dbp)

bool CBlockIndex::IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned int nRequired, unsigned int nToCheck)
{
// DarkCoin: temporarily disable v2 block lockin until we are ready for v2 transition
// temporarily disable v2 block lockin until we are ready for v2 transition
return false;
unsigned int nFound = 0;
for (unsigned int i = 0; i < nToCheck && nFound < nRequired && pstart != NULL; i++)
Expand Down Expand Up @@ -4843,9 +4841,6 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
pblocktemplate->vTxFees.push_back(-1); // updated at end
pblocktemplate->vTxSigOps.push_back(-1); // updated at end

// end masternode payments


// Largest block you're willing to create:
unsigned int nBlockMaxSize = GetArg("-blockmaxsize", DEFAULT_BLOCK_MAX_SIZE);
// Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity:
Expand Down

0 comments on commit b9f96de

Please sign in to comment.