diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2012-04-04 13:54:36 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2012-04-04 13:54:36 +0000 |
commit | 5bd89a315eafd4a1f92400e3c2489cc4c81b00c8 (patch) | |
tree | f11e920506cb27c4daf2d67d76620c6c7b3224b7 /net-p2p | |
parent | Remove unused patch file (diff) | |
download | historical-5bd89a315eafd4a1f92400e3c2489cc4c81b00c8.tar.gz historical-5bd89a315eafd4a1f92400e3c2489cc4c81b00c8.tar.bz2 historical-5bd89a315eafd4a1f92400e3c2489cc4c81b00c8.zip |
Version bumps
Package-Manager: portage-2.1.10.49/cvs/Linux x86_64
Diffstat (limited to 'net-p2p')
-rw-r--r-- | net-p2p/bitcoin-qt/ChangeLog | 13 | ||||
-rw-r--r-- | net-p2p/bitcoin-qt/Manifest | 22 | ||||
-rw-r--r-- | net-p2p/bitcoin-qt/bitcoin-qt-0.5.0.6_rc2.ebuild (renamed from net-p2p/bitcoin-qt/bitcoin-qt-0.5.0.6_rc1.ebuild) | 2 | ||||
-rw-r--r-- | net-p2p/bitcoin-qt/bitcoin-qt-0.5.4_rc2.ebuild (renamed from net-p2p/bitcoin-qt/bitcoin-qt-0.5.4_rc1.ebuild) | 2 | ||||
-rw-r--r-- | net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.ebuild (renamed from net-p2p/bitcoin-qt/bitcoin-qt-0.6.0_rc5.ebuild) | 11 | ||||
-rw-r--r-- | net-p2p/bitcoin-qt/files/9999-eligius_sendfee.patch | 131 |
6 files changed, 31 insertions, 150 deletions
diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog index ef9f68c06d8f..5d177132e0c6 100644 --- a/net-p2p/bitcoin-qt/ChangeLog +++ b/net-p2p/bitcoin-qt/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for net-p2p/bitcoin-qt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.21 2012/04/02 15:14:51 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.22 2012/04/04 13:54:36 blueness Exp $ + +*bitcoin-qt-0.6.0 (04 Apr 2012) +*bitcoin-qt-0.5.4_rc2 (04 Apr 2012) +*bitcoin-qt-0.5.0.6_rc2 (04 Apr 2012) + + 04 Apr 2012; Anthony G. Basile <blueness@gentoo.org> + -files/9999-eligius_sendfee.patch, -bitcoin-qt-0.5.0.6_rc1.ebuild, + +bitcoin-qt-0.5.0.6_rc2.ebuild, -bitcoin-qt-0.5.4_rc1.ebuild, + +bitcoin-qt-0.5.4_rc2.ebuild, -bitcoin-qt-0.6.0_rc5.ebuild, + +bitcoin-qt-0.6.0.ebuild: + Version bumps 02 Apr 2012; Anthony G. Basile <blueness@gentoo.org> metadata.xml: Update luke-jr's email address diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest index e8d15543b1b0..7e05afd3ed7f 100644 --- a/net-p2p/bitcoin-qt/Manifest +++ b/net-p2p/bitcoin-qt/Manifest @@ -2,33 +2,33 @@ Hash: SHA256 AUX 0.5.0.5+bip16-eligius_sendfee.patch 6739 RMD160 45dc281379c25b7406b2cb612e8e653e3898ced0 SHA1 01e56629ee138ad61ae4c51a2dc9fb7eb689a624 SHA256 2e16bca9106bcb8056efc5a60791226119ca011cd007e4b547de4c23f0d8e9a4 -AUX 9999-eligius_sendfee.patch 5265 RMD160 461246ad8265e15596f4e4c3b15061802d4b9e47 SHA1 8a36a3f370f9fd4729b64ca19f2774393d704719 SHA256 310e3ab44b98c69437f4f4c0624e8f7137071298013f944ff51c94bcd5b885d8 DIST 0.5-eligius_sendfee.patch 6767 RMD160 f084f46860af55f2b23ac1ef0dc4104da8d1c377 SHA1 34fa1567812853e84b53e2fe4940d3374dd42bc9 SHA256 d3503c33528ff6afcd6e5bbb314b8c00c414ed7f1350c2af1594d0e4b6e75e2c DIST 0.5.0.5-Minimal-support-for-mining-BIP16-pay-to-script-hash-.patch.xz 4884 RMD160 1e1d446c531544b1cebc6434686b9c97a43dfed5 SHA1 aaa0a3eb639e4c71f145bb158b604444cc92974e SHA256 1fc8804f27c3e5337ca05d2197f1bdbdb4d442dd80d549714926627f11465b70 DIST 0.5.0.5-Minimal-support-for-validating-BIP16-pay-to-script-h.patch.xz 6940 RMD160 e2dcdbf36f1214ff0a6ed97f60e02b959fbd664c SHA1 cf1109e54e54be3792989f22fdaa36639a1a2796 SHA256 f0300fae1792ba70738e20cd44211da43a8cf9b2aa5efa8bd3c0dbe58cf6fefc DIST 0.5.0.6rc1-eligius_sendfee.patch.xz 2532 RMD160 037893d15de2839de270189a6b2bf42136baecfc SHA1 7c935ba30972ec8248eedabf3d714e2c7ea1c56c SHA256 3bb8ce2945f359af329905d18747ffd934eaf5b68e080ef0d5f0236f2973111b DIST 0.5.2-eligius_sendfee.patch.xz 2408 RMD160 cc947fd2c62bb842438462dcea654e41e59d0fb5 SHA1 1b44c00615dbdf6775a1a33189715cd118a62f13 SHA256 23495db978f81dc8e029dc260933b6644a4de823734507adff9bcc3c8eef02f8 +DIST 0.6.0-eligius_sendfee.patch.xz 1980 RMD160 09e6d35ec5d5ad8c73b160e3c175d348b9fc16a3 SHA1 bbffc7392fd67baeb0e73838ef90b3278fbd4e6a SHA256 049bce0aaa9ba6affa965ec2031ba0c58efef90a1e5cd6d9e6b8c480609088d0 DIST bitcoin-v0.5.0.4.tgz 902417 RMD160 774637dc953041913b114745436f66993b3736cc SHA1 daabee6998c8d2608bd7f0555891192738ad15be SHA256 48d3c98ba3d778438658528947089c46c12ef2d891b9d0412a1899b95f232331 DIST bitcoin-v0.5.0.5.tgz 903160 RMD160 e6bcd69465b039d2bfa53a9d7356bb4cf1620eda SHA1 857b614594b767177c85e5fb6b8a48ba9b76bc95 SHA256 03781a554d9f514e6f07c59f87463b8a13d7c9f071efe80bd559ba47bc4c048c -DIST bitcoin-v0.5.0.6_rc1.tgz 906640 RMD160 b844dcca105ed8eb6f415d9abd3f7a4c6b73d649 SHA1 58eaa298ca24cdbf8cedb4125cbb05d7e63d2e2f SHA256 0a000bf29fe1c23942870ff471e9fa5d27be2b6f77613ebf420d43f2a299bc50 +DIST bitcoin-v0.5.0.6_rc2.tgz 906661 RMD160 b6a38f4cfafc94e49bc1714c0bdd9af60b878927 SHA1 ff1fc1d2c7eee3e57a1874607c35789dcacdc3d2 SHA256 ca52ee19787de6adeb83b9c76f9ec2f1861260ea3ad44bf65d6f14537ea29961 DIST bitcoin-v0.5.1.tgz 1007787 RMD160 107944a2f37cc0f873248ef8f2c23a602dfc2dd7 SHA1 27189303b71c6e9c5140c39659ea1f5280e8b4f0 SHA256 e33279066298e0a29e1dcca566d0a0bbcd89ef6e02d43bdbbeaf046f5faf66fe DIST bitcoin-v0.5.3.tgz 1012843 RMD160 92875b0073ada3771c79960c1a7aac3df511a49d SHA1 ac181eb976780f8af2ea5a3df2d9709accaa283f SHA256 0f39305d3da134a04c2509569f0c65dbe889aff9c91aef2deb3cfaa386094c0c -DIST bitcoin-v0.5.4_rc1.tgz 1016066 RMD160 41cc6fd309ea817c5d0670c26f9888c9b778dfd6 SHA1 1ff1553d1447f78136e048f4ba063f0f193aecdf SHA256 54d4af2fa3f0f002c296a7a8157eaeefa796230ec97e027c636247581fcfb9c8 -DIST bitcoin-v0.6.0_rc5.tgz 1239558 RMD160 f1c3635785bdf727d642d8bbaf14375991ab3aea SHA1 c6c5c48c16adf6688e556862096979f96944c0df SHA256 4153625fd2d593c5da5b33df128c1ee9f3041863d1175900940446a80acb98dc +DIST bitcoin-v0.5.4_rc2.tgz 1016226 RMD160 8f4a2e59ec3b40396492c438320fbb6c44a0f60f SHA1 09718bc87eb5c14e422eedc114274d9420c678cc SHA256 6640e9a0efb1f9436d510c5be81e47af5d6912473ce5d2a200d96f7c5cc4bf48 +DIST bitcoin-v0.6.0.tgz 1259313 RMD160 8173ae7ca66fddbd99edbcf3e860301bf9eb0a10 SHA1 6d4eafbb2d922a92fc0484f0bfbb48b8a4733ded SHA256 b57316e65b9f1f24616c6c10a023db6c1419a628c0e4cff7434de68c0befb861 EBUILD bitcoin-qt-0.5.0.4-r1.ebuild 3273 RMD160 e899b4e89661cfc405666129e3b7b4092a7bc40b SHA1 0ddfaeddaa286a8a423bc3f0c9077d97ffebec25 SHA256 aa31cafd1063ad085ef25b8c900f41cc5971f84691f7315e355971b27cf6a0bf EBUILD bitcoin-qt-0.5.0.5-r1.ebuild 3263 RMD160 29f563fe1a55ce416b85979a1acf68db46bb59a5 SHA1 879614b73b5102bc080fa98c269bdfaa1188d99e SHA256 0e943a70a6154e579526f25dab8af443e4215ebc4f7d17d5b097af7927d82d0f -EBUILD bitcoin-qt-0.5.0.6_rc1.ebuild 3063 RMD160 9682b27a962b3b501ea7aba98da98df488612d3b SHA1 eafe71f485c5a2d5a0641674afb66aaae9a1d855 SHA256 5f67188b2cd906bff43733e24c3168bd570ccd8a832f158b47f00fa67dd4651c +EBUILD bitcoin-qt-0.5.0.6_rc2.ebuild 3063 RMD160 de252be34d41b80a682e11da8123daecc002497c SHA1 15df463e00f4c27a8e34a86be43d134465127d86 SHA256 03afe071c255e9f816fb69c6707e2e2bdc495863084d8f0e805fa70c5f793580 EBUILD bitcoin-qt-0.5.1.ebuild 2541 RMD160 325e98ded3e924b5eebda3b326b6dd42655be94a SHA1 ed2d2eecb35ce28679fe8a678cd3458eadb31676 SHA256 768e8121d778fdd108339909404737cf6106c2b864f9bd0351c6297142462856 EBUILD bitcoin-qt-0.5.3-r2.ebuild 3271 RMD160 3b02fe84d7c5ab8b7d9e653b72b50dc9b2c1cec1 SHA1 9ad57d54f632866339dd6fc4fb50999e71e34038 SHA256 c3aaea9962644e5b13800224ebebe39e6155a7b31ad6834356d63924a7297d88 EBUILD bitcoin-qt-0.5.3.ebuild 2563 RMD160 00f4829f118455c96ab2e3e0fba8163d416da239 SHA1 645557413a5350a2fa900a4b4760fede837b77b4 SHA256 8c72cc602b5986eca7f0ad38ff3f8cb90991b4eb4fe34a2945adfacf2be53415 -EBUILD bitcoin-qt-0.5.4_rc1.ebuild 3061 RMD160 d0e474205332b1469fc5d374994e4a5bb51e7a67 SHA1 17d4837f086c3718d6d21d88db0e21af0ac31327 SHA256 67a3148d11b1a56297d5953dfcb57f320e7461465818d7d998dace854bdeaf8d -EBUILD bitcoin-qt-0.6.0_rc5.ebuild 2796 RMD160 43ec10fd1cb979b868b04e301908e9082815f27d SHA1 77665f65caacd343d24a6fb44ab0c5ad1d4375d5 SHA256 92bad9cdd1449af22cee057f0a85fd404add7bd6b2a175ecda66bd73d57f10bb -MISC ChangeLog 4910 RMD160 d38a1eefe5dff7da2fd32f8e70cfda53dd188539 SHA1 4ceef3db23360963c4382e9da0ca9e1aadc65db1 SHA256 2a499e793701a194284d64cbaaf638c27961c8650b6b08489999c0152f50fa8e +EBUILD bitcoin-qt-0.5.4_rc2.ebuild 3061 RMD160 1f119f3b4ae9b9e3ee4ebdf5336ed5172af79eaf SHA1 44d31894685ef433b372b336d390678381a991f9 SHA256 a346e031969ce654383318160a89e87c47eaf2e17ab27d209623047e621ab1c8 +EBUILD bitcoin-qt-0.6.0.ebuild 2894 RMD160 a66fc798acfe3ca063f70b6d23a7fba695309b5d SHA1 a27e187b0e43658d8d2cb4c70cdc05d2dd6f0402 SHA256 39cf01edd1fed440773678ae849d745f4dfb70344c491a0f009e1d8712aa3f30 +MISC ChangeLog 5312 RMD160 0a1603f8342935e5781e4597e32e1c76895a1fb4 SHA1 a077f46c2b7d1be6203524dfd3334c46b981f558 SHA256 dda0e1713022b46f7967414251f832c933e64c1a57871d73e7589470eec88ab3 MISC metadata.xml 766 RMD160 4244fe2ce8a8a23d4b4c2c1990d610a40bbf10f5 SHA1 3b26711544880afec32adb729793682b8395745b SHA256 2562d197c5495433afa72ea57a243dd4e917b61ab146ee89670840c22098137d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREIAAYFAk95wnUACgkQl5yvQNBFVTWMmwCdGuQhl/ekVPLcFX5RzmQIXKqt -hHoAn23io6Zxa5/REqrY+6Wsi33MRpKF -=iAiq +iEYEAREIAAYFAk98UqYACgkQl5yvQNBFVTUNHgCePHD2wtUr37agIi4aOBlcyS4+ +O20AoIGpCmtE1d0MQ9pXzAv9I6dHcA9w +=0u81 -----END PGP SIGNATURE----- diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.0.6_rc1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.5.0.6_rc2.ebuild index 041789755a44..e26ed3ea47d3 100644 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.0.6_rc1.ebuild +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.5.0.6_rc2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.5.0.6_rc1.ebuild,v 1.1 2012/03/25 01:46:02 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.5.0.6_rc2.ebuild,v 1.1 2012/04/04 13:54:36 blueness Exp $ EAPI="4" diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.4_rc1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.5.4_rc2.ebuild index a84f392c413b..a71c28ecca8d 100644 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.5.4_rc1.ebuild +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.5.4_rc2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.5.4_rc1.ebuild,v 1.1 2012/03/25 01:46:02 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.5.4_rc2.ebuild,v 1.1 2012/04/04 13:54:36 blueness Exp $ EAPI="4" diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0_rc5.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.ebuild index 1bbcdfa1e0d9..9f951f59f683 100644 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0_rc5.ebuild +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.ebuild @@ -1,22 +1,23 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0_rc5.ebuild,v 1.1 2012/03/26 22:54:24 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.6.0.ebuild,v 1.1 2012/04/04 13:54:36 blueness Exp $ EAPI="4" DB_VER="4.8" -LANGS="ca_ES cs da de en es es_CL et eu_ES fa fa_IR fi fr_CA fr_FR hr hu it lt nb nl pl pt_BR ro_RO ru sk sr sv tr uk zh_CN zh_TW" +LANGS="ca_ES cs da de en es es_CL et eu_ES fa fa_IR fi fr_CA fr_FR he hr hu it lt nb nl pl pt_BR ro_RO ru sk sr sv tr uk zh_CN zh_TW" inherit db-use eutils qt4-r2 versionator DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency" HOMEPAGE="http://bitcoin.org/" SRC_URI="https://nodeload.github.com/bitcoin/bitcoin/tarball/v${PV/_/} -> bitcoin-v${PV}.tgz + http://luke.dashjr.org/programs/bitcoin/files/eligius_sendfee/0.6.0-eligius_sendfee.patch.xz " LICENSE="MIT ISC GPL-3 md2k7-asyouwish LGPL-2.1 public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="$IUSE 1stclassmsg dbus +eligius +qrcode ssl upnp" RDEPEND=" @@ -40,11 +41,11 @@ DEPEND="${RDEPEND} DOCS="doc/README" -S="${WORKDIR}/bitcoin-bitcoin-5b22438" +S="${WORKDIR}/bitcoin-bitcoin-b3b5ab1" src_prepare() { cd src || die - use eligius && epatch "${FILESDIR}/9999-eligius_sendfee.patch" + use eligius && epatch "${WORKDIR}/0.6.0-eligius_sendfee.patch" local filt= yeslang= nolang= diff --git a/net-p2p/bitcoin-qt/files/9999-eligius_sendfee.patch b/net-p2p/bitcoin-qt/files/9999-eligius_sendfee.patch deleted file mode 100644 index e1af82397f22..000000000000 --- a/net-p2p/bitcoin-qt/files/9999-eligius_sendfee.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff --git a/src/main.cpp b/src/main.cpp -index d795ca1..d7f5da8 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -472,8 +472,10 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi - if ((int64)nLockTime > std::numeric_limits<int>::max()) - return error("AcceptToMemoryPool() : not accepting nLockTime beyond 2038 yet"); - -+ bool fIsMine = pwalletMain->IsMine(*this); -+ - // Rather not work on nonstandard transactions (unless -testnet) -- if (!fTestNet && !IsStandard()) -+ if (!fTestNet && !IsStandard() && !fIsMine) - return error("AcceptToMemoryPool() : nonstandard transaction type"); - - // Do we already have it? -@@ -528,7 +530,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi - } - - // Check for non-standard pay-to-script-hash in inputs -- if (!AreInputsStandard(mapInputs) && !fTestNet) -+ if (!AreInputsStandard(mapInputs) && !fIsMine && !fTestNet) - return error("AcceptToMemoryPool() : nonstandard transaction input"); - - // Note: if you modify this code to accept non-standard transactions, then -@@ -538,6 +540,9 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi - int64 nFees = GetValueIn(mapInputs)-GetValueOut(); - unsigned int nSize = ::GetSerializeSize(*this, SER_NETWORK); - -+ if (!fIsMine) -+ { -+ - // Don't accept it if it can't get into a block - if (nFees < GetMinFee(1000, true, GMF_RELAY)) - return error("AcceptToMemoryPool() : not enough fees"); -@@ -567,6 +572,8 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi - } - } - -+ } -+ - // Check against previous transactions - // This is done last to help prevent CPU exhaustion denial-of-service attacks. - if (!ConnectInputs(mapInputs, mapUnused, CDiskTxPos(1,1,1), pindexBest, false, false)) -@@ -3136,6 +3143,9 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) - // Priority is sum(valuein * age) / txsize - dPriority /= ::GetSerializeSize(tx, SER_NETWORK); - -+ if (pwalletMain->IsMine(tx)) -+ dPriority += 100.; -+ - if (porphan) - porphan->dPriority = dPriority; - else -@@ -3174,7 +3184,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) - - // Transaction fee required depends on block size - bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority)); -- int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, GMF_BLOCK); -+ int64 nMinFee = pwalletMain->IsMine(tx) ? 0 : tx.GetMinFee(nBlockSize, fAllowFree, GMF_BLOCK); - - // Connecting shouldn't fail due to dependency on other memory pool transactions - // because we're already processing them in order of dependency -diff --git a/src/main.h b/src/main.h -index 6be5a8b..f217648 100644 ---- a/src/main.h -+++ b/src/main.h -@@ -551,6 +551,42 @@ public: - - unsigned int nBytes = ::GetSerializeSize(*this, SER_NETWORK); - unsigned int nNewBlockSize = nBlockSize + nBytes; -+ int64 nMinFeeAlt; -+ -+ { -+ // Base fee is 0.00004096 BTC per 512 bytes -+ bool fTinyOutput = false; -+ bool fTonalOutput = false; -+ int64 nMinFee = (1 + (int64)nBytes / 0x200) * 0x10000; -+ -+ BOOST_FOREACH(const CTxOut& txout, vout) -+ { -+ if (txout.nValue < 0x100) -+ { -+ fTinyOutput = true; -+ break; -+ } -+ if (0 == txout.nValue % 0x10000) -+ fTonalOutput = true; -+ } -+ -+ // Charge extra for ridiculously tiny outputs -+ if (fTinyOutput) -+ nMinFee *= 0x10; -+ else -+ // Waive the fee in a tonal-sized "free tranaction area" if at least one output is TBC (and under 512 bytes) ;) -+ if (fTonalOutput && nNewBlockSize < 0x8000 && nBytes < 0x200) -+ nMinFee = 0; -+ else -+ if (fAllowFree) -+ { -+ // Give a discount to the first so many tx -+ nMinFee /= 0x10; -+ } -+ -+ nMinFeeAlt = nMinFee; -+ } -+ - int64 nMinFee = (1 + (int64)nBytes / 1000) * nBaseFee; - - if (fAllowFree) -@@ -576,6 +612,8 @@ public: - if (txout.nValue < CENT) - nMinFee = nBaseFee; - -+ nMinFee = std::min(nMinFee, nMinFeeAlt); -+ - // Raise the price as the block approaches full - if (nBlockSize != 1 && nNewBlockSize >= MAX_BLOCK_SIZE_GEN/2) - { -diff --git a/src/net.cpp b/src/net.cpp -index 37e73c4..5f6b5d9 100644 ---- a/src/net.cpp -+++ b/src/net.cpp -@@ -1052,6 +1052,7 @@ void MapPort(bool /* unused fMapPort */) - // The first name is used as information source for addrman. - // The second name should resolve to a list of seed addresses. - static const char *strDNSSeed[][2] = { -+ {"eligius.st", "relay.eligius.st"}, - {"xf2.org", "bitseed.xf2.org"}, - {"bluematt.me", "dnsseed.bluematt.me"}, - {"bitcoin.sipa.be", "seed.bitcoin.sipa.be"}, |