Skip to content

Commit

Permalink
Updated docker base images for v2.3 (#143)
Browse files Browse the repository at this point in the history
- Updated base image for dist, mware, and packer
- Added NON_VOLATILE modifier to N_bc_state_var declarations
  • Loading branch information
italo-sampaio authored May 23, 2023
1 parent 51aad25 commit 5f383c6
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion dist/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:bullseye-slim

RUN apt-get update && \
apt-get install -y gnupg2
16 changes: 8 additions & 8 deletions docker/mware/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
FROM python:3.7.10-slim-stretch
FROM python:3.7.16-slim-bullseye

WORKDIR /hsm2

RUN apt-get update && \
apt-get install -y apt-utils vim && \
apt-get install -y build-essential=12.3 && \
apt-get install -y build-essential=12.9 && \
apt-get install -y git

# Python package prerequisites
RUN apt-get install -y \
libsecp256k1-dev=0.1~20161228-1 \
python3-pkgconfig=1.2.2-1 \
libusb-1.0-0-dev=2:1.0.21-1 \
libudev-dev=232-25+deb9u12 \
libffi-dev=3.2.1-6 \
libjpeg-dev=1:1.5.1-2+deb9u2
libsecp256k1-dev=0.1~20210108-1 \
python3-pkgconfig=1.5.1-3 \
libusb-1.0-0-dev=2:1.0.24-3 \
libudev-dev=247.3-7+deb11u2 \
libffi-dev=3.3-6 #\
libjpeg-dev=1:2.0.6-4

COPY requirements.txt /hsm2/requirements.txt
RUN pip install -r requirements.txt --require-hashes
Expand Down
4 changes: 2 additions & 2 deletions docker/packer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim
FROM debian:bullseye-slim

WORKDIR /hsm2

RUN apt-get update && \
apt-get install -y apt-utils binutils=2.31.1-16 vim
apt-get install -y apt-utils binutils=2.35.2-2 vim
2 changes: 1 addition & 1 deletion ledger/src/signer/src/bc_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void bc_init_state() {
// -----------------------------------------------------------------------

// Non-volatile blockchain validation state
const bc_state_t N_bc_state_var;
NON_VOLATILE bc_state_t N_bc_state_var;

/*
* Dump hash corresponding to hash_codes[hash_ix] to APDU.
Expand Down
3 changes: 2 additions & 1 deletion ledger/src/signer/src/bc_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

#include "bc.h"
#include "bc_diff.h"
#include "runtime.h"

typedef struct {
uint8_t best_block[HASH_SIZE];
Expand All @@ -56,7 +57,7 @@ typedef struct {
} updating;
} bc_state_t;

extern const bc_state_t N_bc_state_var;
extern NON_VOLATILE bc_state_t N_bc_state_var;
#define N_bc_state (*(bc_state_t*)PIC(&N_bc_state_var))

#ifndef PARAM_INITIAL_BLOCK_HASH
Expand Down

0 comments on commit 5f383c6

Please sign in to comment.