Refresh JavaDocs.

2025-11-03 05:57:21 +00:00 · 2011-04-25 22:01:15 +00:00
parent c20118d871
commit ccef45c6c9
24 changed files with 877 additions and 108 deletions
--- a/docs/com/google/bitcoin/core/Block.html
+++ b/docs/com/google/bitcoin/core/Block.html
@@ -72,9 +72,9 @@ function windowTitle()
 </TR>
 <TR>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.google.bitcoin.core.Message">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
 </TR>
 </TABLE>
 <A NAME="skip-navbar_top"></A>
@@ -123,6 +123,14 @@ A block is the foundation of the BitCoin system. It records a set of <A HREF="..
 <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
 <B>Field Summary</B></FONT></TH>
 </TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;int</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Block.html#HEADER_SIZE">HEADER_SIZE</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;How many bytes are required to represent a block header.</TD>
+</TR>
 </TABLE>
 &nbsp;<A NAME="fields_inherited_from_class_com.google.bitcoin.core.Message"><!-- --></A>
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -303,6 +311,27 @@ A block is the foundation of the BitCoin system. It records a set of <A HREF="..
 &nbsp;
 <P>

+<!-- ============ FIELD DETAIL =========== -->
+
+<A NAME="field_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Field Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="HEADER_SIZE"><!-- --></A><H3>
+HEADER_SIZE</H3>
+<PRE>
+public static final int <B>HEADER_SIZE</B></PRE>
+<DL>
+<DD>How many bytes are required to represent a block header.
+<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#com.google.bitcoin.core.Block.HEADER_SIZE">Constant Field Values</A></DL>
+</DL>
+
 <!-- ========= CONSTRUCTOR DETAIL ======== -->

 <A NAME="constructor_detail"><!-- --></A>
@@ -610,9 +639,9 @@ public long <B>getNonce</B>()</PRE>
 </TR>
 <TR>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#fields_inherited_from_class_com.google.bitcoin.core.Message">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
 <TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
 </TR>
 </TABLE>
 <A NAME="skip-navbar_bottom"></A>
--- a/docs/com/google/bitcoin/core/BlockChain.html
+++ b/docs/com/google/bitcoin/core/BlockChain.html
@@ -52,7 +52,7 @@ function windowTitle()
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/Block.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/BlockStoreException.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/BlockChain.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="BlockChain.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -135,7 +135,7 @@ A BlockChain holds a series of <A HREF="../../../../com/google/bitcoin/core/Bloc
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>protected &nbsp;com.google.bitcoin.core.BlockStore</CODE></FONT></TD>
+<CODE>protected &nbsp;<A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core">BlockStore</A></CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/BlockChain.html#blockStore">blockStore</A></B></CODE>

 <BR>
@@ -143,7 +143,7 @@ A BlockChain holds a series of <A HREF="../../../../com/google/bitcoin/core/Bloc
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>protected &nbsp;com.google.bitcoin.core.StoredBlock</CODE></FONT></TD>
+<CODE>protected &nbsp;<A HREF="../../../../com/google/bitcoin/core/StoredBlock.html" title="class in com.google.bitcoin.core">StoredBlock</A></CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/BlockChain.html#chainHead">chainHead</A></B></CODE>

 <BR>
@@ -176,11 +176,12 @@ A BlockChain holds a series of <A HREF="../../../../com/google/bitcoin/core/Bloc
 <B>Constructor Summary</B></FONT></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/BlockChain.html#BlockChain(com.google.bitcoin.core.NetworkParameters, com.google.bitcoin.core.Wallet)">BlockChain</A></B>(<A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params,
-           <A HREF="../../../../com/google/bitcoin/core/Wallet.html" title="class in com.google.bitcoin.core">Wallet</A>&nbsp;wallet)</CODE>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/BlockChain.html#BlockChain(com.google.bitcoin.core.NetworkParameters, com.google.bitcoin.core.Wallet, com.google.bitcoin.core.BlockStore)">BlockChain</A></B>(<A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params,
+           <A HREF="../../../../com/google/bitcoin/core/Wallet.html" title="class in com.google.bitcoin.core">Wallet</A>&nbsp;wallet,
+           <A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core">BlockStore</A>&nbsp;blockStore)</CODE>

 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Constructs a BlockChain connected to the given wallet and store.</TD>
 </TR>
 </TABLE>
 &nbsp;
@@ -202,7 +203,7 @@ A BlockChain holds a series of <A HREF="../../../../com/google/bitcoin/core/Bloc
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;com.google.bitcoin.core.StoredBlock</CODE></FONT></TD>
+<CODE>&nbsp;<A HREF="../../../../com/google/bitcoin/core/StoredBlock.html" title="class in com.google.bitcoin.core">StoredBlock</A></CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/BlockChain.html#getChainHead()">getChainHead</A></B>()</CODE>

 <BR>
@@ -242,7 +243,7 @@ A BlockChain holds a series of <A HREF="../../../../com/google/bitcoin/core/Bloc
 <A NAME="blockStore"><!-- --></A><H3>
 blockStore</H3>
 <PRE>
-protected com.google.bitcoin.core.BlockStore <B>blockStore</B></PRE>
+protected <A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core">BlockStore</A> <B>blockStore</B></PRE>
 <DL>
 <DD>Keeps a map of block hashes to StoredBlocks.
 <P>
@@ -254,7 +255,7 @@ protected com.google.bitcoin.core.BlockStore <B>blockStore</B></PRE>
 <A NAME="chainHead"><!-- --></A><H3>
 chainHead</H3>
 <PRE>
