diff --git a/contrib/fedpeg/constants.py b/contrib/fedpeg/constants.py index 51996c4020..e7f84ed7f7 100755 --- a/contrib/fedpeg/constants.py +++ b/contrib/fedpeg/constants.py @@ -7,8 +7,8 @@ class FedpegConstants: sidechain_url = "http://user:pass@127.0.0.1:4241" bitcoin_url = "http://user:pass@127.0.0.1:18332" - redeem_script = "53210300ce2bc14b316474085b4037d126e948042d625f15502c7c9fab01a1a219e79b21021df31471281d4478df85bfce08a10aab82601dca949a79950f8ddf7002bd915a2103b426a9d88f3116fb4beeb4ccadaca9a52071cb8745c469c7b06a9141f9d54b3021023f37702bbe29dccba705cbb38fcdc3b1c19671693fdd3d84707d738a4625598d2103f08409b15dc6cc051b8a640d14c90eee98312d56d1fd4032408d12646acb73b255ae" - redeem_script_address = "2N3cy1E6jX1penE8QVsV1piyikvooib4ZCA" + redeem_script = "55210269992fb441ae56968e5b77d46a3e53b69f136444ae65a94041fc937bdb28d93321021df31471281d4478df85bfce08a10aab82601dca949a79950f8ddf7002bd915a2102174c82021492c2c6dfcbfa4187d10d38bed06afb7fdcd72c880179fddd641ea121033f96e43d72c33327b6a4631ccaa6ea07f0b106c88b9dc71c9000bb6044d5e88a210313d8748790f2a86fb524579b46ce3c68fedd58d2a738716249a9f7d5458a15c221030b632eeb079eb83648886122a04c7bf6d98ab5dfb94cf353ee3e9382a4c2fab02102fb54a7fcaa73c307cfd70f3fa66a2e4247a71858ca731396343ad30c7c4009ce57ae" + redeem_script_address = "2N353JioQVxQPpCmeidjsb8kRX28TYXtBtc" secondScriptPubKeyHash = "9eac001049d5c38ece8996485418421f4a01e2d7" blocksigning_private_key = "FILL_ME_IN" @@ -23,7 +23,7 @@ class FedpegConstants: #Testnet: #bitcoin_genesis_hash = "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943" - nodes = ["127.0.0.1"] + nodes =["WARREN", "GWILLEN", "LUKE-JR/WIZKID", "MAAKU", "APOELSTRA", "MATT", "GMAXWELL"] my_node = "FILL_ME_IN" # Set this to non-None if you're using a proxy (eg for Tor) diff --git a/contrib/fedpeg/withdrawwatch.py b/contrib/fedpeg/withdrawwatch.py index b5ce21b6ff..a47ff38607 100755 --- a/contrib/fedpeg/withdrawwatch.py +++ b/contrib/fedpeg/withdrawwatch.py @@ -579,7 +579,7 @@ try: print("Step 2. Bitcoin blockchain scan for withdraws completed and coins to functionaries...") bitcoin_block_count = bitcoin[thread_id()].getblockcount() - process_confirmed_bitcoin_blockchain(1, bitcoin_block_count - 5) + process_confirmed_bitcoin_blockchain(447000, bitcoin_block_count - 5) print("done") sys.stdout.write("Step 3. Bitcoin blockchain rescan to load functionary outputs in wallet...") diff --git a/contrib/sidechain-manipulation.py b/contrib/sidechain-manipulation.py index d6c16a0ca2..03d268fce5 100755 --- a/contrib/sidechain-manipulation.py +++ b/contrib/sidechain-manipulation.py @@ -6,10 +6,10 @@ from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException from decimal import * # VARIOUS SETTINGS... -sidechain_url = "http://user:pass@127.0.0.1:14241" +sidechain_url = "http://user:pass@127.0.0.1:4241" bitcoin_url = "http://user:pass@127.0.0.1:18332" -redeem_script = "512103a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd51ae" +redeem_script = "55210269992fb441ae56968e5b77d46a3e53b69f136444ae65a94041fc937bdb28d93321021df31471281d4478df85bfce08a10aab82601dca949a79950f8ddf7002bd915a2102174c82021492c2c6dfcbfa4187d10d38bed06afb7fdcd72c880179fddd641ea121033f96e43d72c33327b6a4631ccaa6ea07f0b106c88b9dc71c9000bb6044d5e88a210313d8748790f2a86fb524579b46ce3c68fedd58d2a738716249a9f7d5458a15c221030b632eeb079eb83648886122a04c7bf6d98ab5dfb94cf353ee3e9382a4c2fab02102fb54a7fcaa73c307cfd70f3fa66a2e4247a71858ca731396343ad30c7c4009ce57ae" secondScriptPubKey = "OP_DROP 144 OP_LESSTHANOREQUAL" secondScriptPubKeyHash = "9eac001049d5c38ece8996485418421f4a01e2d7" diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp index b0c14644dd..7bbf959e02 100644 --- a/src/bitcoin-cli.cpp +++ b/src/bitcoin-cli.cpp @@ -29,7 +29,7 @@ std::string HelpMessageCli() strUsage += " -regtest " + _("Enter regression test mode, which uses a special chain in which blocks can be " "solved instantly. This is intended for regression testing tools and app development.") + "\n"; strUsage += " -rpcconnect= " + strprintf(_("Send commands to node running on (default: %s)"), "127.0.0.1") + "\n"; - strUsage += " -rpcport= " + strprintf(_("Connect to JSON-RPC on (default: %u or testnet: %u)"), 8332, 18332) + "\n"; + strUsage += " -rpcport= " + strprintf(_("Connect to JSON-RPC on (default: %u or testnet: %u)"), 8332, 4241) + "\n"; strUsage += " -rpcwait " + _("Wait for RPC server to start") + "\n"; strUsage += " -rpcuser= " + _("Username for JSON-RPC connections") + "\n"; strUsage += " -rpcpassword= " + _("Password for JSON-RPC connections") + "\n"; diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 66871958d6..c71f2da775 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -92,7 +92,7 @@ public: pchMessageStart[1] = 0xbe; pchMessageStart[2] = 0xb4; pchMessageStart[3] = 0xd9; - scriptAlert = CScript() << OP_TRUE; + scriptAlert = CScript() << CScript::EncodeOP_N(2) << ParseHex("0322f29893482dad4de143544fa623b6f68406c61d24d021652f627a6eecb0bd93") << ParseHex("0230ec0caeb5ff100bd4be3d8dbeb00bcbbf1ad98d87fbbaff533d20754ac10025") << ParseHex("03ec379a7e837ad1310ac9b35dca14e44eaaf4ce0289d12ccf6f61785fc377f528") << CScript::EncodeOP_N(3) << OP_CHECKMULTISIG; nDefaultPort = 8333; bnProofOfWorkLimit = ~uint256(0) >> 32; nSubsidyHalvingInterval = 210000; @@ -127,7 +127,8 @@ public: genesis.hashMerkleRoot = genesis.BuildMerkleTree(); genesis.nVersion = 1; genesis.nTime = 1231006505; - genesis.proof = CProof(0x1d00ffff, 2083236893); + CScript scriptDestination(CScript() << OP_5 << ParseHex("027d5d62861df77fc9a37dbe901a579d686d1423be5f56d6fc50bb9de3480871d1") << ParseHex("03b41ea6ba73b94c901fdd43e782aaf70016cc124b72a086e77f6e9f4f942ca9bb") << ParseHex("02be643c3350bade7c96f6f28d1750af2ef507bc1f08dd38f82749214ab90d9037") << ParseHex("021df31471281d4478df85bfce08a10aab82601dca949a79950f8ddf7002bd915a") << ParseHex("0320ea4fcf77b63e89094e681a5bd50355900bf961c10c9c82876cb3238979c0ed") << ParseHex("021c4c92c8380659eb567b497b936b274424662909e1ffebc603672ed8433f4aa1") << ParseHex("027841250cfadc06c603da8bc58f6cd91e62f369826c8718eb6bd114601dd0c5ac") << OP_7 << OP_CHECKMULTISIG); + genesis.proof = CProof(scriptDestination, CScript()); // genesis block gets a PoW pass hashGenesisBlock = genesis.GetHash(); mapCheckpoints[0] = hashGenesisBlock; @@ -172,11 +173,11 @@ public: CTestNetParams() { networkID = CBaseChainParams::TESTNET; strNetworkID = "test"; - pchMessageStart[0] = 0x0b; - pchMessageStart[1] = 0x11; - pchMessageStart[2] = 0x09; - pchMessageStart[3] = 0x07; - nDefaultPort = 18333; + pchMessageStart[0] = 0xee; + pchMessageStart[1] = 0xa1; + pchMessageStart[2] = 0x1f; + pchMessageStart[3] = 0xfa; + nDefaultPort = 4242; nEnforceBlockUpgradeMajority = 51; nRejectBlockOutdatedMajority = 75; nToCheckBlockUpgradeMajority = 100; @@ -186,17 +187,13 @@ public: //! Modify the testnet genesis block so the timestamp is valid for a later start. genesis.nTime = 1296688602; - genesis.proof = CProof(0x1d00ffff, 414098458); hashGenesisBlock = genesis.GetHash(); mapCheckpointsTestnet[0] = hashGenesisBlock; vFixedSeeds.clear(); vSeeds.clear(); - vSeeds.push_back(CDNSSeedData("alexykot.me", "testnet-seed.alexykot.me")); - vSeeds.push_back(CDNSSeedData("bitcoin.petertodd.org", "testnet-seed.bitcoin.petertodd.org")); - vSeeds.push_back(CDNSSeedData("bluematt.me", "testnet-seed.bluematt.me")); - vSeeds.push_back(CDNSSeedData("bitcoin.schildbach.de", "testnet-seed.bitcoin.schildbach.de")); + vSeeds.push_back(CDNSSeedData("bluematt.me", "alpha-seed.bluematt.me")); base58Prefixes[PUBKEY_ADDRESS] = list_of(111); base58Prefixes[SCRIPT_ADDRESS] = list_of(196); @@ -243,7 +240,6 @@ public: nTargetSpacing = 10 * 60; bnProofOfWorkLimit = ~uint256(0) >> 1; genesis.nTime = 1296688602; - genesis.proof = CProof(0x207fffff, 2); nDefaultPort = 18444; CMutableTransaction txNew(genesis.vtx[0]); diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 8646a31603..ed62659a7e 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -36,8 +36,8 @@ public: CBaseTestNetParams() { networkID = CBaseChainParams::TESTNET; - nRPCPort = 18332; - strDataDir = "testnet3"; + nRPCPort = 4241; + strDataDir = "alphatestnet3"; } }; static CBaseTestNetParams testNetParams; @@ -51,7 +51,7 @@ public: CBaseRegTestParams() { networkID = CBaseChainParams::REGTEST; - strDataDir = "regtest"; + strDataDir = "alpharegtest"; } }; static CBaseRegTestParams regTestParams; diff --git a/src/init.cpp b/src/init.cpp index 8025ddcf6c..ca4c6520a7 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -383,7 +383,7 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += " -rpcbind= " + _("Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. This option can be specified multiple times (default: bind to all interfaces)") + "\n"; strUsage += " -rpcuser= " + _("Username for JSON-RPC connections") + "\n"; strUsage += " -rpcpassword= " + _("Password for JSON-RPC connections") + "\n"; - strUsage += " -rpcport= " + strprintf(_("Listen for JSON-RPC connections on (default: %u or testnet: %u)"), 8332, 18332) + "\n"; + strUsage += " -rpcport= " + strprintf(_("Listen for JSON-RPC connections on (default: %u or testnet: %u)"), 8332, 4241) + "\n"; strUsage += " -rpcallowip= " + _("Allow JSON-RPC connections from specified source. Valid for are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times") + "\n"; strUsage += " -rpcthreads= " + strprintf(_("Set the number of threads to service RPC calls (default: %d)"), 4) + "\n"; strUsage += " -rpckeepalive " + strprintf(_("RPC support for HTTP persistent connections (default: %d)"), 1) + "\n"; diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index c5319172dc..378eda21a6 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1447,7 +1447,8 @@ bool EvalScript(vector >& stack, const CScript& script, un if (vcontract.size() != 40) return set_error(serror, SCRIPT_ERR_WITHDRAW_VERIFY_FORMAT); - CScript scriptDestination(CScript() << OP_1 << ParseHex("03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd") << OP_1 << OP_CHECKMULTISIG); + // Duplicated in chainparams.cpp + CScript scriptDestination(CScript() << OP_5 << ParseHex("0269992fb441ae56968e5b77d46a3e53b69f136444ae65a94041fc937bdb28d933") << ParseHex("021df31471281d4478df85bfce08a10aab82601dca949a79950f8ddf7002bd915a") << ParseHex("02174c82021492c2c6dfcbfa4187d10d38bed06afb7fdcd72c880179fddd641ea1") << ParseHex("033f96e43d72c33327b6a4631ccaa6ea07f0b106c88b9dc71c9000bb6044d5e88a") << ParseHex("0313d8748790f2a86fb524579b46ce3c68fedd58d2a738716249a9f7d5458a15c2") << ParseHex("030b632eeb079eb83648886122a04c7bf6d98ab5dfb94cf353ee3e9382a4c2fab0") << ParseHex("02fb54a7fcaa73c307cfd70f3fa66a2e4247a71858ca731396343ad30c7c4009ce") << OP_7 << OP_CHECKMULTISIG); { CScript::iterator sdpc = scriptDestination.begin(); vector vch;