From efae63562c6bd9d14f1ae2645ed40016e12a408d Mon Sep 17 00:00:00 2001 From: fbrv Date: Thu, 26 Sep 2024 15:30:01 +0100 Subject: [PATCH 01/10] fix docker images to specific tag --- docker/pbs.Dockerfile | 4 ++-- docker/signer.Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/pbs.Dockerfile b/docker/pbs.Dockerfile index 2f4666af..116087d9 100644 --- a/docker/pbs.Dockerfile +++ b/docker/pbs.Dockerfile @@ -1,4 +1,4 @@ -FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef +FROM lukemathwalker/cargo-chef:0.1.68-rust-bookworm AS chef WORKDIR /app FROM chef AS planner @@ -14,7 +14,7 @@ COPY . . RUN cargo build --release --bin commit-boost-pbs -FROM debian:bookworm-slim AS runtime +FROM debian:bookworm-20240904-slim AS runtime WORKDIR /app RUN apt-get update && apt-get install -y \ diff --git a/docker/signer.Dockerfile b/docker/signer.Dockerfile index d5835d81..de77cb0f 100644 --- a/docker/signer.Dockerfile +++ b/docker/signer.Dockerfile @@ -1,4 +1,4 @@ -FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef +FROM lukemathwalker/cargo-chef:0.1.68-rust-bookworm AS chef WORKDIR /app FROM chef AS planner @@ -14,7 +14,7 @@ COPY . . RUN cargo build --release --bin commit-boost-signer -FROM debian:bookworm-slim AS runtime +FROM debian:bookworm-20240904-slim AS runtime WORKDIR /app RUN apt-get update && apt-get install -y \ From a89acba2c428e375cec6bad732938ef390b9584d Mon Sep 17 00:00:00 2001 From: fbrv Date: Fri, 27 Sep 2024 12:04:51 +0100 Subject: [PATCH 02/10] add toolchain --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cbec5360..a49ab821 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,5 +62,6 @@ jobs: - name: Run tests uses: actions-rs/cargo@v1 with: + toolchain: stable command: test args: --all --verbose From b7940db9b7dd4773e9d67c0c66b4da964aabcebb Mon Sep 17 00:00:00 2001 From: fbrv Date: Fri, 27 Sep 2024 12:08:45 +0100 Subject: [PATCH 03/10] use another toolchain --- .github/workflows/ci.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a49ab821..d37f98d4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,16 +52,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - - name: Run tests - uses: actions-rs/cargo@v1 - with: - toolchain: stable - command: test - args: --all --verbose + uses: dtolnay/rust-toolchain@stable + - run: cargo test --all-features \ No newline at end of file From 19e74603ba6322408d9c001a40cd3c8a4ba984a9 Mon Sep 17 00:00:00 2001 From: fbrv Date: Fri, 27 Sep 2024 13:00:48 +0100 Subject: [PATCH 04/10] update ci --- .github/workflows/ci.yml | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d37f98d4..8bca4eea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,25 +28,14 @@ jobs: args: --all -- --check clippy: - name: Lint + name: Lint check runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v2 - - - name: Install stable toolchain with clippy available - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - components: clippy - - - name: Run cargo clippy - uses: actions-rs/cargo@v1 - with: - command: clippy - args: --all -- -D warnings + uses: actions/checkout@v4 + - name: Install stable toolchain + uses: dtolnay/rust-toolchain@stable + - run: cargo clippy --all -- -D warnings tests: name: Test runs-on: ubuntu-latest From e2b928a0a3925ca80f56928ba88c884c6d051aa0 Mon Sep 17 00:00:00 2001 From: fbrv Date: Fri, 27 Sep 2024 13:08:37 +0100 Subject: [PATCH 05/10] temp remove ci --- .github/workflows/ci.yml | 47 ---------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 8bca4eea..00000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: CI fmt clippy and test - -on: - pull_request: - branches: ["**"] - -jobs: - rustfmt: - name: Format - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v2 - - - name: Install nightly toolchain with rustfmt available - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true - components: rustfmt - - - name: Run cargo fmt - uses: actions-rs/cargo@v1 - continue-on-error: false - with: - command: fmt - args: --all -- --check - - clippy: - name: Lint check - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - name: Install stable toolchain - uses: dtolnay/rust-toolchain@stable - - run: cargo clippy --all -- -D warnings - tests: - name: Test - runs-on: ubuntu-latest - steps: - - name: Checkout sources - uses: actions/checkout@v4 - - name: Install stable toolchain - uses: dtolnay/rust-toolchain@stable - - run: cargo test --all-features \ No newline at end of file From e09d858fdac306d6a93998187633531bf0051b64 Mon Sep 17 00:00:00 2001 From: fbrv Date: Fri, 27 Sep 2024 13:09:30 +0100 Subject: [PATCH 06/10] re add ci --- .github/workflows/ci.yml | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..8bca4eea --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,47 @@ +name: CI fmt clippy and test + +on: + pull_request: + branches: ["**"] + +jobs: + rustfmt: + name: Format + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v2 + + - name: Install nightly toolchain with rustfmt available + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: nightly + override: true + components: rustfmt + + - name: Run cargo fmt + uses: actions-rs/cargo@v1 + continue-on-error: false + with: + command: fmt + args: --all -- --check + + clippy: + name: Lint check + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v4 + - name: Install stable toolchain + uses: dtolnay/rust-toolchain@stable + - run: cargo clippy --all -- -D warnings + tests: + name: Test + runs-on: ubuntu-latest + steps: + - name: Checkout sources + uses: actions/checkout@v4 + - name: Install stable toolchain + uses: dtolnay/rust-toolchain@stable + - run: cargo test --all-features \ No newline at end of file From b5a6bc30502c0e758236d7d960c684dd5276d068 Mon Sep 17 00:00:00 2001 From: fbrv Date: Fri, 27 Sep 2024 14:29:05 +0100 Subject: [PATCH 07/10] change hex test --- crates/common/src/pbs/types/beacon_block.rs | 10 +++--- .../common/src/pbs/types/execution_payload.rs | 2 +- crates/common/src/pbs/types/get_header.rs | 2 +- tests/data/registration_holesky.json | 34 +++++++++---------- tests/data/signed_blinded_block_holesky.json | 2 +- tests/data/submit_block_response_holesky.json | 34 +++++++++---------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/crates/common/src/pbs/types/beacon_block.rs b/crates/common/src/pbs/types/beacon_block.rs index e17f1f8a..0bf85384 100644 --- a/crates/common/src/pbs/types/beacon_block.rs +++ b/crates/common/src/pbs/types/beacon_block.rs @@ -215,7 +215,7 @@ mod tests { }, "execution_payload_header": { "parent_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", - "fee_recipient": "0xabcf8e0d4e9587369b2301d0790347320302cc09", + "fee_recipient": "0xAbcF8e0d4e9587369b2301D0790347320302cc09", "state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "receipts_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", @@ -237,7 +237,7 @@ mod tests { "message": { "validator_index": "1", "from_bls_pubkey": "0x93247f2209abcacf57b75a51dafae777f9dd38bc7053d1af526f220a7489a6d3a2753e5f3e8b1cfe39b56f43611df74a", - "to_execution_address": "0xabcf8e0d4e9587369b2301d0790347320302cc09" + "to_execution_address": "0xAbcF8e0d4e9587369b2301D0790347320302cc09" }, "signature": "0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505" } @@ -537,7 +537,7 @@ mod tests { }, "execution_payload_header": { "parent_hash": "0xa330251430b91a6fb5342f30a1f527dc76499c03a411464235951dbd51b94d9f", - "fee_recipient": "0xf97e180c050e5ab072211ad2c213eb5aee4df134", + "fee_recipient": "0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134", "state_root": "0x079f2cc22a29388fd4fc20f451cbaa3ff39845d68b2c368ff7be314617418e38", "receipts_root": "0xed980a4cf6df8ba330c14ed9fe0597ec20515f44e5a9adfd2f7b72aa14890996", "logs_bloom": "0x0000000400000008000008000040000000000000000000001000104880000200000004000000400000000204000020002000000000000000000000000022000800000004000000000002000c000000000000000000000100000000000000000000000000000000000000000000000040000000000040000001000014000000010002104000000000000000000000000000000000000000000000000000000080020000000000000000002400000000000001000000000002000200102000000040100002000000000000000000000000000000000000000800000000000000000010000000000000000000000000000000000400002000000000000000200000", @@ -579,7 +579,7 @@ mod tests { "execution_payload": { "parent_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", - "fee_recipient": "0xabcf8e0d4e9587369b2301d0790347320302cc09", + "fee_recipient": "0xAbcF8e0d4e9587369b2301D0790347320302cc09", "state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "receipts_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", @@ -603,7 +603,7 @@ mod tests { { "index": "1", "validator_index": "1", - "address": "0xabcf8e0d4e9587369b2301d0790347320302cc09", + "address": "0xAbcF8e0d4e9587369b2301D0790347320302cc09", "amount": "32000000000" } ] diff --git a/crates/common/src/pbs/types/execution_payload.rs b/crates/common/src/pbs/types/execution_payload.rs index e593f5f1..6df02584 100644 --- a/crates/common/src/pbs/types/execution_payload.rs +++ b/crates/common/src/pbs/types/execution_payload.rs @@ -111,7 +111,7 @@ mod tests { fn test_execution_payload_header() { let data = r#"{ "parent_hash": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", - "fee_recipient": "0xabcf8e0d4e9587369b2301d0790347320302cc09", + "fee_recipient": "0xAbcF8e0d4e9587369b2301D0790347320302cc09", "state_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "receipts_root": "0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", diff --git a/crates/common/src/pbs/types/get_header.rs b/crates/common/src/pbs/types/get_header.rs index f8591a24..069c77fd 100644 --- a/crates/common/src/pbs/types/get_header.rs +++ b/crates/common/src/pbs/types/get_header.rs @@ -67,7 +67,7 @@ mod tests { "message": { "header": { "parent_hash": "0x114d1897fefa402a01a653c21a7f1f1db049d1373a5e73a2d25d7a8045dc02a1", - "fee_recipient": "0x1268ad189526ac0b386faf06effc46779c340ee6", + "fee_recipient": "0x1268AD189526AC0b386faF06eFfC46779c340eE6", "state_root": "0x53ffe6d7d4bbcc5ef71429ce82b3d7bbfffddaed89d53979bf4dca7af0dbe94c", "receipts_root": "0x3d67a1bb141379c352c95126c4dd06a4fe086efdc00b6e919b050c84d79f4df2", "logs_bloom": "0x05440404082f80182749948b189406732c7da48ce83013f11c02562c0d10cc714002025f21c1c64b21293e4c40c5b58e5404aed7922104002008019258ad7020097424e0b01d41eb474dc0cd26c0c9298c640692260452e27104ac808a050a0dc47187f40386108058b301007229b82f0d30bb082c72410043005e32a42c841841184260c0d744a4a9a190840048a4590011e00084ca62a8ce3a030d640350214fbedf09f041823266c491b128800802a200eb1048341000fa810323c4825804643b68ca2301c559881c0e944334c843016e0874010c81009100348a1900e0546014239b02e956940d1408c1824847516850d8de4a110495f3d9a4d8c00808a0", diff --git a/tests/data/registration_holesky.json b/tests/data/registration_holesky.json index ce5df391..111b74e3 100644 --- a/tests/data/registration_holesky.json +++ b/tests/data/registration_holesky.json @@ -1,7 +1,7 @@ [ { "message": { - "fee_recipient": "0x4770b19c113cbc07e220d51e6a9fbc4ed30fa51a", + "fee_recipient": "0x4770B19C113cbC07e220d51E6A9fBC4ED30Fa51a", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0x874564874fc4cb9ce548ce09b2e1614be8ed4be7b7882cef413a09e2b48b9c6e11c67d0e95b5945ace53424c4c2dc70e" @@ -10,7 +10,7 @@ }, { "message": { - "fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd", + "fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0x964fbfc9d5de5723b5e7386c37638f369e23d9df7d1b57ff427935257738518508199652339abd7c9e4cc05f2aa65ca3" @@ -19,7 +19,7 @@ }, { "message": { - "fee_recipient": "0x4b7c65194f8144c930079e6171e4a2c4dc46206e", + "fee_recipient": "0x4b7c65194f8144c930079e6171E4a2c4DC46206e", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0x93a7da94a32c25f8d26d07f4444b59c2534657be319d891515d215bd05ac9acbf8315496d755db38a3ebeec39c761f79" @@ -28,7 +28,7 @@ }, { "message": { - "fee_recipient": "0x4b7c65194f8144c930079e6171e4a2c4dc46206e", + "fee_recipient": "0x4b7c65194f8144c930079e6171E4a2c4DC46206e", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0xa75c8ecc47b74f06ed176506de9bc7b0be16286b88760c53dad3f384858a7411dd9f17659cf0e0b242e9b01bc2c1ec3e" @@ -37,7 +37,7 @@ }, { "message": { - "fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd", + "fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0xb0c82175cf48f0e66dd18ee214447246d8f17050a85a7aaa1d54437110be2d8ce653f27279e759103546134ece5024e1" @@ -46,7 +46,7 @@ }, { "message": { - "fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd", + "fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0xae728adbf92d2543f52d185db6f42e379ae495db5b6c3ea69fd629d35169834d622534bf73ab6f0c081f1b80e6568cd2" @@ -55,7 +55,7 @@ }, { "message": { - "fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd", + "fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0xad95c2ae134f81ef344d101c741aba4f74709d49e8812576606898b9592dfd28b8b56875f9227eb9653532a9fbbf2af9" @@ -64,7 +64,7 @@ }, { "message": { - "fee_recipient": "0x4b7c65194f8144c930079e6171e4a2c4dc46206e", + "fee_recipient": "0x4b7c65194f8144c930079e6171E4a2c4DC46206e", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0x93455720ed2c9d5978fa1ef70499708fe05ce8105a1e1e3fe38b96b9b44cbda407d4b379e5199b5b033c1e448f3a0aee" @@ -73,7 +73,7 @@ }, { "message": { - "fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd", + "fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0xa4401ba2aad5f89230a7031185a96bf442f3d5a8656bf71b26726538d08a6a10e06b401135c06c848160e4fc19af5e85" @@ -82,7 +82,7 @@ }, { "message": { - "fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd", + "fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0x830a2e821aa7e3eef052ea9234cdf8c3318e53fa2362d53de89518ceb38ad406dbc5df758cdc7fc0f5e9cb43856a0c2f" @@ -91,7 +91,7 @@ }, { "message": { - "fee_recipient": "0x4770b19c113cbc07e220d51e6a9fbc4ed30fa51a", + "fee_recipient": "0x4770B19C113cbC07e220d51E6A9fBC4ED30Fa51a", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0x874ac8ddd0bc03aab76387033796ecc35a9eee08e0dd5edbef86fbde9908dc2afdb2d52da6e4a9c2a849b81c717d7370" @@ -100,7 +100,7 @@ }, { "message": { - "fee_recipient": "0x4770b19c113cbc07e220d51e6a9fbc4ed30fa51a", + "fee_recipient": "0x4770B19C113cbC07e220d51E6A9fBC4ED30Fa51a", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0xa525b2c31e0d02f13eecac5886cfd07317dc40db322b686db11df3650ace655edff908a678e15bd61adbeb52f7090396" @@ -109,7 +109,7 @@ }, { "message": { - "fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd", + "fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0xa0c0e2d0caf4e671e1924bad74296595f992210cfb534fff332a99f2911279b2d40a9f9723c9a07a4fb23d7d2b64abb2" @@ -118,7 +118,7 @@ }, { "message": { - "fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd", + "fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0xb5661b161e50bef696f2f0275ef0f67008480e890ae4505b7401e311ee0e0acd0e13aee072aff65e6bd5db1473231d40" @@ -127,7 +127,7 @@ }, { "message": { - "fee_recipient": "0x4770b19c113cbc07e220d51e6a9fbc4ed30fa51a", + "fee_recipient": "0x4770B19C113cbC07e220d51E6A9fBC4ED30Fa51a", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0x913e7a010ac919517c86bf1ec19a86b63c3fb8a0cea9ada5f7a27f0331e07de818cfe84126f36f4a8bf3b6f7e8d56d78" @@ -136,7 +136,7 @@ }, { "message": { - "fee_recipient": "0x4770b19c113cbc07e220d51e6a9fbc4ed30fa51a", + "fee_recipient": "0x4770B19C113cbC07e220d51E6A9fBC4ED30Fa51a", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0x96ceab797644db83f6bfcb0749db5208cbe9870f6b6d17dced68cb6b3f1335b097faeadc68180a9fc3e75f0c2bde4357" @@ -145,7 +145,7 @@ }, { "message": { - "fee_recipient": "0x02a9d3637126923de9369557cd9673aae46666fd", + "fee_recipient": "0x02a9d3637126923De9369557CD9673aae46666Fd", "gas_limit": "30000000", "timestamp": "1716391930", "pubkey": "0xaced93f48c587d7ca64e6013f6398d8adac2f424e981bd85fbed18ca67a4738465d1a56bf10cdc9e4b523c555fe12bdf" diff --git a/tests/data/signed_blinded_block_holesky.json b/tests/data/signed_blinded_block_holesky.json index 54bd93ea..d7ab6c0a 100644 --- a/tests/data/signed_blinded_block_holesky.json +++ b/tests/data/signed_blinded_block_holesky.json @@ -2200,7 +2200,7 @@ }, "execution_payload_header": { "parent_hash": "0x114d1897fefa402a01a653c21a7f1f1db049d1373a5e73a2d25d7a8045dc02a1", - "fee_recipient": "0x477cc10a5b54aed5c88544c2e71ea0581cf64593", + "fee_recipient": "0x477cc10a5b54aeD5C88544C2e71eA0581cf64593", "state_root": "0x6724be16ef8e65681cb66f9c144da67347b8983aa5e3f4662c9b5dba90ab5bc6", "receipts_root": "0xf2f6d2fe6960e4dedad18cca0c7881e6509d551d3e04c1879a627fb8aba30272", "logs_bloom": "0x00000400000000000000848008100000000000000000000004000000010080000000000100000400000000000000000000000000020100000000000000000000080004000000000800008008000000000000000020004000000400000000000000000000000400000000000000000000000000000010000002000010000000000000000000800000200100000000000000004000000000200002000004000000000800000000000000000000000000008000000000000000800000008000000400012002000000000000000000000000000200000000000000000000000000040000000000000000000000000000000000408000000000040000000000000000", diff --git a/tests/data/submit_block_response_holesky.json b/tests/data/submit_block_response_holesky.json index e2f2a171..3456a045 100644 --- a/tests/data/submit_block_response_holesky.json +++ b/tests/data/submit_block_response_holesky.json @@ -3,7 +3,7 @@ "data": { "execution_payload": { "parent_hash": "0x7d1b19deda3378ae27947d8ad904886cde4600fe0f4d608c6ecd742d1ba8181b", - "fee_recipient": "0x32fdfd2ea08d916b8f4e73d057e99bc3358b2f4d", + "fee_recipient": "0x32FdfD2eA08d916B8f4e73d057E99bc3358b2F4D", "state_root": "0x60b508e5a6f505bc8e024a648fcf8c98278184fb674fb7c5544d6e3b196f9606", "receipts_root": "0x358fcd6d92db09e2273fb74eb3d62223aa4f0f77a9b92aec15295ddfdc134403", "logs_bloom": "0x140385010625042c0388589a111c20c068510a0010101250088d01160dd4d49020e0251504a140650484610000805800d0192104872406080101104105254900090020488226404b048d0a0b004409400119008354548454648004801820881500b51640020030d00800010402814891282000881408212c2000601801248440403520c100011413360180818049b0810520a0152821249bc0bd62014c66c021a2081181808810e000aa50a16092098102431303c184000492800010204860145102602a0380210105080019c160580a00122018100242002009914200006054081010220838261009142100e1348500293980192800b44ae3000444580c0004", @@ -134,97 +134,97 @@ { "index": "25404323", "validator_index": "135466", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6791519" }, { "index": "25404324", "validator_index": "135467", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6916089" }, { "index": "25404325", "validator_index": "135468", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6903258" }, { "index": "25404326", "validator_index": "135469", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6905481" }, { "index": "25404327", "validator_index": "135470", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6906478" }, { "index": "25404328", "validator_index": "135471", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6859379" }, { "index": "25404329", "validator_index": "135472", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6850481" }, { "index": "25404330", "validator_index": "135473", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6927834" }, { "index": "25404331", "validator_index": "135474", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6884689" }, { "index": "25404332", "validator_index": "135475", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6905196" }, { "index": "25404333", "validator_index": "135476", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6878941" }, { "index": "25404334", "validator_index": "135477", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6850202" }, { "index": "25404335", "validator_index": "135478", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6868123" }, { "index": "25404336", "validator_index": "135479", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6846854" }, { "index": "25404337", "validator_index": "135480", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6949024" }, { "index": "25404338", "validator_index": "135481", - "address": "0x9baa3244565d51d9c7897c0eb6679ed4890e536e", + "address": "0x9baA3244565d51D9C7897c0EB6679eD4890e536E", "amount": "6796446" } ], From 21d69450773d59aab8c28ebd9772dc9d83ef8cac Mon Sep 17 00:00:00 2001 From: fbrv Date: Fri, 27 Sep 2024 14:33:37 +0100 Subject: [PATCH 08/10] use more recent actions --- .github/workflows/ci.yml | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8bca4eea..d94b7c5f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,23 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@v2 - - - name: Install nightly toolchain with rustfmt available - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true - components: rustfmt - - - name: Run cargo fmt - uses: actions-rs/cargo@v1 - continue-on-error: false - with: - command: fmt - args: --all -- --check - + uses: actions/checkout@v4 + - name: Install nightly toolchain + uses: dtolnay/rust-toolchain@nightly + - run: cargo +nightly fmt --all --check clippy: name: Lint check runs-on: ubuntu-latest From 1548539ea0f09a9eee6284a4be92545002f33230 Mon Sep 17 00:00:00 2001 From: fbrv Date: Fri, 27 Sep 2024 14:37:39 +0100 Subject: [PATCH 09/10] update command --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d94b7c5f..12d25301 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: uses: actions/checkout@v4 - name: Install nightly toolchain uses: dtolnay/rust-toolchain@nightly - - run: cargo +nightly fmt --all --check + - run: rustup component add rustfmt && cargo +nightly fmt --all --check clippy: name: Lint check runs-on: ubuntu-latest From 46785a60d0bd1a61a1366383f4aed72f0de6c7fe Mon Sep 17 00:00:00 2001 From: fbrv Date: Fri, 27 Sep 2024 14:40:00 +0100 Subject: [PATCH 10/10] nightly --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12d25301..9fde3899 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,9 @@ jobs: uses: actions/checkout@v4 - name: Install nightly toolchain uses: dtolnay/rust-toolchain@nightly - - run: rustup component add rustfmt && cargo +nightly fmt --all --check + with: + components: rustfmt + - run: cargo +nightly fmt --all --check clippy: name: Lint check runs-on: ubuntu-latest