-protected com.google.bitcoin.core.StoredBlock <B>chainHead</B></PRE>
+protected <A HREF="../../../../com/google/bitcoin/core/StoredBlock.html" title="class in com.google.bitcoin.core">StoredBlock</A> <B>chainHead</B></PRE>
 <DL>
 <DD>Tracks the top of the best known chain.<p>

@@ -297,12 +298,20 @@ protected final <A HREF="../../../../com/google/bitcoin/core/Wallet.html" title=
 </TR>
 </TABLE>

-<A NAME="BlockChain(com.google.bitcoin.core.NetworkParameters, com.google.bitcoin.core.Wallet)"><!-- --></A><H3>
+<A NAME="BlockChain(com.google.bitcoin.core.NetworkParameters, com.google.bitcoin.core.Wallet, com.google.bitcoin.core.BlockStore)"><!-- --></A><H3>
 BlockChain</H3>
 <PRE>
 public <B>BlockChain</B>(<A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params,
-                  <A HREF="../../../../com/google/bitcoin/core/Wallet.html" title="class in com.google.bitcoin.core">Wallet</A>&nbsp;wallet)</PRE>
+                  <A HREF="../../../../com/google/bitcoin/core/Wallet.html" title="class in com.google.bitcoin.core">Wallet</A>&nbsp;wallet,
+                  <A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core">BlockStore</A>&nbsp;blockStore)</PRE>
 <DL>
+<DD>Constructs a BlockChain connected to the given wallet and store. To obtain a <A HREF="../../../../com/google/bitcoin/core/Wallet.html" title="class in com.google.bitcoin.core"><CODE>Wallet</CODE></A> you can construct
+ one from scratch, or you can deserialize a saved wallet from disk using <A HREF="../../../../com/google/bitcoin/core/Wallet.html#loadFromFile(java.io.File)"><CODE>Wallet.loadFromFile(java.io.File)</CODE></A>
+ <p>
+
+ For the store you can use a <A HREF="../../../../com/google/bitcoin/core/MemoryBlockStore.html" title="class in com.google.bitcoin.core"><CODE>MemoryBlockStore</CODE></A> if you don't care about saving the downloaded data, or a
+ <A HREF="../../../../com/google/bitcoin/core/DiskBlockStore.html" title="class in com.google.bitcoin.core"><CODE>DiskBlockStore</CODE></A> if you'd like to ensure fast startup the next time you run the program.
+<P>
 </DL>

 <!-- ============ METHOD DETAIL ========== -->
@@ -338,7 +347,7 @@ public boolean <B>add</B>(<A HREF="../../../../com/google/bitcoin/core/Block.htm
 <A NAME="getChainHead()"><!-- --></A><H3>
 getChainHead</H3>
 <PRE>
-public com.google.bitcoin.core.StoredBlock <B>getChainHead</B>()</PRE>
+public <A HREF="../../../../com/google/bitcoin/core/StoredBlock.html" title="class in com.google.bitcoin.core">StoredBlock</A> <B>getChainHead</B>()</PRE>
 <DL>
 <DD>Returns the block at the head of the current best chain. This is the block which represents the greatest
 amount of cumulative work done.
@@ -390,7 +399,7 @@ public <A HREF="../../../../com/google/bitcoin/core/Block.html" title="class in
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/Block.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/BlockStoreException.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/BlockChain.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="BlockChain.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
--- a/docs/com/google/bitcoin/core/BlockStoreException.html
+++ b/docs/com/google/bitcoin/core/BlockStoreException.html
@@ -0,0 +1,252 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<TITLE>
+BlockStoreException
+</TITLE>
+
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="BlockStoreException";
+    }
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../com/google/bitcoin/core/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/DiskBlockStore.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?com/google/bitcoin/core/BlockStoreException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="BlockStoreException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Throwable">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+com.google.bitcoin.core</FONT>
+<BR>
+Class BlockStoreException</H2>
+<PRE>
+java.lang.Object
+  <IMG SRC="../../../../resources/inherit.gif" ALT="extended by ">java.lang.Throwable
+      <IMG SRC="../../../../resources/inherit.gif" ALT="extended by ">java.lang.Exception
+          <IMG SRC="../../../../resources/inherit.gif" ALT="extended by "><B>com.google.bitcoin.core.BlockStoreException</B>
+</PRE>
+<DL>
+<DT><B>All Implemented Interfaces:</B> <DD>java.io.Serializable</DD>
+</DL>
+<HR>
+<DL>
+<DT><PRE>public class <B>BlockStoreException</B><DT>extends java.lang.Exception</DL>
+</PRE>
+
+<P>
+Thrown when something goes wrong with storing a block. Examples: out of disk space.
+<P>
+
+<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../../../serialized-form.html#com.google.bitcoin.core.BlockStoreException">Serialized Form</A></DL>
+<HR>
+
+<P>
+
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+
+<A NAME="constructor_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Constructor Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/BlockStoreException.html#BlockStoreException(java.lang.String)">BlockStoreException</A></B>(java.lang.String&nbsp;message)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/BlockStoreException.html#BlockStoreException(java.lang.Throwable)">BlockStoreException</A></B>(java.lang.Throwable&nbsp;t)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+</TABLE>
+&nbsp;
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Throwable"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Throwable</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>fillInStackTrace, getCause, getLocalizedMessage, getMessage, getStackTrace, initCause, printStackTrace, printStackTrace, printStackTrace, setStackTrace, toString</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left"><B>Methods inherited from class java.lang.Object</B></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD><CODE>clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+
+<A NAME="constructor_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Constructor Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="BlockStoreException(java.lang.String)"><!-- --></A><H3>
+BlockStoreException</H3>
+<PRE>
+public <B>BlockStoreException</B>(java.lang.String&nbsp;message)</PRE>
+<DL>
+</DL>
+<HR>
+
+<A NAME="BlockStoreException(java.lang.Throwable)"><!-- --></A><H3>
+BlockStoreException</H3>
+<PRE>
+public <B>BlockStoreException</B>(java.lang.Throwable&nbsp;t)</PRE>
+<DL>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../com/google/bitcoin/core/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../index-all.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+</EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/DiskBlockStore.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../../../index.html?com/google/bitcoin/core/BlockStoreException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="BlockStoreException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#methods_inherited_from_class_java.lang.Throwable">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;METHOD</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
--- a/docs/com/google/bitcoin/core/ECKey.html
+++ b/docs/com/google/bitcoin/core/ECKey.html
@@ -51,7 +51,7 @@ function windowTitle()

 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/BlockStoreException.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/DiskBlockStore.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/GetBlocksMessage.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/ECKey.html" target="_top"><B>FRAMES</B></A>  &nbsp;
