Skip to content

Commit

Permalink
Merge pull request bitcoin#3 from sickpig/update-anti-reply-magic-value
Browse files Browse the repository at this point in the history
Update anti reply magic value
  • Loading branch information
gandrewstone committed Jul 21, 2017
2 parents f6ec952 + 30ffc3b commit fa86efa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion qa/rpc-tests/buip055.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
logging.basicConfig(format='%(asctime)s.%(levelname)s: %(message)s', level=logging.INFO)


invalidOpReturn = hexlify(b'peer2peer cash requires larger blocks')
invalidOpReturn = hexlify(b'Bitcoin: A Peer-to-Peer Electronic Cash System')

def bitcoinAddress2bin(btcAddress):
"""convert a bitcoin address to binary data capable of being put in a CScript"""
Expand Down
7 changes: 6 additions & 1 deletion src/buip055fork.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@
#include <queue>

const int REQ_6_1_SUNSET_HEIGHT = 530000;
std::vector<unsigned char> invalidOpReturn = {112, 101, 101, 114, 50, 112, 101, 101, 114, 32, 99, 97, 115, 104, 32, 114, 101, 113, 117, 105, 114, 101, 115, 32, 108, 97, 114, 103, 101, 114, 32, 98, 108, 111, 99, 107, 115};

static const std::string ANTI_REPLAY_MAGIC_VALUE = "Bitcoin: A Peer-to-Peer Electronic Cash System";

std::vector<unsigned char> invalidOpReturn =
std::vector<unsigned char>(std::begin(ANTI_REPLAY_MAGIC_VALUE), std::end(ANTI_REPLAY_MAGIC_VALUE));


bool UpdateBUIP055Globals(CBlockIndex *activeTip)
{
Expand Down

0 comments on commit fa86efa

Please sign in to comment.