GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge ElementsProject/elements#1040: regtest: change network magic away from liquid v1

Browse source 
e57b4c51ad regtest: change network magic away from liquid v1 (Andrew Poelstra)

Pull request description:

  We don't want connectivity issues between Liquid and custom test networks.

ACKs for top commit:
  stevenroose:
    ACK e57b4c51ad

Tree-SHA512: 3ddd626496d7877551c41b089932784bcb752962089fd3e6baa5e9ea6acac44b1b4c5c915b061892b712849d12455fae00347885cecb0e0a3b59a134d91d4014
This commit is contained in:
Andrew Poelstra 2021-09-15 22:36:20 +00:00
commit bc0494cc39
No known key found for this signature in database
GPG key ID: C588D63CE41B97C1
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/chainparams.cpp
View file

@ -658,7 +658,7 @@ class CCustomParams : public CRegTestParams {
assert(IsHex(extprvprefix) && extprvprefix.size() == 8 && "-extprvkeyprefix must be hex string of length 8");
base58Prefixes[EXT_SECRET_KEY] = ParseHex(extprvprefix);
const std::string magic_str = args.GetArg("-pchmessagestart", "FABFB5DA");
const std::string magic_str = args.GetArg("-pchmessagestart", "5319F20E");
assert(IsHex(magic_str) && magic_str.size() == 8 && "-pchmessagestart must be hex string of length 8");
const std::vector<unsigned char> magic_byte = ParseHex(magic_str);
std::copy(begin(magic_byte), end(magic_byte), pchMessageStart);

1
src/test/fuzz/FuzzedDataProvider.h
View file

@ -13,6 +13,7 @@
#ifndef LLVM_FUZZER_FUZZED_DATA_PROVIDER_H_
#define LLVM_FUZZER_FUZZED_DATA_PROVIDER_H_
#include <limits>
#include <algorithm>
#include <climits>
#include <cstddef>

2
test/functional/test_framework/p2p.py
View file

@ -114,7 +114,7 @@ MAGIC_BYTES = {
"testnet3": b"\x0b\x11\x09\x07", # testnet3
"regtest": b"\xfa\xbf\xb5\xda", # regtest
"signet": b"\x0a\x03\xcf\x40", # signet
"elementsregtest": b"\xfa\xbf\xb5\xda",
"elementsregtest": b"\x53\x19\xf2\x0e",
}