diff --git a/src/chainparams.cpp b/src/chainparams.cpp index be2f26756..ee3da4e52 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -251,7 +251,7 @@ public: 1507424630, // * UNIX timestamp of last known number of transactions 3701128, // * total number of transactions between genesis and that timestamp // (the tx=... number in the SetBestChain debug.log lines) - 0.1 // * estimated number of transactions second after that timestamp + 0.1 // * estimated number of transactions per second after that timestamp }; } }; @@ -367,11 +367,10 @@ public: }; chainTxData = ChainTxData{ - // Data as of block 0000024bc3f4f4cb30d29827c13d921ad77d2c6072e586c7f60d83c2722cdcc5 (height 2999) - 1462856598, - 3094, // * total number of transactions between genesis and last checkpoint + 1462856598, // * UNIX timestamp of last known number of transactions + 3094, // * total number of transactions between genesis and that timestamp // (the tx=... number in the SetBestChain debug.log lines) - 0.01 // * estimated number of transactions per day after checkpoint + 0.01 // * estimated number of transactions per second after that timestamp }; } @@ -488,11 +487,9 @@ public: }; chainTxData = ChainTxData{ - // Data as of block 0000024bc3f4f4cb30d29827c13d921ad77d2c6072e586c7f60d83c2722cdcc5 (height 2999) - devnetGenesis.GetBlockTime(), - 2, // * total number of transactions between genesis and last checkpoint - // (the tx=... number in the SetBestChain debug.log lines) - 0.01 // * estimated number of transactions per day after checkpoint + devnetGenesis.GetBlockTime(), // * UNIX timestamp of devnet genesis block + 2, // * we only have 2 coinbase transactions when a devnet is started up + 0.01 // * estimated number of transactions per second }; } }; diff --git a/src/consensus/params.h b/src/consensus/params.h index f28761fca..741b1e76e 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -64,7 +64,7 @@ struct Params { /** Block height at which BIP66 becomes active */ int BIP66Height; /** - * Minimum blocks including miner confirmation of the total of 2016 blocks in a retargetting period, + * Minimum blocks including miner confirmation of the total of nMinerConfirmationWindow blocks in a retargeting period, * (nPowTargetTimespan / nPowTargetSpacing) which is also used for BIP9 deployments. * Default BIP9Deployment::nThreshold value for deployments where it's not specified and for unknown deployments. * Examples: 1916 for 95%, 1512 for testchains. diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 0f400bc64..d3a6f7b3e 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -136,7 +136,7 @@ static const CRPCConvertParam vRPCConvertParams[] = { "prioritisetransaction", 2, "fee_delta" }, { "setban", 2, "bantime" }, { "setban", 3, "absolute" }, - { "setbip69enabled", 0 }, + { "setbip69enabled", 0, "enabled" }, { "setnetworkactive", 0, "state" }, { "getmempoolancestors", 1, "verbose" }, { "getmempooldescendants", 1, "verbose" }, diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 997525df6..75a0479c4 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1718,7 +1718,7 @@ UniValue listsinceblock(const JSONRPCRequest& request) } } else - throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid blockhash"); + throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid blockhash"); } if (request.params.size() > 1)