From cf733074553a9b8ad576503b294e559b38ff3232 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 18 Mar 2016 21:39:10 -0700 Subject: [PATCH] Set network parameters --- src/chainparams.cpp | 2 +- src/script/interpreter.cpp | 2 +- src/wallet/rpcwallet.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 0bc91bb4c2..d71820fda0 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -99,7 +99,7 @@ public: nDefaultPort = 9042; nPruneAfterHeight = 100000; - CScript scriptChallenge(CScript() << OP_1 << ParseHex("03aeb681df5ac19e449a872b9e9347f1db5a0394d2ec5caf2a9c143f86e232b0d9") << OP_1 << OP_CHECKMULTISIG); + CScript scriptChallenge(CScript() << OP_2 << ParseHex("0204c6be425356d9200a3303d95f2c39078cc9473ca49619da1e0ec233f27516ca") << ParseHex("03206b45265ae687dfdc602b8faa7dd749d7865b0e51f986e12c532229f0c998be") << ParseHex("02cc276552e180061f64dc16e2a02e7f9ecbcc744dea84eddbe991721824df825c") << OP_3 << OP_CHECKMULTISIG); uint256 genesisBlockHash(uint256S("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943")); CScript scriptDestination(CScript() << std::vector(genesisBlockHash.begin(), genesisBlockHash.end()) << OP_WITHDRAWPROOFVERIFY); diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 78d6f0104c..91b4ed9409 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1165,7 +1165,7 @@ bool EvalScript(vector >& stack, const CScript& script, un return set_error(serror, SCRIPT_ERR_WITHDRAW_VERIFY_FORMAT); opcodetype opcodeTmp; - CScript scriptDestination(CScript() << OP_1 << ParseHex("03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd") << OP_1 << OP_CHECKMULTISIG); + CScript scriptDestination(CScript() << OP_2 << ParseHex("034c55bede1bce8e486080f8ebb7a0e8f106b49efb295a8314da0e1b1723738c66") << ParseHex("02d51090b27ca8f1cc04984614bd749d8bab6f2a3681318d3fd0dd43b2a39dd774") << ParseHex("03a75bd7ac458b19f98047c76a6ffa442e592148c5d23a1ec82d379d5d558f4fd8") << OP_3 << OP_CHECKMULTISIG); { CScript::iterator sdpc = scriptDestination.begin(); vector vch; diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index ac5060ffca..30204f5c91 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -39,9 +39,9 @@ int64_t nWalletUnlockTime; static CCriticalSection cs_nWalletUnlockTime; //Redeemscript template for alpha fedpeg -static const CScript fedRedeemScript(CScript() << OP_1 << ParseHex("03a34b99f22c790c4e36b2b3c2c35a36db06226e41c692fc82b8b56ac1c540c5bd") << OP_1 << OP_CHECKMULTISIG); +static const CScript fedRedeemScript(CScript() << OP_2 << ParseHex("034c55bede1bce8e486080f8ebb7a0e8f106b49efb295a8314da0e1b1723738c66") << ParseHex("02d51090b27ca8f1cc04984614bd749d8bab6f2a3681318d3fd0dd43b2a39dd774") << ParseHex("03a75bd7ac458b19f98047c76a6ffa442e592148c5d23a1ec82d379d5d558f4fd8") << OP_3 << OP_CHECKMULTISIG); -static uint256 genesisBlockHash(uint256S("000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f")); +static uint256 genesisBlockHash(uint256S("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943")); std::string HelpRequiringPassphrase() {