This repository was archived by the owner on Aug 3, 2026. It is now read-only.
chore: port hotfix branch changes to main - #695
Closed
smtmfft wants to merge 8 commits into
Closed
Conversation
Signed-off-by: smtmfft <smtm@taiko.xyz>
Signed-off-by: smtmfft <smtm@taiko.xyz>
Signed-off-by: smtmfft <smtm@taiko.xyz>
…690) - Introduced a `batch_block_offset` to track the starting index of each task batch. - Updated the transaction processing loop to include the batch index for the first block in a proposal, ensuring compliance with Shasta anchor rules. - Enhanced the `RethBlockBuilder` initialization to reflect whether the current block is the first in the proposal batch.
* fix: keep enclave signing key out of image builds * fix: support GCP Secret Manager enclave key * chore: update mainnet SGX verifier addresses * chore: update gaiko submodule verifier config * chore: update internal devnet chain spec * fix: align devnet SGX verifier addresses * fix: restore devnet verifier config * fix: align gaiko embedded chain specs * fix: remove invalid shasta chain spec forks * fix: unblock enclave key CI build
Comment on lines
+20
to
+30
| if [ -s /run/secrets/enclave-key.pem ]; then \ | ||
| if [ -n "${ENCLAVE_KEY_PUBLIC_SHA256}" ]; then \ | ||
| test "$(openssl rsa -in /run/secrets/enclave-key.pem -pubout 2>/dev/null | openssl sha256 | awk '{print $2}')" = "${ENCLAVE_KEY_PUBLIC_SHA256}"; \ | ||
| fi; \ | ||
| cp /run/secrets/enclave-key.pem private.pem; \ | ||
| else \ | ||
| test -z "${ENCLAVE_KEY_PUBLIC_SHA256}"; \ | ||
| openssl genrsa -3 -out private.pem 3072; \ | ||
| fi; \ | ||
| ego sign && \ | ||
| ego bundle gaiko-ego gaiko |
Comment on lines
+113
to
124
| if [ -s /run/secrets/enclave-key.pem ]; then \ | ||
| if [ -n "${ENCLAVE_KEY_PUBLIC_SHA256}" ]; then \ | ||
| test "$(openssl rsa -in /run/secrets/enclave-key.pem -pubout 2>/dev/null | openssl sha256 | awk '{print $2}')" = "${ENCLAVE_KEY_PUBLIC_SHA256}"; \ | ||
| fi; \ | ||
| cp /run/secrets/enclave-key.pem "$enclave_key_path"; \ | ||
| else \ | ||
| test -z "${ENCLAVE_KEY_PUBLIC_SHA256}"; \ | ||
| openssl genrsa -3 -out "$enclave_key_path" 3072; \ | ||
| fi; \ | ||
| gramine-manifest -Dlog_level=error -Ddirect_mode=0 -Darch_libdir=/lib/x86_64-linux-gnu/ ../provers/sgx/config/sgx-guest.local.manifest.template sgx-guest.manifest && \ | ||
| gramine-sgx-sign --key "$enclave_key_path" --manifest sgx-guest.manifest --output sgx-guest.manifest.sgx && \ | ||
| gramine-sgx-sigstruct-view "sgx-guest.sig" 2>&1 | tee /tmp/sgx_sigstruct.log |
davidtaikocha
approved these changes
Jun 26, 2026
johntaiko
approved these changes
Jun 26, 2026
Contributor
Author
|
Superseded by a narrower PR from current main that only keeps the enclave-key build hardening. This branch is stale/conflicting and would rewind newer Shasta/gaiko/chainspec changes. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
main: anchor-failure dependency updates, lockfile updates, taiko-reth bump, gaiko bump, batch preflight indexing refactor, and enclave signing-key build hardening.main's deprecated-fork test pruning during conflict resolution; the old hotfix-only tests were not reintroduced.Notes
gaikois updated to7e7a49c48a3b471e2afeadee9494dee380c58e3b.core/src/lib.rsconflict from fix: keep enclave signing key out of image builds #694 only touched tests that no longer exist onmain, so the resolved file has no diff againstmain.Verification
bash -n script/publish-image.shgit diff --check origin/main...HEADrustfmt --edition 2021 --check core/src/lib.rs lib/src/consts.rscargo test -p raiko-lib --features=std consts::tests::raiko_active_forkbuild-gaikofails whenENCLAVE_KEY_PUBLIC_SHA256is set without an enclave-key secret.build-gaikosucceeds with a temporary RSA-3072/e=3 key passed via BuildKit secret and matching public-key hash.