aboutsummaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-02-03 13:12:40 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-02-03 13:12:44 +0100
commitfcf646c9b08e7f846d6c99314f937ace50809d7a (patch)
tree0b105ce721266dd4f00795d006b72e5233739385 /src/script
parente5f1f5a26399c7d36fa8e2c29ec411eea49b0a4c (diff)
parent44e9a6b22e472971aebf647f4386fb5a4436a0e3 (diff)
downloadbitcoin-fcf646c9b08e7f846d6c99314f937ace50809d7a.tar.xz
Merge pull request #5286
44e9a6b Update the 'test_IsStandard' unit test (Flavien Charlon) a930658 Change the default maximum OP_RETURN size to 80 bytes (Flavien Charlon)
Diffstat (limited to 'src/script')
-rw-r--r--src/script/standard.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/standard.h b/src/script/standard.h
index 92e2c27c13..a8b0acc981 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -25,7 +25,7 @@ public:
CScriptID(const uint160& in) : uint160(in) {}
};
-static const unsigned int MAX_OP_RETURN_RELAY = 40; //! bytes
+static const unsigned int MAX_OP_RETURN_RELAY = 80; //! bytes
extern unsigned nMaxDatacarrierBytes;
/**