@@ -184,6 +184,15 @@ Represents an elliptic curve keypair that we own and can use for signing transac
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;byte[]</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/ECKey.html#toASN1()">toASN1</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Output this ECKey as an ASN.1 encoded private key, as understood by OpenSSL or used by the BitCoin reference
+ implementation in its wallet storage format.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;java.lang.String</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/ECKey.html#toString()">toString</A></B>()</CODE>

@@ -279,6 +288,23 @@ public static <A HREF="../../../../com/google/bitcoin/core/ECKey.html" title="cl
 </DL>
 <HR>

+<A NAME="toASN1()"><!-- --></A><H3>
+toASN1</H3>
+<PRE>
+public byte[] <B>toASN1</B>()</PRE>
+<DL>
+<DD>Output this ECKey as an ASN.1 encoded private key, as understood by OpenSSL or used by the BitCoin reference
+ implementation in its wallet storage format.
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
 <A NAME="getPubKeyHash()"><!-- --></A><H3>
 getPubKeyHash</H3>
 <PRE>
@@ -422,7 +448,7 @@ public boolean <B>verify</B>(byte[]&nbsp;data,

 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/BlockStoreException.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/DiskBlockStore.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/GetBlocksMessage.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/ECKey.html" target="_top"><B>FRAMES</B></A>  &nbsp;
--- a/docs/com/google/bitcoin/core/InventoryMessage.html
+++ b/docs/com/google/bitcoin/core/InventoryMessage.html
@@ -52,7 +52,7 @@ function windowTitle()
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/InventoryItem.Type.html" title="enum in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/Message.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/MemoryBlockStore.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/InventoryMessage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="InventoryMessage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -327,7 +327,7 @@ public void <B>bitcoinSerializeToStream</B>(java.io.OutputStream&nbsp;stream)
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/InventoryItem.Type.html" title="enum in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/Message.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/MemoryBlockStore.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/InventoryMessage.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="InventoryMessage.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
--- a/docs/com/google/bitcoin/core/Message.html
+++ b/docs/com/google/bitcoin/core/Message.html
@@ -51,7 +51,7 @@ function windowTitle()

 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/InventoryMessage.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/MemoryBlockStore.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/NetworkConnection.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/Message.html" target="_top"><B>FRAMES</B></A>  &nbsp;
@@ -360,7 +360,7 @@ public byte[] <B>bitcoinSerialize</B>()</PRE>

 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/InventoryMessage.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/MemoryBlockStore.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/NetworkConnection.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/Message.html" target="_top"><B>FRAMES</B></A>  &nbsp;
--- a/docs/com/google/bitcoin/core/NetworkConnection.html
+++ b/docs/com/google/bitcoin/core/NetworkConnection.html
@@ -119,8 +119,9 @@ A NetworkConnection handles talking to a remote BitCoin peer at a low level. It
 <B>Constructor Summary</B></FONT></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/NetworkConnection.html#NetworkConnection(java.net.InetAddress, com.google.bitcoin.core.NetworkParameters)">NetworkConnection</A></B>(java.net.InetAddress&nbsp;remoteIp,
-                  <A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params)</CODE>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/NetworkConnection.html#NetworkConnection(java.net.InetAddress, com.google.bitcoin.core.NetworkParameters, int)">NetworkConnection</A></B>(java.net.InetAddress&nbsp;remoteIp,
+                  <A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params,
+                  int&nbsp;bestHeight)</CODE>

 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Connect to the given IP address using the port specified as part of the network parameters.</TD>
@@ -207,11 +208,12 @@ A NetworkConnection handles talking to a remote BitCoin peer at a low level. It
 </TR>
 </TABLE>

-<A NAME="NetworkConnection(java.net.InetAddress, com.google.bitcoin.core.NetworkParameters)"><!-- --></A><H3>
+<A NAME="NetworkConnection(java.net.InetAddress, com.google.bitcoin.core.NetworkParameters, int)"><!-- --></A><H3>
 NetworkConnection</H3>
 <PRE>
 public <B>NetworkConnection</B>(java.net.InetAddress&nbsp;remoteIp,
-                         <A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params)
+                         <A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params,
+                         int&nbsp;bestHeight)
                  throws java.io.IOException,
                         <A HREF="../../../../com/google/bitcoin/core/ProtocolException.html" title="class in com.google.bitcoin.core">ProtocolException</A></PRE>
 <DL>
