Skip to content

Commit 625fb0a

Browse files
authored
Update EntityListingIndicesLastProcessedStateVersion when processing transactions (#1066)
2 parents 60c88c1 + 7721da0 commit 625fb0a

4 files changed

Lines changed: 13 additions & 58 deletions

File tree

.github/workflows/add-artifacts-to-release.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -201,29 +201,3 @@ jobs:
201201
with:
202202
files: |
203203
babylon-node-${{ needs.setup_version_properties.outputs.VERSION_TAG }}.zip
204-
205-
snyk-sbom:
206-
if: github.event_name == 'release'
207-
name: SBOM
208-
runs-on: ubuntu-22.04 # Fix GLIBC
209-
permissions: write-all
210-
steps:
211-
- uses: RDXWorks-actions/checkout@main
212-
- uses: radixdlt/public-iac-resuable-artifacts/fetch-secrets@main
213-
with:
214-
role_name: ${{ secrets.AWS_ROLE_NAME_SNYK_SECRET }}
215-
app_name: 'babylon-node'
216-
step_name: 'snyk-sbom'
217-
secret_prefix: 'SNYK'
218-
secret_name: ${{ secrets.AWS_SECRET_NAME_SNYK }}
219-
parse_json: true
220-
- name: Generate SBOM
221-
uses: RDXWorks-actions/snyk-actions/gradle-jdk17@master
222-
with:
223-
args: --all-projects --org=${{ env.SNYK_NETWORK_ORG_ID }} --format=cyclonedx1.4+json > sbom.json
224-
command: sbom
225-
- name: Upload SBOM
226-
uses: RDXWorks-actions/action-gh-release@master
227-
with:
228-
files: |
229-
sbom.json

.github/workflows/ci.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,6 @@ jobs:
7676
with:
7777
args: --all-projects --org=${{ env.SNYK_NETWORK_ORG_ID }} --severity-threshold=high
7878
command: code test
79-
snyk-sbom:
80-
name: Snyk SBOM
81-
runs-on: ubuntu-latest
82-
permissions:
83-
id-token: write
84-
pull-requests: read
85-
contents: read
86-
deployments: write
87-
steps:
88-
- uses: RDXWorks-actions/checkout@main
89-
- uses: radixdlt/public-iac-resuable-artifacts/fetch-secrets@main
90-
with:
91-
role_name: ${{ secrets.AWS_ROLE_NAME_SNYK_SECRET }}
92-
app_name: 'babylon-node'
93-
step_name: 'snyk-sbom'
94-
secret_prefix: 'SNYK'
95-
secret_name: ${{ secrets.AWS_SECRET_NAME_SNYK }}
96-
parse_json: true
97-
- name: Generate SBOM # check SBOM can be generated but nothing is done with it
98-
uses: RDXWorks-actions/snyk-actions/gradle-jdk17@master
99-
with:
100-
args: --all-projects --org=${{ env.SNYK_NETWORK_ORG_ID }} --format=cyclonedx1.4+json > sbom.json
101-
command: sbom
10279
build:
10380
name: Unit tests and sonarqube
10481
runs-on: selfhosted-ubuntu-22.04-16-cores

Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ENV DEBIAN_FRONTEND noninteractive
2020

2121
CMD ["/bin/bash"]
2222

23-
ARG WGET_VERSION="1.21.3-1+b2"
23+
ARG WGET_VERSION="1.21.3-1+deb12u1"
2424
ARG VERSION_BRANCH=""
2525
ARG VERSION_COMMIT=""
2626
ARG VERSION_DISPLAY=""
@@ -49,14 +49,14 @@ ENV VERSION_LAST_TAG=$VERSION_LAST_TAG
4949
# - https://packages.debian.org/bookworm/openjdk-17-jdk
5050
RUN apt-get update \
5151
&& apt-get install -y --no-install-recommends \
52-
docker.io=20.10.24+dfsg1-1+deb12u1 \
53-
libssl-dev=3.0.15-1~deb12u1 \
52+
docker.io=20.10.24+dfsg1-1+deb12u1+b2 \
53+
libssl-dev=3.0.17-1~deb12u3 \
5454
pkg-config=1.8.1-1 \
5555
unzip=6.0-28 \
5656
wget=${WGET_VERSION} \
5757
software-properties-common=0.99.30-4.1~deb12u1 \
5858
&& apt-get install -y --no-install-recommends \
59-
openjdk-17-jdk=17.0.13+11-2~deb12u1 \
59+
openjdk-17-jdk=17.0.17+10-1~deb12u1 \
6060
&& apt-get clean \
6161
&& rm -rf /var/lib/apt/lists/*
6262

@@ -126,19 +126,19 @@ RUN apt-get update \
126126
ca-certificates \
127127
build-essential=12.9 \
128128
# https://security-tracker.debian.org/tracker/CVE-2023-38545
129-
curl=7.88.1-10+deb12u8 \
129+
curl=7.88.1-10+deb12u14 \
130130
g++-aarch64-linux-gnu \
131131
g++-x86-64-linux-gnu \
132132
libc6-dev-arm64-cross=2.36-8cross1 \
133133
libclang-dev=1:14.0-55.7~deb12u1 \
134-
libssl-dev=3.0.15-1~deb12u1 \
134+
libssl-dev=3.0.17-1~deb12u3 \
135135
pkg-config=1.8.1-1 \
136136
&& rm -rf /var/lib/apt/lists/*
137137

138138
# We fix the version of Rust here to ensure that we can update it without having
139139
# issues with the caching layers containing outdated versions which aren't compatible.
140140
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o rustup.sh \
141-
&& sh rustup.sh -y --target 1.81.0-aarch64-unknown-linux-gnu 1.81.0-x86_64-unknown-linux-gnu --default-toolchain 1.81.0
141+
&& sh rustup.sh -y --target 1.88.0-aarch64-unknown-linux-gnu,1.88.0-x86_64-unknown-linux-gnu --default-toolchain 1.88.0
142142

143143
RUN "$HOME/.cargo/bin/cargo" install sccache --version 0.7.4
144144

@@ -259,9 +259,9 @@ LABEL org.opencontainers.image.authors="devops@radixdlt.com"
259259
# - https://packages.debian.org/bookworm/libc6
260260
RUN apt-get update -y \
261261
&& apt-get -y --no-install-recommends install \
262-
openjdk-17-jre-headless=17.0.13+11-2~deb12u1 \
262+
openjdk-17-jre-headless=17.0.17+10-1~deb12u1 \
263263
# https://security-tracker.debian.org/tracker/CVE-2023-38545
264-
curl=7.88.1-10+deb12u8 \
264+
curl=7.88.1-10+deb12u14 \
265265
gettext-base=0.21-12 \
266266
daemontools=1:0.76-8.1 \
267267
# https://security-tracker.debian.org/tracker/CVE-2023-4911

core-rust/state-manager/src/store/rocks_db.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,10 @@ impl<R: WriteableRocks> StateManagerDatabase<R> {
637637
.state_changes
638638
.substate_level_changes,
639639
);
640+
db_context.cf(ExtensionsDataCf).put(
641+
&ExtensionsDataKey::EntityListingIndicesLastProcessedStateVersion,
642+
&transaction_bundle.state_version.to_be_bytes().to_vec(),
643+
);
640644
}
641645

642646
let CommittedTransactionBundle {

0 commit comments

Comments
 (0)