riceball/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity

bump version to 0.25.0.0

Browse Source
This commit is contained in:
Crypto City 2020-12-07 11:52:36 +00:00
parent cb7e794036
commit 1a522dc3fa
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -123,7 +123,7 @@ invokes cmake commands as needed.
```bash
cd townforge
git checkout v0.24.0.2
git checkout v0.25.0.0
make
```
@ -233,10 +233,10 @@ application.
cd townforge
```
* If you would like a specific version/tag, do a git checkout for that version. eg. 'v0.24.0.2'. If you don't care about the version and just want binaries from master, skip this step:
* If you would like a specific version/tag, do a git checkout for that version. eg. 'v0.25.0.0'. If you don't care about the version and just want binaries from master, skip this step:
```bash
git checkout v0.24.0.2
git checkout v0.25.0.0
```
* If you are on a 64-bit system, run:

2
src/cryptonote_core/blockchain.cpp
View File

@ -1398,7 +1398,7 @@ bool Blockchain::prevalidate_miner_transaction(const block& b, uint64_t height,
crypto::signature sig;
CHECK_AND_ASSERT_MES(nonce.nonce.size() == sizeof(sig), false, "Block 1 nonce has invalid size");
memcpy(&sig, nonce.nonce.data(), sizeof(sig));
CHECK_AND_ASSERT_MES(cc::check_mayor_account_signature("Block1 Tag", sig), false, "Block 1 signature check failed");
CHECK_AND_ASSERT_MES(cc::check_mayor_account_signature("Block1tag", sig), false, "Block 1 signature check failed");
}
// for v2 txes (ringct), we only accept empty rct signatures for miner transactions,

4
src/version.cpp.in
View File

@ -1,6 +1,6 @@
#define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
#define DEF_MONERO_VERSION "0.24.0.2"
#define DEF_MONERO_RELEASE_NAME "Jotunheim"
#define DEF_MONERO_VERSION "0.25.0.0"
#define DEF_MONERO_RELEASE_NAME "Kitezh"
#define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
#define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@

2
src/wallet/wallet2.cpp
View File

@ -12339,7 +12339,7 @@ uint64_t wallet2::get_daemon_blockchain_target_height(string &err)
uint64_t wallet2::get_approximate_blockchain_height() const
{
// time of v2 fork
const time_t fork_time = 1604149200;
const time_t fork_time = 1607778000;
// v2 fork block
const uint64_t fork_block = 0;
// avg seconds per block