Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch 'static-experimental' into static #90

Merged
merged 5 commits into from
Nov 29, 2024
Merged

Merge branch 'static-experimental' into static #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d961b5e
Dockerfile: fix FromAsCasing warning
DeckerSU Nov 24, 2024
55038ad
Update README.md
DeckerSU Nov 25, 2024
f931b64
LoadBlockIndexDB: fix undefined behavior with updateInterval
DeckerSU Nov 29, 2024
04197f8
bump version [0.9.0.2]
DeckerSU Nov 29, 2024
dc6f5ec
Dockerfile: bump version to v0.9.0-beta3
DeckerSU Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
# docker buildx build --platform linux/amd64,linux/arm64 -t deckersu/komodoocean:latest --push .

## Build komodod
FROM ubuntu:20.04 as komodod-builder
FROM ubuntu:20.04 AS komodod-builder
LABEL maintainer="DeckerSU <deckersu@protonmail.com>"

SHELL ["/bin/bash", "-c"]

# Latest release komodo v0.9.0-beta2
ARG KOMODO_COMMITTISH=v0.9.0-beta2
# Latest release komodo v0.9.0-beta3
ARG KOMODO_COMMITTISH=v0.9.0-beta3
ARG IS_RELEASE=false
# DeckerSU <deckersu@protonmail.com> https://keys.openpgp.org/vks/v1/by-fingerprint/FD9A772C7300F4C894D1A819FE50480862E6451C
ARG KOMODOD_MAINTAINER_KEYS="FD9A772C7300F4C894D1A819FE50480862E6451C"
Expand Down
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@ cd komodo
```
**komodo is experimental and a work-in-progress.** Use at your own risk.

*p.s.* Currently only `x86_64` arch supported for MacOS, build for `Apple M1` processors unfortunately not yet supported.

#### Docker

:whale: [deckersu/komodoocean](https://hub.docker.com/r/deckersu/komodoocean) - This Docker image provides the official KomodoOcean daemon for the Komodo blockchain platform. Komodod is the core component responsible for running a Komodo node, facilitating transaction validation, block creation, and communication within the network.
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 9)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 1)
define(_CLIENT_VERSION_BUILD, 2)
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
define(_CLIENT_VERSION_IS_RELEASE, true)
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6120,7 +6120,7 @@ bool static LoadBlockIndexDB()
int cur_height_num = 0;

const size_t totalBlocks = vSortedByHeight.size();
const size_t updateInterval = totalBlocks / 100;
const size_t updateInterval = std::max<size_t>(totalBlocks / 100, 1);

for (const std::pair<int, CBlockIndex*>& item : vSortedByHeight)
{
Expand Down