Skip to content

Commit

Permalink
Version 0.4.8 build 1128
Browse files Browse the repository at this point in the history
* From block height 1000000, minimum difficulty will be 1000000
  • Loading branch information
mtl1979 committed Oct 9, 2021
1 parent e3c9412 commit 3a4e9a4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C /
ADD https://github.com/just-containers/socklog-overlay/releases/download/v2.1.0-0/socklog-overlay-amd64.tar.gz /tmp/
RUN tar xzf /tmp/socklog-overlay-amd64.tar.gz -C /

ARG TALLEO_VERSION=v0.4.7.1122
ARG TALLEO_VERSION=v0.4.8.1128
ENV TALLEO_VERSION=${TALLEO_VERSION}

# install build dependencies
Expand Down
5 changes: 4 additions & 1 deletion src/CryptoNoteCore/Currency.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,10 @@ Difficulty Currency::nextDifficultyZawyLWMA2(uint8_t version, uint32_t blockInde
}

uint64_t nextD = static_cast<uint64_t>(next_D);
if (nextD == 0)

if (blockIndex >= 1000000 && nextD < 1000000)
return 1000000;
else if (nextD == 0)
return 100;

return nextD;
Expand Down
4 changes: 2 additions & 2 deletions src/version.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#define PROJECT_COPYRIGHT "Copyright 2019-2020, The Talleo Developers"
#define APP_VER_MAJOR 0
#define APP_VER_MINOR 4
#define APP_VER_REV 7
#define APP_VER_BUILD 1122
#define APP_VER_REV 8
#define APP_VER_BUILD 1128

#define BUILD_COMMIT_ID "@VERSION@"
#define PROJECT_VERSION STR(APP_VER_MAJOR) "." STR(APP_VER_MINOR) "." STR(APP_VER_REV)
Expand Down

0 comments on commit 3a4e9a4

Please sign in to comment.