@@ -219,7 +221,7 @@ public <B>NetworkConnection</B>(java.net.InetAddress&nbsp;remoteIp,
 is complete a functioning network channel is set up and running.
 <P>
 <DL>
-<DT><B>Parameters:</B><DD><CODE>remoteIp</CODE> - IP address to connect to. IPv6 is not currently supported by BitCoin.<DD><CODE>params</CODE> - Defines which network to connect to and details of the protocol.
+<DT><B>Parameters:</B><DD><CODE>remoteIp</CODE> - IP address to connect to. IPv6 is not currently supported by BitCoin.<DD><CODE>params</CODE> - Defines which network to connect to and details of the protocol.<DD><CODE>bestHeight</CODE> - How many blocks are in our best chain
 <DT><B>Throws:</B>
 <DD><CODE>java.io.IOException</CODE> - if there is a network related failure.
 <DD><CODE><A HREF="../../../../com/google/bitcoin/core/ProtocolException.html" title="class in com.google.bitcoin.core">ProtocolException</A></CODE> - if the version negotiation failed.</DL>
--- a/docs/com/google/bitcoin/core/PeerAddress.html
+++ b/docs/com/google/bitcoin/core/PeerAddress.html
@@ -139,8 +139,9 @@ A PeerAddress holds an IP address and port number representing the network locat
 <B>Constructor Summary</B></FONT></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/PeerAddress.html#PeerAddress(java.net.InetAddress, int)">PeerAddress</A></B>(java.net.InetAddress&nbsp;addr,
-            int&nbsp;port)</CODE>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/PeerAddress.html#PeerAddress(java.net.InetAddress, int, int)">PeerAddress</A></B>(java.net.InetAddress&nbsp;addr,
+            int&nbsp;port,
+            int&nbsp;protocolVersion)</CODE>

 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -236,11 +237,12 @@ public <B>PeerAddress</B>(<A HREF="../../../../com/google/bitcoin/core/NetworkPa
 </DL>
 <HR>

-<A NAME="PeerAddress(java.net.InetAddress, int)"><!-- --></A><H3>
+<A NAME="PeerAddress(java.net.InetAddress, int, int)"><!-- --></A><H3>
 PeerAddress</H3>
 <PRE>
 public <B>PeerAddress</B>(java.net.InetAddress&nbsp;addr,
-                   int&nbsp;port)</PRE>
+                   int&nbsp;port,
+                   int&nbsp;protocolVersion)</PRE>
 <DL>
 </DL>

--- a/docs/com/google/bitcoin/core/ScriptException.html
+++ b/docs/com/google/bitcoin/core/ScriptException.html
@@ -52,7 +52,7 @@ function windowTitle()
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/Script.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/Transaction.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/Sha256Hash.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/ScriptException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="ScriptException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -216,7 +216,7 @@ public <B>ScriptException</B>(java.lang.String&nbsp;msg,
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/Script.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/Transaction.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/Sha256Hash.html" title="class in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/ScriptException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="ScriptException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
--- a/docs/com/google/bitcoin/core/Transaction.SigHash.html
+++ b/docs/com/google/bitcoin/core/Transaction.SigHash.html
@@ -107,10 +107,9 @@ java.lang.Object
 These constants are a part of a scriptSig signature on the inputs. They define the details of how a
 transaction can be redeemed, specifically, they control how the hash of the transaction is calculated.
 
- Note: in the official client, this enum also has another flag, SIGHASH_ANYONECANPAY. In this implementation,
- that's kept separate.
-
- Also note: only SIGHASH_ALL is actually used in the official client today.
+ In the official client, this enum also has another flag, SIGHASH_ANYONECANPAY. In this implementation,
+ that's kept separate. Only SIGHASH_ALL is actually used in the official client today. The other flags
+ exist to allow for distributed contracts.
 <P>

 <P>
--- a/docs/com/google/bitcoin/core/Transaction.html
+++ b/docs/com/google/bitcoin/core/Transaction.html
@@ -51,7 +51,7 @@ function windowTitle()

 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/ScriptException.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/StoredBlock.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/Transaction.SigHash.html" title="enum in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/Transaction.html" target="_top"><B>FRAMES</B></A>  &nbsp;
@@ -219,7 +219,7 @@ A transaction represents the movement of coins from some addresses to some other
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;byte[]</CODE></FONT></TD>
+<CODE>&nbsp;<A HREF="../../../../com/google/bitcoin/core/Sha256Hash.html" title="class in com.google.bitcoin.core">Sha256Hash</A></CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Transaction.html#getHash()">getHash</A></B>()</CODE>

 <BR>
@@ -393,7 +393,7 @@ public java.util.List&lt;<A HREF="../../../../com/google/bitcoin/core/Transactio
 <A NAME="getHash()"><!-- --></A><H3>
 getHash</H3>
 <PRE>
-public byte[] <B>getHash</B>()</PRE>
+public <A HREF="../../../../com/google/bitcoin/core/Sha256Hash.html" title="class in com.google.bitcoin.core">Sha256Hash</A> <B>getHash</B>()</PRE>
 <DL>
 <DD>Returns the transaction hash as you see them in the block explorer.
 <P>
