changeset 29718:25308e277565

Merge branch 'segwit2x' into 2017_2m_blocksize_v2
author Jeff Garzik <jeff@bloq.com>
date Sun, 04 Jun 2017 21:53:42 -0400
parents 3fbd0346a52d c2d7f282dfbe
children a8ede95eb427
files
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CONTRIBUTING.md	Mon May 29 00:14:47 2017 -0400
+++ b/CONTRIBUTING.md	Sun Jun 04 21:53:42 2017 -0400
@@ -1,7 +1,7 @@
-Contributing to Bitcoin Core
-============================
+Contributing to btc1
+====================
 
-The Bitcoin Core project operates an open contributor model where anyone is
+The btc1 project operates an open contributor model where anyone is
 welcome to contribute towards development in the form of peer review, testing
 and patches. This document explains the practical process and guidelines for
 contributing.
@@ -14,6 +14,11 @@
 merging pull requests as well as a "lead maintainer" who is responsible for the
 release cycle, overall merging, moderation and appointment of maintainers.
 
+Filing Issues
+-------------
+Issues are primarily for btc1 members.   Non-members' issues will normally be closed automatically, as a matter of policy.
+
+Issues are not intended as a generalized free support avenue.
 
 Contributor Workflow
 --------------------
--- a/src/bitcoin-tx.cpp	Mon May 29 00:14:47 2017 -0400
+++ b/src/bitcoin-tx.cpp	Sun Jun 04 21:53:42 2017 -0400
@@ -218,7 +218,7 @@
     uint256 txid(uint256S(strTxid));
 
     static const unsigned int minTxOutSz = 9;
-    static const unsigned int maxVout = MAX_BLOCK_BASE_SIZE / minTxOutSz;
+    static const unsigned int maxVout = MAX_TX_BASE_SIZE / minTxOutSz;
 
     // extract and validate vout
     std::string strVout = vStrInputParts[1];