Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-29 07:16:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6812

Browse Source 
f240b1d build: prepare v0.17 (selsta)
This commit is contained in:
luigi1111 2020-09-14 11:44:06 -05:00
commit 244ae22795
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
11 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -134,6 +134,8 @@ Dates are provided in the format YYYY-MM-DD.
| 1788000 | 2019-03-09 | v10 | v0.14.0.0 | v0.14.1.2 | New PoW based on Cryptonight-R, new block weight algorithm, slightly more efficient RingCT format
| 1788720 | 2019-03-10 | v11 | v0.14.0.0 | v0.14.1.2 | forbid old RingCT transaction format
| 1978433 | 2019-11-30* | v12 | v0.15.0.0 | v0.16.0.0 | New PoW based on RandomX, only allow >= 2 outputs, change to the block median used to calculate penalty, v1 coinbases are forbidden, rct sigs in coinbase forbidden, 10 block lock time for incoming outputs
| 2210000 | 2020-10-17 | v13 | v0.17.0.0 | v0.17.0.0 | New CLSAG transaction format
| 2210720 | 2020-10-18 | v14 | v0.17.0.0 | v0.17.0.0 | forbid old MLSAG transaction format
| XXXXXXX | XXX-XX-XX | XXX | vX.XX.X.X | vX.XX.X.X | XXX |
X's indicate that these details have not been determined as of commit date.
@ -220,7 +222,7 @@ invokes cmake commands as needed.
```bash
cd monero
git checkout release-v0.16
git checkout release-v0.17
make
```
@ -293,7 +295,7 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
```bash
git clone https://github.com/monero-project/monero.git
cd monero
git checkout tags/v0.16.0.0
git checkout tags/v0.17.0.0
```
* Build:
@ -410,10 +412,10 @@ application.
cd monero
```
* If you would like a specific [version/tag](https://github.com/monero-project/monero/tags), do a git checkout for that version. eg. 'v0.16.0.0'. 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](https://github.com/monero-project/monero/tags), do a git checkout for that version. eg. 'v0.17.0.0'. If you don't care about the version and just want binaries from master, skip this step:
```bash
git checkout v0.16.0.0
git checkout v0.17.0.0
```
* If you are on a 64-bit system, run:

4
contrib/gitian/README.md
View File

@ -126,7 +126,7 @@ Setup for LXC:
```bash
GH_USER=fluffypony
VERSION=v0.16.0.0
VERSION=v0.17.0.0
./gitian-build.py --setup $GH_USER $VERSION
```
@ -182,7 +182,7 @@ If you chose to do detached signing using `--detach-sign` above (recommended), y
```bash
GH_USER=fluffypony
VERSION=v0.16.0.0
VERSION=v0.17.0.0
gpg --detach-sign ${VERSION}-linux/${GH_USER}/monero-linux-*-build.assert
gpg --detach-sign ${VERSION}-win/${GH_USER}/monero-win-*-build.assert

2
contrib/gitian/gitian-android.yml
View File

@ -1,5 +1,5 @@
---
name: "monero-android-0.16"
name: "monero-android-0.17"
enable_cache: true
suites:
- "bionic"

2
contrib/gitian/gitian-freebsd.yml
View File

@ -1,5 +1,5 @@
---
name: "monero-freebsd-0.16"
name: "monero-freebsd-0.17"
enable_cache: true
suites:
- "bionic"

2
contrib/gitian/gitian-linux.yml
View File

@ -1,5 +1,5 @@
---
name: "monero-linux-0.16"
name: "monero-linux-0.17"
enable_cache: true
suites:
- "bionic"

2
contrib/gitian/gitian-osx.yml
View File

@ -1,5 +1,5 @@
---
name: "monero-osx-0.16"
name: "monero-osx-0.17"
enable_cache: true
suites:
- "bionic"

2
contrib/gitian/gitian-win.yml
View File

@ -1,5 +1,5 @@
---
name: "monero-win-0.16"
name: "monero-win-0.17"
enable_cache: true
suites:
- "bionic"

BIN
src/blocks/checkpoints.dat
View File

Binary file not shown.

1
src/checkpoints/checkpoints.cpp
View File

@ -236,6 +236,7 @@ namespace cryptonote
ADD_CHECKPOINT2(1958000, "98a5d6e51afdf3146e0eefb10a66e8648d8d4d5c2742be8835e976ba217c9bb2", "0x79dd46d2a0971a");
ADD_CHECKPOINT2(2046000, "5e867f0b8baefed9244a681df97fc885d8ab36c3dfcd24c7a3abf3b8ac8b8314", "0x9cb8b6ff2978c6");
ADD_CHECKPOINT2(2092500, "c4e00820c9c7989b49153d5e90ae095a18a11d990e82fcc3be54e6ed785472b5", "0xb4e585a31369cb");
ADD_CHECKPOINT2(2182500, "0d22b5f81982eff21d094af9e821dc2007e6342069e3b1a37b15d97646353124", "0xead4a874083492");
return true;
}

2
src/cryptonote_core/blockchain.cpp
View File

@ -5335,7 +5335,7 @@ void Blockchain::cancel()
}
#if defined(PER_BLOCK_CHECKPOINT)
static const char expected_block_hashes_hash[] = "8b48d259d4b1126801b1f329683a26e1d16237420197cd3ccc76af2c55a36e83";
static const char expected_block_hashes_hash[] = "8da80ca560793f252d1d4ed449c85d75c74867f3f86b8832c8e3f88b1cbb6ae3";
void Blockchain::load_compiled_in_block_hashes(const GetCheckpointsCallback& get_checkpoints)
{
if (get_checkpoints == nullptr || !m_fast_sync)

4
src/version.cpp.in
View File

@ -1,6 +1,6 @@
#define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
#define DEF_MONERO_VERSION "0.16.0.0"
#define DEF_MONERO_RELEASE_NAME "Nitrogen Nebula"
#define DEF_MONERO_VERSION "0.17.0.0"
#define DEF_MONERO_RELEASE_NAME "Oxygen Orion"
#define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
#define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@