Merge branch 'master_v2' of github.com:NethermindEth/Taiko-Preconf-AV…

…S-Node into master_v2

Dockerfile

@@ -17,6 +17,10 @@ RUN cargo build -p taiko_preconf_avs_node --release
 # Use ubuntu as the base image
 FROM ubuntu:latest
 
+# Install ca-certificates
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
 # Copy the build artifact from the builder stage
 COPY --from=builder /usr/src/taiko_preconf_avs_node/target/release/taiko_preconf_avs_node /usr/local/bin/taiko_preconf_avs_node
 

SmartContracts/scripts/deployment/deploy_avs.sh

@@ -9,8 +9,17 @@ set -e
 : "${BEACON_GENESIS_TIMESTAMP:?Environment variable BEACON_GENESIS_TIMESTAMP is required}"
 : "${BEACON_BLOCK_ROOT_CONTRACT:?Environment variable BEACON_BLOCK_ROOT_CONTRACT is required}"
 echo "BEACON_GENESIS_TIMESTAMP: $BEACON_GENESIS_TIMESTAMP"
+
+# Check if EVM_VERSION is set and not empty
+if [ -n "$EVM_VERSION" ]; then
+    EVM_VERSION_FLAG="--evm-version $EVM_VERSION"
+else
+    EVM_VERSION_FLAG=""
+fi
+
 forge script scripts/deployment/DeployAVS.s.sol:DeployAVS \
   --fork-url $FORK_URL \
   --broadcast \
   --skip-simulation \
-  --private-key $PRIVATE_KEY
+  --private-key $PRIVATE_KEY \
+  $EVM_VERSION_FLAG

SmartContracts/scripts/deployment/deploy_eigenlayer_mvp.sh

@@ -3,8 +3,16 @@ set -e
 : "${PRIVATE_KEY:?Environment variable PRIVATE_KEY is required}"
 : "${FORK_URL:?Environment variable FORK_URL is required}"
 
+# Check if EVM_VERSION is set and not empty
+if [ -n "$EVM_VERSION" ]; then
+    EVM_VERSION_FLAG="--evm-version $EVM_VERSION"
+else
+    EVM_VERSION_FLAG=""
+fi
+
 forge script scripts/deployment/DeployEigenlayerMVP.s.sol:DeployEigenlayerMVP \
   --rpc-url $FORK_URL \
   --broadcast \
   --skip-simulation \
-  --private-key $PRIVATE_KEY
+  --private-key $PRIVATE_KEY \
+  $EVM_VERSION_FLAG