aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/release-process.txt55
-rw-r--r--src/bitcoinrpc.cpp8
2 files changed, 51 insertions, 12 deletions
diff --git a/doc/release-process.txt b/doc/release-process.txt
index 2e8b93e11b..ff00b121fc 100644
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -23,17 +23,26 @@
* perform gitian builds
- * From the bitcoin source dir
- $ cd ../gitian-builder
- $ ./bin/gbuild --commit bitcoin=v0.3.23 ../bitcoin/contrib/gitian.yml
- $ ./bin/gbuild --commit bitcoin=v0.3.23 ../bitcoin/contrib/gitian-win32.yml
+ * From a directory containing the bitcoin source, gitian-builder and bitcoin-gitian-sigs
+ $ export VERSION=0.3.23
+ $ cd ./gitian-builder
+ $ ./bin/gbuild --commit bitcoin=v$VERSION ../bitcoin/contrib/gitian-descriptors/gitian.yml
+ $ ./bin/gsign --signer (your gitian key, ie bluematt, sipa, etc) --release $VERSION --destination ../bitcoin-gitian-sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml
+ $ cd build/out
+ $ zip bitcoin-$VERSION-linux-gitian.zip *
+ $ mv bitcoin-$VERSION-linux-gitian.zip ../../
+ $ ./bin/gbuild --commit bitcoin=v$VERSION ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
+ $ ./bin/gsign --signer (your gitian key, ie bluematt, sipa, etc) --release $VERSION-win32 --destination ../bitcoin-gitian-sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
+ $ cd build/out
+ $ zip bitcoin-$VERSION-win32-gitian.zip *
+ $ mv bitcoin-$VERSION-win32-gitian.zip ../../
Build output expected:
- 1. linux 32-bit and 64-bit binaries + source
- 2. windows 32-bit binary + source
- 3. windows installer
+ 1. linux 32-bit and 64-bit binaries + source (bitcoin-$VERSION-linux-gitian.zip)
+ 2. windows 32-bit binary, installer + source (bitcoin-$VERSION-win32-gitian.zip)
+ 3. Gitian signatures (in bitcoin-gitian-sigs/$VERSION[-win32]/(your gitian key)/
-* repackage gitian builds:
+* repackage gitian builds for release as stand-alone zip/tar/installer exe
* Windows .zip and setup.exe:
$ mkdir bitcoin-$VERSION-win32
@@ -66,4 +75,34 @@
* update wiki download links
+* release gitian-signed gitian archives
+
+ * Collect enough gitian signatures to meet minimum_weight (see contrib/gitian-downloader/*-download-config)
+
+ * From a directory containing bitcoin source, bitcoin-gitian-sigs and gitian zips
+ $ export VERSION=0.3.23
+ $ mkdir bitcoin-$VERSION-win32-gitian; cd bitcoin-$VERSION-win32-gitian
+ $ unzip ../bitcoin-$VERSION-win32-gitian.zip
+ $ mkdir gitian
+ $ cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
+ $ for file in `ls ../bitcoin-gitian-sigs/$VERSION-win32/`; do
+ $ cp ../bitcoin-gitian-sigs/$VERSION-win32/$file/bitcoin-build.assert ./gitian/$file-build.assert
+ $ cp ../bitcoin-gitian-sigs/$VERSION-win32/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig
+ $ done
+ $ zip bitcoin-$VERSION-win32-gitian.zip *
+ $ cp bitcoin-$VERSION-win32-gitian.zip ../
+ $ cd ..
+ $ mkdir bitcoin-$VERSION-linux-gitian; cd bitcoin-$VERSION-linux-gitian
+ $ unzip ../bitcoin-$VERSION-linux-gitian.zip
+ $ mkdir gitian
+ $ cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
+ $ for file in `ls ../bitcoin-gitian-sigs/$VERSION/`; do
+ $ cp ../bitcoin-gitian-sigs/$VERSION/$file/bitcoin-build.assert ./gitian/$file-build.assert
+ $ cp ../bitcoin-gitian-sigs/$VERSION/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig
+ $ done
+ $ zip bitcoin-$VERSION-linux-gitian.zip *
+ $ cp bitcoin-$VERSION-linux-gitian.zip ../
+
+ * Upload gitian zips to SF
+
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 37d1839bba..c26ba55d81 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1480,9 +1480,9 @@ Value getwork(const Array& params, bool fHelp)
throw runtime_error(
"getwork [data]\n"
"If [data] is not specified, returns formatted hash data to work on:\n"
- " \"midstate\" : precomputed hash state after hashing the first half of the data\n"
+ " \"midstate\" : precomputed hash state after hashing the first half of the data (DEPRECATED)\n" // deprecated
" \"data\" : block data\n"
- " \"hash1\" : formatted hash buffer for second hash\n"
+ " \"hash1\" : formatted hash buffer for second hash (DEPRECATED)\n" // deprecated
" \"target\" : little endian hash target\n"
"If [data] is specified, tries to solve the block and returns true if it was successful.");
@@ -1546,9 +1546,9 @@ Value getwork(const Array& params, bool fHelp)
uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
Object result;
- result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate))));
+ result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate)))); // deprecated
result.push_back(Pair("data", HexStr(BEGIN(pdata), END(pdata))));
- result.push_back(Pair("hash1", HexStr(BEGIN(phash1), END(phash1))));
+ result.push_back(Pair("hash1", HexStr(BEGIN(phash1), END(phash1)))); // deprecated
result.push_back(Pair("target", HexStr(BEGIN(hashTarget), END(hashTarget))));
return result;
}