Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feature/p2p
Browse files Browse the repository at this point in the history
  • Loading branch information
algorandskiy committed Mar 22, 2024
2 parents ef82b2b + 93ab758 commit e3a378e
Show file tree
Hide file tree
Showing 32 changed files with 842 additions and 640 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:20.04 as builder

ARG GO_VERSION="1.20.7"
ARG GO_VERSION="1.20.14"

ARG CHANNEL
ARG URL
Expand Down Expand Up @@ -41,12 +41,12 @@ RUN /dist/files/build/install.sh \
-b "${BRANCH}" \
-s "${SHA}"

FROM debian:bookworm-20230703-slim as final
FROM debian:bookworm-20240311-slim as final

ENV PATH="/node/bin:${PATH}" ALGOD_PORT="8080" KMD_PORT="7833" ALGORAND_DATA="/algod/data"

# curl is needed to lookup the fast catchup url
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl gosu && \
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && \
update-ca-certificates && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
Expand Down
2 changes: 1 addition & 1 deletion agreement/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ type ensureAction struct {
Payload proposal
// the certificate proving commitment
Certificate Certificate
// The time that the winning proposal-vote was validated for round credentialRoundLag back from the current one
// The time that the lowest proposal-vote was validated for `credentialRoundLag` rounds ago (R-credentialRoundLag). This may not have been the winning proposal, since we wait `credentialRoundLag` rounds to see if there was a better one.
voteValidatedAt time.Duration
// The dynamic filter timeout calculated for this round, even if not enabled, for reporting to telemetry.
dynamicFilterTimeout time.Duration
Expand Down
Loading

0 comments on commit e3a378e

Please sign in to comment.