@@ -431,8 +431,7 @@ public java.math.BigInteger <B>getValueSentToMe</B>(<A HREF="../../../../com/goo
 </DL>
 </DD>
 <DD><DL>
-
-<DT><B>Returns:</B><DD>sum in nanocoins</DL>
+</DL>
 </DD>
 </DL>
 <HR>
@@ -652,7 +651,7 @@ public int <B>hashCode</B>()</PRE>

 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/google/bitcoin/core/ScriptException.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/google/bitcoin/core/StoredBlock.html" title="class in com.google.bitcoin.core"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../../com/google/bitcoin/core/Transaction.SigHash.html" title="enum in com.google.bitcoin.core"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
  <A HREF="../../../../index.html?com/google/bitcoin/core/Transaction.html" target="_top"><B>FRAMES</B></A>  &nbsp;
--- a/docs/com/google/bitcoin/core/Utils.html
+++ b/docs/com/google/bitcoin/core/Utils.html
@@ -119,7 +119,7 @@ A collection of various utility methods that are helpful for working with the Bi
 <TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Utils.html#CENT">CENT</A></B></CODE>

 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;How many nanocoins there are in 0.01 BitCoins.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;How many "nanocoins" there are in 0.01 BitCoins.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -127,7 +127,7 @@ A collection of various utility methods that are helpful for working with the Bi
 <TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Utils.html#COIN">COIN</A></B></CODE>

 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;How many nanocoins there are in a BitCoin.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;How many "nanocoins" there are in a BitCoin.</TD>
 </TR>
 </TABLE>
 &nbsp;
@@ -251,6 +251,14 @@ A collection of various utility methods that are helpful for working with the Bi
 <TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Utils.html#toNanoCoins(int, int)">toNanoCoins</A></B>(int&nbsp;coins,
            int&nbsp;cents)</CODE>

+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Convert an amount expressed in the way humans are used to into nanocoins.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>static&nbsp;java.math.BigInteger</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Utils.html#toNanoCoins(java.lang.String)">toNanoCoins</A></B>(java.lang.String&nbsp;coins)</CODE>
+
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Convert an amount expressed in the way humans are used to into nanocoins.</TD>
 </TR>
@@ -320,7 +328,11 @@ COIN</H3>
 <PRE>
 public static final java.math.BigInteger <B>COIN</B></PRE>
 <DL>
-<DD>How many nanocoins there are in a BitCoin.
+<DD>How many "nanocoins" there are in a BitCoin.
+
+ A nanocoin is the smallest unit that can be transferred using BitCoin.
+ The term nanocoin is very misleading, though, because there are only 100 million
+ of them in a coin (whereas one would expect 1 billion.
 <P>
 <DL>
 </DL>
@@ -332,7 +344,11 @@ CENT</H3>
 <PRE>
 public static final java.math.BigInteger <B>CENT</B></PRE>
 <DL>
-<DD>How many nanocoins there are in 0.01 BitCoins.
+<DD>How many "nanocoins" there are in 0.01 BitCoins.
+
+ A nanocoin is the smallest unit that can be transferred using BitCoin.
+ The term nanocoin is very misleading, though, because there are only 100 million
+ of them in a coin (whereas one would expect 1 billion).
 <P>
 <DL>
 </DL>
@@ -379,6 +395,24 @@ public static java.math.BigInteger <B>toNanoCoins</B>(int&nbsp;coins,
 </DL>
 <HR>

+<A NAME="toNanoCoins(java.lang.String)"><!-- --></A><H3>
+toNanoCoins</H3>
+<PRE>
+public static java.math.BigInteger <B>toNanoCoins</B>(java.lang.String&nbsp;coins)</PRE>
+<DL>
+<DD>Convert an amount expressed in the way humans are used to into nanocoins.<p>
+
+ This takes string in a format understood by <CODE>BigDecimal.BigDecimal(String)</CODE>,
+ for example "0", "1", "0.10", "1.23E3", "1234.5E-5".
+<P>
+<DD><DL>
+
+<DT><B>Throws:</B>
+<DD><CODE>java.lang.ArithmeticException</CODE> - if you try to specify fractional nanocoins</DL>
+</DD>
+</DL>
+<HR>
+
 <A NAME="uint32ToByteArrayBE(long, byte[], int)"><!-- --></A><H3>
 uint32ToByteArrayBE</H3>
 <PRE>
--- a/docs/com/google/bitcoin/core/VersionMessage.html
+++ b/docs/com/google/bitcoin/core/VersionMessage.html
@@ -198,14 +198,15 @@ java.lang.Object
 <B>Constructor Summary</B></FONT></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/VersionMessage.html#VersionMessage(com.google.bitcoin.core.NetworkParameters)">VersionMessage</A></B>(<A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params)</CODE>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/VersionMessage.html#VersionMessage(com.google.bitcoin.core.NetworkParameters, byte[])">VersionMessage</A></B>(<A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params,
+               byte[]&nbsp;msg)</CODE>

 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/VersionMessage.html#VersionMessage(com.google.bitcoin.core.NetworkParameters, byte[])">VersionMessage</A></B>(<A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params,
-               byte[]&nbsp;msg)</CODE>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/VersionMessage.html#VersionMessage(com.google.bitcoin.core.NetworkParameters, int)">VersionMessage</A></B>(<A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params,
+               int&nbsp;newBestHeight)</CODE>

 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
