monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8470

Browse source 
309f6ba build: prepare v0.18.1.0 (selsta)
This commit is contained in:
luigi1111 2022-08-09 15:00:16 -05:00
commit dc2f548a68
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
7 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -138,8 +138,8 @@ Dates are provided in the format YYYY-MM-DD.
| 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 | 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.3.2 | New CLSAG transaction format | 2210000 | 2020-10-17 | v13 | v0.17.0.0 | v0.17.3.2 | New CLSAG transaction format
| 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.3.2 | forbid old MLSAG transaction format | 2210720 | 2020-10-18 | v14 | v0.17.1.1 | v0.17.3.2 | forbid old MLSAG transaction format
| 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.0.0 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm | 2688888 | 2022-08-13 | v15 | v0.18.0.0 | v0.18.1.0 | ringsize = 16, bulletproofs+, view tags, adjusted dynamic block weight algorithm
| 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.0.0 | forbid old v14 transaction format | 2689608 | 2022-08-14 | v16 | v0.18.0.0 | v0.18.1.0 | forbid old v14 transaction format
| XXXXXXX | XXX-XX-XX | XXX | vX.XX.X.X | vX.XX.X.X | XXX | | 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. X's indicate that these details have not been determined as of commit date.
@ -345,7 +345,7 @@ Tested on a Raspberry Pi Zero with a clean install of minimal Raspbian Stretch (
```bash ```bash
git clone https://github.com/monero-project/monero.git git clone https://github.com/monero-project/monero.git
cd monero cd monero
git checkout v0.18.0.0 git checkout v0.18.1.0
``` ```
* Build: * Build:
@ -464,10 +464,10 @@ application.
cd monero 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.18.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.18.1.0'. If you don't care about the version and just want binaries from master, skip this step:
```bash ```bash
git checkout v0.18.0.0 git checkout v0.18.1.0
``` ```
* If you are on a 64-bit system, run: * If you are on a 64-bit system, run:

12
contrib/gitian/DOCKRUN.md
View file

@ -57,7 +57,7 @@ The dockrun.sh script will do everything to build the binaries. Just specify the
version to build as its only argument, e.g. version to build as its only argument, e.g.
```bash ```bash
./dockrun.sh v0.17.3.0 ./dockrun.sh v0.18.1.0
``` ```
The build should run to completion with no errors, and will display the SHA256 checksums The build should run to completion with no errors, and will display the SHA256 checksums
@ -78,7 +78,7 @@ e.g.
```bash ```bash
# Run build processes with 8 threads # Run build processes with 8 threads
OPT="-j 8" ./dockrun.sh v0.17.3.0 OPT="-j 8" ./dockrun.sh v0.18.1.0
``` ```
Post-build Post-build
@ -98,16 +98,16 @@ more builder/var/install-linux.log
more builder/var/build-linux.log more builder/var/build-linux.log
``` ```
You can find the compiled archives inside of the container at the following directory (be sure to replace `v0.17.3.0` with the version being built): You can find the compiled archives inside of the container at the following directory (be sure to replace `v0.18.1.0` with the version being built):
```bash ```bash
docker exec -it gitrun /bin/bash docker exec -it gitrun /bin/bash
ls -la out/v0.17.3.0/ ls -la out/v0.18.1.0/
``` ```
To copy the compiled archives to the local host out of the Docker container, you can run the following (be sure to replace `v0.17.3.0` with the version being built): To copy the compiled archives to the local host out of the Docker container, you can run the following (be sure to replace `v0.18.1.0` with the version being built):
```bash ```bash
mkdir out mkdir out
docker cp gitrun:/home/ubuntu/out/v0.17.3.0 out docker cp gitrun:/home/ubuntu/out/v0.18.1.0 out
``` ```

2
contrib/gitian/README.md
View file

@ -133,7 +133,7 @@ Common setup part:
su - gitianuser su - gitianuser
GH_USER=YOUR_GITHUB_USER_NAME GH_USER=YOUR_GITHUB_USER_NAME
VERSION=v0.18.0.0 VERSION=v0.18.1.0
``` ```
Where `GH_USER` is your GitHub user name and `VERSION` is the version tag you want to build. Where `GH_USER` is your GitHub user name and `VERSION` is the version tag you want to build.

BIN
src/blocks/checkpoints.dat
View file

Binary file not shown.

1
src/checkpoints/checkpoints.cpp
View file

@ -240,6 +240,7 @@ namespace cryptonote
ADD_CHECKPOINT2(2092500, "c4e00820c9c7989b49153d5e90ae095a18a11d990e82fcc3be54e6ed785472b5", "0xb4e585a31369cb"); ADD_CHECKPOINT2(2092500, "c4e00820c9c7989b49153d5e90ae095a18a11d990e82fcc3be54e6ed785472b5", "0xb4e585a31369cb");
ADD_CHECKPOINT2(2182500, "0d22b5f81982eff21d094af9e821dc2007e6342069e3b1a37b15d97646353124", "0xead4a874083492"); ADD_CHECKPOINT2(2182500, "0d22b5f81982eff21d094af9e821dc2007e6342069e3b1a37b15d97646353124", "0xead4a874083492");
ADD_CHECKPOINT2(2661600, "41c9060e8426012238e8a26da26fcb90797436896cc70886a894c2c560bcccf2", "0x2e0d87526ff161f"); ADD_CHECKPOINT2(2661600, "41c9060e8426012238e8a26da26fcb90797436896cc70886a894c2c560bcccf2", "0x2e0d87526ff161f");
ADD_CHECKPOINT2(2677000, "1b9fee6246eeb176bd17d637bf252e9af54a4218675f01b4449cc0901867f9eb", "0x2f165bc1a5163ba");
return true; return true;
} }

2
src/cryptonote_core/blockchain.cpp
View file

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

2
src/version.cpp.in
View file

@ -1,5 +1,5 @@
#define DEF_MONERO_VERSION_TAG "@VERSIONTAG@" #define DEF_MONERO_VERSION_TAG "@VERSIONTAG@"
#define DEF_MONERO_VERSION "0.18.0.0" #define DEF_MONERO_VERSION "0.18.1.0"
#define DEF_MONERO_RELEASE_NAME "Fluorine Fermi" #define DEF_MONERO_RELEASE_NAME "Fluorine Fermi"
#define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG #define DEF_MONERO_VERSION_FULL DEF_MONERO_VERSION "-" DEF_MONERO_VERSION_TAG
#define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@ #define DEF_MONERO_VERSION_IS_RELEASE @VERSION_IS_RELEASE@