From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1RAxD8-0001KA-1k for bitcoin-development@lists.sourceforge.net; Tue, 04 Oct 2011 05:06:34 +0000 X-ACL-Warn: Received: from zinan.dashjr.org ([173.242.112.54]) by sog-mx-3.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1RAxD6-0006oN-UV for bitcoin-development@lists.sourceforge.net; Tue, 04 Oct 2011 05:06:34 +0000 Received: from ishibashi.localnet (fl-184-4-160-40.dhcp.embarqhsd.net [184.4.160.40]) (Authenticated sender: luke-jr) by zinan.dashjr.org (Postfix) with ESMTPSA id 6DE58204089 for ; Tue, 4 Oct 2011 05:06:27 +0000 (UTC) To: bitcoin-development@lists.sourceforge.net From: "Luke-Jr" X-PGP-Key-Fingerprint: CE5A D56A 36CC 69FA E7D2 3558 665F C11D D53E 9583 X-PGP-Key-ID: 665FC11DD53E9583 X-PGP-Keyserver: x-hkp://subkeys.pgp.net Date: Tue, 4 Oct 2011 01:06:17 -0400 MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201110040106.20441.luke@dashjr.org> X-Spam-Score: -0.5 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.5 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-Headers-End: 1RAxD6-0006oN-UV Subject: [Bitcoin-development] [PULLs] 6 *more* branches X-BeenThere: bitcoin-development@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2011 05:06:34 -0000 These branches are ready for merging to mainline. Note that these are not the same ones I sent earlier today, but part of a larger batch I have just finished rebasing. Branches can be viewed at: http://luke.dashjr.org/programs/bitcoin/w/bitcoind/luke-jr.git/heads git pull git://gitorious.org/~Luke-Jr/bitcoin/luke-jr-bitcoin.git = coinbaser: allow customizing what addresses are paid by generation, with failover to the standard "50 BTC to me" behaviour; also adds the "setworkaux" JSON-RPC call to add arbitrary data to the coinbase, which can be used to implement merged-mining (has safeguards against creating invalid coinbases) Eligius has tested this quite a bit under the 0.3.23 codebase. = txinfo: adds "pooledtx" (number of transactions in memory pool), "currentblocktx" (number of txns in the last block created), and "currentblocksize" to the output of the JSON-RPC 'getinfo' method; adds "block_hash" and "block_index" to transactions shown by 'listtransactions' and similar JSON-RPC methods Been using this since 0.3.21 without issues. = force_send: disables automatically adding "minimum" fees for JSON-RPC methods-- instead, it returns an error or, iff the user sets the new second parameter "force" to the 'settxfee' JSON-RPC call, sends the transaction with the user-specified fee This only affects JSON-RPC users, who should be assumed to understand the risk of sending with insufficient fees. = eligius_relay: relay transactions that satisfy Eligius's minimum fee when it's lower than the default rules eligius_sendfee: allow sending the lower fee between default and Eligius, and adds relay.eligius.st to the DNS seed list Merge or not, up to you guys... I don't really care. = bugfix_CreateThread_ThreadSocketHandler_errReporting: report an error in debug.log