@@ -397,10 +398,11 @@ public <B>VersionMessage</B>(<A HREF="../../../../com/google/bitcoin/core/Networ
 </DL>
 <HR>

-<A NAME="VersionMessage(com.google.bitcoin.core.NetworkParameters)"><!-- --></A><H3>
+<A NAME="VersionMessage(com.google.bitcoin.core.NetworkParameters, int)"><!-- --></A><H3>
 VersionMessage</H3>
 <PRE>
-public <B>VersionMessage</B>(<A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params)</PRE>
+public <B>VersionMessage</B>(<A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core">NetworkParameters</A>&nbsp;params,
+                      int&nbsp;newBestHeight)</PRE>
 <DL>
 </DL>

--- a/docs/com/google/bitcoin/core/Wallet.html
+++ b/docs/com/google/bitcoin/core/Wallet.html
@@ -131,14 +131,6 @@ A Wallet stores keys and a record of transactions that have not yet been spent.
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A list of public/private EC keys owned by this user.</TD>
 </TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.ArrayList&lt;<A HREF="../../../../com/google/bitcoin/core/Transaction.html" title="class in com.google.bitcoin.core">Transaction</A>&gt;</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Wallet.html#unspent">unspent</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A list of transactions with outputs we can spend.</TD>
-</TR>
 </TABLE>
 &nbsp;
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -191,11 +183,43 @@ A Wallet stores keys and a record of transactions that have not yet been spent.
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../../../com/google/bitcoin/core/ECKey.html" title="class in com.google.bitcoin.core">ECKey</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Wallet.html#findKeyFromPubKey(byte[])">findKeyFromPubKey</A></B>(byte[]&nbsp;pubkey)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Locates a keypair from the keychain given the raw public key bytes.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;java.math.BigInteger</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Wallet.html#getBalance()">getBalance</A></B>()</CODE>

 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the balance of this wallet in nanocoins by summing up all unspent outputs that were sent to us.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns the balance of this wallet by summing up all unspent outputs that were sent to us.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.util.Collection&lt;<A HREF="../../../../com/google/bitcoin/core/Transaction.html" title="class in com.google.bitcoin.core">Transaction</A>&gt;</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Wallet.html#getPendingTransactions()">getPendingTransactions</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns an immutable view of the transactions currently waiting for network confirmations.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Wallet.html#isPubKeyHashMine(byte[])">isPubKeyHashMine</A></B>(byte[]&nbsp;pubkeyHash)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns true if this wallet contains a public key which hashes to the given hash.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../com/google/bitcoin/core/Wallet.html#isPubKeyMine(byte[])">isPubKeyMine</A></B>(byte[]&nbsp;pubkey)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns true if this wallet contains a keypair with the given public key.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -263,21 +287,6 @@ A Wallet stores keys and a record of transactions that have not yet been spent.
 </TR>
 </TABLE>

-<A NAME="unspent"><!-- --></A><H3>
-unspent</H3>
-<PRE>
-public final java.util.ArrayList&lt;<A HREF="../../../../com/google/bitcoin/core/Transaction.html" title="class in com.google.bitcoin.core">Transaction</A>&gt; <B>unspent</B></PRE>
-<DL>
-<DD>A list of transactions with outputs we can spend. Note that some of these transactions may be partially spent,
- that is, they have outputs some of which are redeemed and others which aren't already. The spentness of each
- output is tracked in the TransactionOutput object. The value of all unspent outputs is the balance of the
- wallet.
-<P>
-<DL>
-</DL>
-</DL>
-<HR>
-
 <A NAME="keychain"><!-- --></A><H3>
 keychain</H3>
 <PRE>
@@ -452,12 +461,61 @@ public <A HREF="../../../../com/google/bitcoin/core/ECKey.html" title="class in
 </DL>
 <HR>

+<A NAME="isPubKeyHashMine(byte[])"><!-- --></A><H3>
+isPubKeyHashMine</H3>
+<PRE>
+public boolean <B>isPubKeyHashMine</B>(byte[]&nbsp;pubkeyHash)</PRE>
+<DL>
+<DD>Returns true if this wallet contains a public key which hashes to the given hash.
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="findKeyFromPubKey(byte[])"><!-- --></A><H3>
+findKeyFromPubKey</H3>
+<PRE>
+public <A HREF="../../../../com/google/bitcoin/core/ECKey.html" title="class in com.google.bitcoin.core">ECKey</A> <B>findKeyFromPubKey</B>(byte[]&nbsp;pubkey)</PRE>
+<DL>
+<DD>Locates a keypair from the keychain given the raw public key bytes.
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+
+<DT><B>Returns:</B><DD>ECKey or null if no such key was found.</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="isPubKeyMine(byte[])"><!-- --></A><H3>
+isPubKeyMine</H3>
+<PRE>
+public boolean <B>isPubKeyMine</B>(byte[]&nbsp;pubkey)</PRE>
+<DL>
+<DD>Returns true if this wallet contains a keypair with the given public key.
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
 <A NAME="getBalance()"><!-- --></A><H3>
 getBalance</H3>
 <PRE>
 public java.math.BigInteger <B>getBalance</B>()</PRE>
 <DL>
-<DD>Returns the balance of this wallet in nanocoins by summing up all unspent outputs that were sent to us.
+<DD>Returns the balance of this wallet by summing up all unspent outputs that were sent to us.
 <P>
 <DD><DL>
 </DL>
@@ -480,6 +538,22 @@ public java.lang.String <B>toString</B>()</PRE>
 </DL>
 </DD>
 </DL>
+<HR>
+
+<A NAME="getPendingTransactions()"><!-- --></A><H3>
+getPendingTransactions</H3>
+<PRE>
+public java.util.Collection&lt;<A HREF="../../../../com/google/bitcoin/core/Transaction.html" title="class in com.google.bitcoin.core">Transaction</A>&gt; <B>getPendingTransactions</B>()</PRE>
+<DL>
+<DD>Returns an immutable view of the transactions currently waiting for network confirmations.
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+</DD>
+</DL>
 <!-- ========= END OF CLASS DATA ========= -->
 <HR>

--- a/docs/com/google/bitcoin/core/package-frame.html
+++ b/docs/com/google/bitcoin/core/package-frame.html
@@ -15,6 +15,17 @@ com.google.bitcoin.core
 <BODY BGCOLOR="white">
 <FONT size="+1" CLASS="FrameTitleFont">
 <A HREF="../../../../com/google/bitcoin/core/package-summary.html" target="classFrame">com.google.bitcoin.core</A></FONT>
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
+Interfaces</FONT>&nbsp;
+<FONT CLASS="FrameItemFont">
+<BR>
+<A HREF="BlockStore.html" title="interface in com.google.bitcoin.core" target="classFrame"><I>BlockStore</I></A></FONT></TD>
+</TR>
+</TABLE>
+
+
 <TABLE BORDER="0" WIDTH="100%" SUMMARY="">
 <TR>
 <TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
@@ -31,6 +42,8 @@ Classes</FONT>&nbsp;
 <BR>
 <A HREF="BlockChain.html" title="class in com.google.bitcoin.core" target="classFrame">BlockChain</A>
 <BR>
+<A HREF="DiskBlockStore.html" title="class in com.google.bitcoin.core" target="classFrame">DiskBlockStore</A>
+<BR>
 <A HREF="ECKey.html" title="class in com.google.bitcoin.core" target="classFrame">ECKey</A>
 <BR>
 <A HREF="GetBlocksMessage.html" title="class in com.google.bitcoin.core" target="classFrame">GetBlocksMessage</A>
@@ -41,6 +54,8 @@ Classes</FONT>&nbsp;
 <BR>
 <A HREF="InventoryMessage.html" title="class in com.google.bitcoin.core" target="classFrame">InventoryMessage</A>
 <BR>
+<A HREF="MemoryBlockStore.html" title="class in com.google.bitcoin.core" target="classFrame">MemoryBlockStore</A>
+<BR>
 <A HREF="Message.html" title="class in com.google.bitcoin.core" target="classFrame">Message</A>
 <BR>
 <A HREF="NetworkConnection.html" title="class in com.google.bitcoin.core" target="classFrame">NetworkConnection</A>
@@ -53,6 +68,10 @@ Classes</FONT>&nbsp;
 <BR>
 <A HREF="Script.html" title="class in com.google.bitcoin.core" target="classFrame">Script</A>
 <BR>
+<A HREF="Sha256Hash.html" title="class in com.google.bitcoin.core" target="classFrame">Sha256Hash</A>
+<BR>
+<A HREF="StoredBlock.html" title="class in com.google.bitcoin.core" target="classFrame">StoredBlock</A>
+<BR>
 <A HREF="Transaction.html" title="class in com.google.bitcoin.core" target="classFrame">Transaction</A>
 <BR>
 <A HREF="TransactionInput.html" title="class in com.google.bitcoin.core" target="classFrame">TransactionInput</A>
--- a/docs/com/google/bitcoin/core/package-summary.html
+++ b/docs/com/google/bitcoin/core/package-summary.html
@@ -79,6 +79,20 @@ function windowTitle()
 Package com.google.bitcoin.core
 </H2>

+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Interface Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core">BlockStore</A></B></TD>
+<TD>An implementor of BlockStore saves StoredBlock objects to disk.</TD>
+</TR>
+</TABLE>
+&nbsp;
+
+<P>
+
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
 <TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
@@ -106,6 +120,10 @@ Package com.google.bitcoin.core
 chain follows the rules of the <A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core"><CODE>NetworkParameters</CODE></A> for this chain.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../../com/google/bitcoin/core/DiskBlockStore.html" title="class in com.google.bitcoin.core">DiskBlockStore</A></B></TD>
+<TD>Stores the block chain to disk but still holds it in memory.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../../com/google/bitcoin/core/ECKey.html" title="class in com.google.bitcoin.core">ECKey</A></B></TD>
 <TD>Represents an elliptic curve keypair that we own and can use for signing transactions.</TD>
 </TR>
@@ -126,6 +144,10 @@ Package com.google.bitcoin.core
 <TD>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../../com/google/bitcoin/core/MemoryBlockStore.html" title="class in com.google.bitcoin.core">MemoryBlockStore</A></B></TD>
+<TD>Keeps <A HREF="../../../../com/google/bitcoin/core/StoredBlock.html" title="class in com.google.bitcoin.core"><CODE>StoredBlock</CODE></A>s in memory.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../../com/google/bitcoin/core/Message.html" title="class in com.google.bitcoin.core">Message</A></B></TD>
 <TD>A Message is a data structure that can be serialized/deserialized using both the BitCoin proprietary serialization
 format and built-in Java object serialization.</TD>
@@ -152,6 +174,16 @@ Package com.google.bitcoin.core
 <TD>BitCoin transactions don't specify what they do directly.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../../com/google/bitcoin/core/Sha256Hash.html" title="class in com.google.bitcoin.core">Sha256Hash</A></B></TD>
+<TD>A Sha256Hash just wraps a byte[] so that equals and hashcode work correctly, allowing it to be used as keys in a
+ map.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../../com/google/bitcoin/core/StoredBlock.html" title="class in com.google.bitcoin.core">StoredBlock</A></B></TD>
+<TD>Wraps a <A HREF="../../../../com/google/bitcoin/core/Block.html" title="class in com.google.bitcoin.core"><CODE>Block</CODE></A> object with extra data that can be derived from the block chain but is slow or inconvenient to
+ calculate.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../../com/google/bitcoin/core/Transaction.html" title="class in com.google.bitcoin.core">Transaction</A></B></TD>
 <TD>A transaction represents the movement of coins from some addresses to some other addresses.</TD>
 </TR>
--- a/docs/com/google/bitcoin/core/package-tree.html
+++ b/docs/com/google/bitcoin/core/package-tree.html
@@ -85,8 +85,10 @@ Class Hierarchy
 </H2>
 <UL>
 <LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Address.html" title="class in com.google.bitcoin.core"><B>Address</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Base58.html" title="class in com.google.bitcoin.core"><B>Base58</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/BlockChain.html" title="class in com.google.bitcoin.core"><B>BlockChain</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/ECKey.html" title="class in com.google.bitcoin.core"><B>ECKey</B></A> (implements java.io.Serializable)
-<LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/InventoryItem.html" title="class in com.google.bitcoin.core"><B>InventoryItem</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Message.html" title="class in com.google.bitcoin.core"><B>Message</B></A> (implements java.io.Serializable)
+<LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Address.html" title="class in com.google.bitcoin.core"><B>Address</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Base58.html" title="class in com.google.bitcoin.core"><B>Base58</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/BlockChain.html" title="class in com.google.bitcoin.core"><B>BlockChain</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/DiskBlockStore.html" title="class in com.google.bitcoin.core"><B>DiskBlockStore</B></A> (implements com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core">BlockStore</A>)
+<LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/ECKey.html" title="class in com.google.bitcoin.core"><B>ECKey</B></A> (implements java.io.Serializable)
+<LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/InventoryItem.html" title="class in com.google.bitcoin.core"><B>InventoryItem</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/MemoryBlockStore.html" title="class in com.google.bitcoin.core"><B>MemoryBlockStore</B></A> (implements com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core">BlockStore</A>)
+<LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Message.html" title="class in com.google.bitcoin.core"><B>Message</B></A> (implements java.io.Serializable)
 <UL>
 <LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/AddressMessage.html" title="class in com.google.bitcoin.core"><B>AddressMessage</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Block.html" title="class in com.google.bitcoin.core"><B>Block</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/GetBlocksMessage.html" title="class in com.google.bitcoin.core"><B>GetBlocksMessage</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/GetDataMessage.html" title="class in com.google.bitcoin.core"><B>GetDataMessage</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/InventoryMessage.html" title="class in com.google.bitcoin.core"><B>InventoryMessage</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/PeerAddress.html" title="class in com.google.bitcoin.core"><B>PeerAddress</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Transaction.html" title="class in com.google.bitcoin.core"><B>Transaction</B></A> (implements java.io.Serializable)
 <LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/TransactionInput.html" title="class in com.google.bitcoin.core"><B>TransactionInput</B></A> (implements java.io.Serializable)
@@ -94,7 +96,9 @@ Class Hierarchy
 <LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/TransactionOutput.html" title="class in com.google.bitcoin.core"><B>TransactionOutput</B></A> (implements java.io.Serializable)
 <LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/UnknownMessage.html" title="class in com.google.bitcoin.core"><B>UnknownMessage</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/VersionMessage.html" title="class in com.google.bitcoin.core"><B>VersionMessage</B></A></UL>
 <LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/NetworkConnection.html" title="class in com.google.bitcoin.core"><B>NetworkConnection</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/NetworkParameters.html" title="class in com.google.bitcoin.core"><B>NetworkParameters</B></A> (implements java.io.Serializable)
-<LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Peer.html" title="class in com.google.bitcoin.core"><B>Peer</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Script.html" title="class in com.google.bitcoin.core"><B>Script</B></A><LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable)
+<LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Peer.html" title="class in com.google.bitcoin.core"><B>Peer</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Script.html" title="class in com.google.bitcoin.core"><B>Script</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/Sha256Hash.html" title="class in com.google.bitcoin.core"><B>Sha256Hash</B></A> (implements java.io.Serializable)
+<LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/StoredBlock.html" title="class in com.google.bitcoin.core"><B>StoredBlock</B></A> (implements java.io.Serializable)
+<LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable)
 <UL>
 <LI TYPE="circle">java.lang.Exception<UL>
 <LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/AddressFormatException.html" title="class in com.google.bitcoin.core"><B>AddressFormatException</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/BlockStoreException.html" title="class in com.google.bitcoin.core"><B>BlockStoreException</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/ProtocolException.html" title="class in com.google.bitcoin.core"><B>ProtocolException</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/ScriptException.html" title="class in com.google.bitcoin.core"><B>ScriptException</B></A><LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/VerificationException.html" title="class in com.google.bitcoin.core"><B>VerificationException</B></A></UL>
@@ -103,6 +107,11 @@ Class Hierarchy
 <LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/WalletEventListener.html" title="class in com.google.bitcoin.core"><B>WalletEventListener</B></A></UL>
 </UL>
 <H2>
+Interface Hierarchy
+</H2>
+<UL>
+<LI TYPE="circle">com.google.bitcoin.core.<A HREF="../../../../com/google/bitcoin/core/BlockStore.html" title="interface in com.google.bitcoin.core"><B>BlockStore</B></A></UL>
+<H2>
 Enum Hierarchy
 </H2>
 <UL>