Skip to content

Commit 2c44e1b

Browse files
fbrvfbrv
andauthored
chore: fix docker images to specific tag (#137)
* fix docker images to specific tag * add toolchain * use another toolchain * update ci * temp remove ci * re add ci * change hex test * use more recent actions * update command * nightly --------- Co-authored-by: fbrv <[email protected]>
1 parent 25308f0 commit 2c44e1b

File tree

9 files changed

+58
-88
lines changed

9 files changed

+58
-88
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,57 +10,27 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout sources
13-
uses: actions/checkout@v2
14-
15-
- name: Install nightly toolchain with rustfmt available
16-
uses: actions-rs/toolchain@v1
13+
uses: actions/checkout@v4
14+
- name: Install nightly toolchain
15+
uses: dtolnay/rust-toolchain@nightly
1716
with:
18-
profile: minimal
19-
toolchain: nightly
20-
override: true
2117
components: rustfmt
22-
23-
- name: Run cargo fmt
24-
uses: actions-rs/cargo@v1
25-
continue-on-error: false
26-
with:
27-
command: fmt
28-
args: --all -- --check
29-
18+
- run: cargo +nightly fmt --all --check
3019
clippy:
31-
name: Lint
20+
name: Lint check
3221
runs-on: ubuntu-latest
3322
steps:
3423
- name: Checkout sources
35-
uses: actions/checkout@v2
36-
37-
- name: Install stable toolchain with clippy available
38-
uses: actions-rs/toolchain@v1
39-
with:
40-
profile: minimal
41-
toolchain: stable
42-
override: true
43-
components: clippy
44-
45-
- name: Run cargo clippy
46-
uses: actions-rs/cargo@v1
47-
with:
48-
command: clippy
49-
args: --all -- -D warnings
24+
uses: actions/checkout@v4
25+
- name: Install stable toolchain
26+
uses: dtolnay/rust-toolchain@stable
27+
- run: cargo clippy --all -- -D warnings
5028
tests:
5129
name: Test
5230
runs-on: ubuntu-latest
5331
steps:
5432
- name: Checkout sources
55-
uses: actions/checkout@v2
33+
uses: actions/checkout@v4
5634
- name: Install stable toolchain
57-
uses: actions-rs/toolchain@v1
58-
with:
59-
profile: minimal
60-
toolchain: stable
61-
override: true
62-
- name: Run tests
63-
uses: actions-rs/cargo@v1
64-
with:
65-
command: test
66-
args: --all --verbose
35+
uses: dtolnay/rust-toolchain@stable
36+
- run: cargo test --all-features

crates/common/src/pbs/types/beacon_block.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ mod tests {
215215
},
216216
"execution_payload_header": {
217217
"parent_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
218-
"fee_recipient": "0xabcf8e0d4e9587369b2301d0790347320302cc09",
218+
"fee_recipient": "0xAbcF8e0d4e9587369b2301D0790347320302cc09",
219219
"state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
220220
"receipts_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
221221
"logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -237,7 +237,7 @@ mod tests {
237237
"message": {
238238
"validator_index": "1",
239239
"from_bls_pubkey": "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a",
240-
"to_execution_address": "0xabcf8e0d4e9587369b2301d0790347320302cc09"
240+
"to_execution_address": "0xAbcF8e0d4e9587369b2301D0790347320302cc09"
241241
},
242242
"signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"
243243
}
@@ -537,7 +537,7 @@ mod tests {
537537
},
538538
"execution_payload_header": {
539539
"parent_hash": "0xa330251430b91a6fb5342f30a1f527dc76499c03a411464235951dbd51b94d9f",
540-
"fee_recipient": "0xf97e180c050e5ab072211ad2c213eb5aee4df134",
540+
"fee_recipient": "0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134",
541541
"state_root": "0x079f2cc22a29388fd4fc20f451cbaa3ff39845d68b2c368ff7be314617418e38",
542542
"receipts_root": "0xed980a4cf6df8ba330c14ed9fe0597ec20515f44e5a9adfd2f7b72aa14890996",
543543
"logs_bloom": "0x0000000400000008000008000040000000000000000000001000104880000200000004000000400000000204000020002000000000000000000000000022000800000004000000000002000c000000000000000000000100000000000000000000000000000000000000000000000040000000000040000001000014000000010002104000000000000000000000000000000000000000000000000000000080020000000000000000002400000000000001000000000002000200102000000040100002000000000000000000000000000000000000000800000000000000000010000000000000000000000000000000000400002000000000000000200000",
@@ -579,7 +579,7 @@ mod tests {
579579
"execution_payload": {
580580
"parent_hash":
581581
"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
582-
"fee_recipient": "0xabcf8e0d4e9587369b2301d0790347320302cc09",
582+
"fee_recipient": "0xAbcF8e0d4e9587369b2301D0790347320302cc09",
583583
"state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
584584
"receipts_root":
585585
"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
@@ -603,7 +603,7 @@ mod tests {
603603
{
604604
"index": "1",
605605
"validator_index": "1",
606-
"address": "0xabcf8e0d4e9587369b2301d0790347320302cc09",
606+
"address": "0xAbcF8e0d4e9587369b2301D0790347320302cc09",
607607
"amount": "32000000000"
608608
}
609609
]

crates/common/src/pbs/types/execution_payload.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ mod tests {
111111
fn test_execution_payload_header() {
112112
let data = r#"{
113113
"parent_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
114-
"fee_recipient": "0xabcf8e0d4e9587369b2301d0790347320302cc09",
114+
"fee_recipient": "0xAbcF8e0d4e9587369b2301D0790347320302cc09",
115115
"state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
116116
"receipts_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2",
117117
"logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",

crates/common/src/pbs/types/get_header.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ mod tests {
6767
"message": {
6868
"header": {
6969
"parent_hash": "0x114d1897fefa402a01a653c21a7f1f1db049d1373a5e73a2d25d7a8045dc02a1",
70-
"fee_recipient": "0x1268ad189526ac0b386faf06effc46779c340ee6",
70+
"fee_recipient": "0x1268AD189526AC0b386faF06eFfC46779c340eE6",
7171
"state_root": "0x53ffe6d7d4bbcc5ef71429ce82b3d7bbfffddaed89d53979bf4dca7af0dbe94c",
7272
"receipts_root": "0x3d67a1bb141379c352c95126c4dd06a4fe086efdc00b6e919b050c84d79f4df2",
7373
"logs_bloom": "0x05440404082f80182749948b189406732c7da48ce83013f11c02562c0d10cc714002025f21c1c64b21293e4c40c5b58e5404aed7922104002008019258ad7020097424e0b01d41eb474dc0cd26c0c9298c640692260452e27104ac808a050a0dc47187f40386108058b301007229b82f0d30bb082c72410043005e32a42c841841184260c0d744a4a9a190840048a4590011e00084ca62a8ce3a030d640350214fbedf09f041823266c491b128800802a200eb1048341000fa810323c4825804643b68ca2301c559881c0e944334c843016e0874010c81009100348a1900e0546014239b02e956940d1408c1824847516850d8de4a110495f3d9a4d8c00808a0",

docker/pbs.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
1+
FROM lukemathwalker/cargo-chef:0.1.68-rust-bookworm AS chef
22
WORKDIR /app
33

44
FROM chef AS planner
@@ -14,7 +14,7 @@ COPY . .
1414
RUN cargo build --release --bin commit-boost-pbs
1515

1616

17-
FROM debian:bookworm-slim AS runtime
17+
FROM debian:bookworm-20240904-slim AS runtime
1818
WORKDIR /app
1919

2020
RUN apt-get update && apt-get install -y \

docker/signer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
1+
FROM lukemathwalker/cargo-chef:0.1.68-rust-bookworm AS chef
22
WORKDIR /app
33

44
FROM chef AS planner
@@ -14,7 +14,7 @@ COPY . .
1414
RUN cargo build --release --bin commit-boost-signer
1515

1616

17-
FROM debian:bookworm-slim AS runtime
17+
FROM debian:bookworm-20240904-slim AS runtime
1818
WORKDIR /app
1919

2020
RUN apt-get update && apt-get install -y \

tests/data/registration_holesky.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"message": {
4-
"fee_recipient": "0x4770b19c113cbc07e220d51e6a9fbc4ed30fa51a",
4+
"fee_recipient": "0x4770B19C113cbC07e220d51E6A9fBC4ED30Fa51a",
55
"gas_limit": "30000000",
66
"timestamp": "1716391930",
77
"pubkey": "0x874564874fc4cb9ce548ce09b2e1614be8ed4be7b7882cef413a09e2b48b9c6e11c67d0e95b5945ace53424c4c2dc70e"
@@ -10,7 +10,7 @@
1010
},
1111
{
1212
"message": {
13-
"fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd",
13+
"fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd",
1414
"gas_limit": "30000000",
1515
"timestamp": "1716391930",
1616
"pubkey": "0x964fbfc9d5de5723b5e7386c37638f369e23d9df7d1b57ff427935257738518508199652339abd7c9e4cc05f2aa65ca3"
@@ -19,7 +19,7 @@
1919
},
2020
{
2121
"message": {
22-
"fee_recipient": "0x4b7c65194f8144c930079e6171e4a2c4dc46206e",
22+
"fee_recipient": "0x4b7c65194f8144c930079e6171E4a2c4DC46206e",
2323
"gas_limit": "30000000",
2424
"timestamp": "1716391930",
2525
"pubkey": "0x93a7da94a32c25f8d26d07f4444b59c2534657be319d891515d215bd05ac9acbf8315496d755db38a3ebeec39c761f79"
@@ -28,7 +28,7 @@
2828
},
2929
{
3030
"message": {
31-
"fee_recipient": "0x4b7c65194f8144c930079e6171e4a2c4dc46206e",
31+
"fee_recipient": "0x4b7c65194f8144c930079e6171E4a2c4DC46206e",
3232
"gas_limit": "30000000",
3333
"timestamp": "1716391930",
3434
"pubkey": "0xa75c8ecc47b74f06ed176506de9bc7b0be16286b88760c53dad3f384858a7411dd9f17659cf0e0b242e9b01bc2c1ec3e"
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"message": {
40-
"fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd",
40+
"fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd",
4141
"gas_limit": "30000000",
4242
"timestamp": "1716391930",
4343
"pubkey": "0xb0c82175cf48f0e66dd18ee214447246d8f17050a85a7aaa1d54437110be2d8ce653f27279e759103546134ece5024e1"
@@ -46,7 +46,7 @@
4646
},
4747
{
4848
"message": {
49-
"fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd",
49+
"fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd",
5050
"gas_limit": "30000000",
5151
"timestamp": "1716391930",
5252
"pubkey": "0xae728adbf92d2543f52d185db6f42e379ae495db5b6c3ea69fd629d35169834d622534bf73ab6f0c081f1b80e6568cd2"
@@ -55,7 +55,7 @@
5555
},
5656
{
5757
"message": {
58-
"fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd",
58+
"fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd",
5959
"gas_limit": "30000000",
6060
"timestamp": "1716391930",
6161
"pubkey": "0xad95c2ae134f81ef344d101c741aba4f74709d49e8812576606898b9592dfd28b8b56875f9227eb9653532a9fbbf2af9"
@@ -64,7 +64,7 @@
6464
},
6565
{
6666
"message": {
67-
"fee_recipient": "0x4b7c65194f8144c930079e6171e4a2c4dc46206e",
67+
"fee_recipient": "0x4b7c65194f8144c930079e6171E4a2c4DC46206e",
6868
"gas_limit": "30000000",
6969
"timestamp": "1716391930",
7070
"pubkey": "0x93455720ed2c9d5978fa1ef70499708fe05ce8105a1e1e3fe38b96b9b44cbda407d4b379e5199b5b033c1e448f3a0aee"
@@ -73,7 +73,7 @@
7373
},
7474
{
7575
"message": {
76-
"fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd",
76+
"fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd",
7777
"gas_limit": "30000000",
7878
"timestamp": "1716391930",
7979
"pubkey": "0xa4401ba2aad5f89230a7031185a96bf442f3d5a8656bf71b26726538d08a6a10e06b401135c06c848160e4fc19af5e85"
@@ -82,7 +82,7 @@
8282
},
8383
{
8484
"message": {
85-
"fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd",
85+
"fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd",
8686
"gas_limit": "30000000",
8787
"timestamp": "1716391930",
8888
"pubkey": "0x830a2e821aa7e3eef052ea9234cdf8c3318e53fa2362d53de89518ceb38ad406dbc5df758cdc7fc0f5e9cb43856a0c2f"
@@ -91,7 +91,7 @@
9191
},
9292
{
9393
"message": {
94-
"fee_recipient": "0x4770b19c113cbc07e220d51e6a9fbc4ed30fa51a",
94+
"fee_recipient": "0x4770B19C113cbC07e220d51E6A9fBC4ED30Fa51a",
9595
"gas_limit": "30000000",
9696
"timestamp": "1716391930",
9797
"pubkey": "0x874ac8ddd0bc03aab76387033796ecc35a9eee08e0dd5edbef86fbde9908dc2afdb2d52da6e4a9c2a849b81c717d7370"
@@ -100,7 +100,7 @@
100100
},
101101
{
102102
"message": {
103-
"fee_recipient": "0x4770b19c113cbc07e220d51e6a9fbc4ed30fa51a",
103+
"fee_recipient": "0x4770B19C113cbC07e220d51E6A9fBC4ED30Fa51a",
104104
"gas_limit": "30000000",
105105
"timestamp": "1716391930",
106106
"pubkey": "0xa525b2c31e0d02f13eecac5886cfd07317dc40db322b686db11df3650ace655edff908a678e15bd61adbeb52f7090396"
@@ -109,7 +109,7 @@
109109
},
110110
{
111111
"message": {
112-
"fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd",
112+
"fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd",
113113
"gas_limit": "30000000",
114114
"timestamp": "1716391930",
115115
"pubkey": "0xa0c0e2d0caf4e671e1924bad74296595f992210cfb534fff332a99f2911279b2d40a9f9723c9a07a4fb23d7d2b64abb2"
@@ -118,7 +118,7 @@
118118
},
119119
{
120120
"message": {
121-
"fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd",
121+
"fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd",
122122
"gas_limit": "30000000",
123123
"timestamp": "1716391930",
124124
"pubkey": "0xb5661b161e50bef696f2f0275ef0f67008480e890ae4505b7401e311ee0e0acd0e13aee072aff65e6bd5db1473231d40"
@@ -127,7 +127,7 @@
127127
},
128128
{
129129
"message": {
130-
"fee_recipient": "0x4770b19c113cbc07e220d51e6a9fbc4ed30fa51a",
130+
"fee_recipient": "0x4770B19C113cbC07e220d51E6A9fBC4ED30Fa51a",
131131
"gas_limit": "30000000",
132132
"timestamp": "1716391930",
133133
"pubkey": "0x913e7a010ac919517c86bf1ec19a86b63c3fb8a0cea9ada5f7a27f0331e07de818cfe84126f36f4a8bf3b6f7e8d56d78"
@@ -136,7 +136,7 @@
136136
},
137137
{
138138
"message": {
139-
"fee_recipient": "0x4770b19c113cbc07e220d51e6a9fbc4ed30fa51a",
139+
"fee_recipient": "0x4770B19C113cbC07e220d51E6A9fBC4ED30Fa51a",
140140
"gas_limit": "30000000",
141141
"timestamp": "1716391930",
142142
"pubkey": "0x96ceab797644db83f6bfcb0749db5208cbe9870f6b6d17dced68cb6b3f1335b097faeadc68180a9fc3e75f0c2bde4357"
@@ -145,7 +145,7 @@
145145
},
146146
{
147147
"message": {
148-
"fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd",
148+
"fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd",
149149
"gas_limit": "30000000",
150150
"timestamp": "1716391930",
151151
"pubkey": "0xaced93f48c587d7ca64e6013f6398d8adac2f424e981bd85fbed18ca67a4738465d1a56bf10cdc9e4b523c555fe12bdf"

tests/data/signed_blinded_block_holesky.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2200,7 +2200,7 @@
22002200
},
22012201
"execution_payload_header": {
22022202
"parent_hash": "0x114d1897fefa402a01a653c21a7f1f1db049d1373a5e73a2d25d7a8045dc02a1",
2203-
"fee_recipient": "0x477cc10a5b54aed5c88544c2e71ea0581cf64593",
2203+
"fee_recipient": "0x477cc10a5b54aeD5C88544C2e71eA0581cf64593",
22042204
"state_root": "0x6724be16ef8e65681cb66f9c144da67347b8983aa5e3f4662c9b5dba90ab5bc6",
22052205
"receipts_root": "0xf2f6d2fe6960e4dedad18cca0c7881e6509d551d3e04c1879a627fb8aba30272",
22062206
"logs_bloom": "0x00000400000000000000848008100000000000000000000004000000010080000000000100000400000000000000000000000000020100000000000000000000080004000000000800008008000000000000000020004000000400000000000000000000000400000000000000000000000000000010000002000010000000000000000000800000200100000000000000004000000000200002000004000000000800000000000000000000000000008000000000000000800000008000000400012002000000000000000000000000000200000000000000000000000000040000000000000000000000000000000000408000000000040000000000000000",

0 commit comments

Comments
 (0)