Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1Rjf4K-0006y2-1t for bitcoin-development@lists.sourceforge.net; Sat, 07 Jan 2012 22:48:56 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of gmail.com designates 209.85.212.175 as permitted sender) client-ip=209.85.212.175; envelope-from=gavinandresen@gmail.com; helo=mail-wi0-f175.google.com; Received: from mail-wi0-f175.google.com ([209.85.212.175]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-MD5:128) (Exim 4.76) id 1Rjf4H-0002LJ-Nt for bitcoin-development@lists.sourceforge.net; Sat, 07 Jan 2012 22:48:56 +0000 Received: by wibhq7 with SMTP id hq7so2885850wib.34 for ; Sat, 07 Jan 2012 14:48:47 -0800 (PST) MIME-Version: 1.0 Received: by 10.181.13.179 with SMTP id ez19mr19434020wid.11.1325976527591; Sat, 07 Jan 2012 14:48:47 -0800 (PST) Received: by 10.223.156.77 with HTTP; Sat, 7 Jan 2012 14:48:47 -0800 (PST) In-Reply-To: <1325956875.73286.YahooMailNeo@web121006.mail.ne1.yahoo.com> References: <1325956875.73286.YahooMailNeo@web121006.mail.ne1.yahoo.com> Date: Sat, 7 Jan 2012 17:48:47 -0500 Message-ID: From: Gavin Andresen To: Amir Taaki Content-Type: text/plain; charset=ISO-8859-1 X-Spam-Score: -1.6 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (gavinandresen[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-Headers-End: 1Rjf4H-0002LJ-Nt Cc: Bitcoin Dev Subject: Re: [Bitcoin-development] Pull 748 pay to script hash 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: Sat, 07 Jan 2012 22:48:56 -0000 > It might be better for code review if the old pull is reverted and then this one re-requested. That will make it easier > to see the real changes. I count the 1 major merge then 8 commits to fix bugs or tweak things... I just tried reverting them and stopped when I got scared I'll accidentally revert a fix we do want to keep. Instead, I updated my gavinandresen/master github branch to the state of the tree just before the OP_EVAL merge, so for code review purposes you can look at: https://github.com/gavinandresen/bitcoin-git/compare/master...pay_to_script_hash There are unrelated 0.6 pulls in those changes, too, but it should be pretty obvious what is what. -- -- Gavin Andresen