Merge pull request #508 from fpco/ethereum-bridge-3-exec-action

Ethereum bridge milestone 3: execute bridge actions

Author: side2k

.github/workflows/ci.yml

@@ -90,8 +90,6 @@ jobs:
         run: just anvil
       - name: Ethereum contract tests
         run: just cargo-contract-tests-ethereum
-      - name: Ethereum Anvil CLI smoke
-        run: just ethereum-anvil-cli-smoke
 
   solana-contract:
     name: Solana Tests

contracts/ethereum/e2e/README.md

@@ -1,8 +1,8 @@
 # Bridge E2E (Anvil)
 
 This setup runs a deterministic local Ethereum JSON-RPC node for end-to-end testing.
-During image build, `Bridge` is deployed and Anvil state is snapshotted.
-Container startup loads that snapshot, so the contract is already deployed.
+Container startup runs Anvil with a deterministic mnemonic.
+The bridge is not pre-deployed; tests or smoke checks should deploy it explicitly.
 
 ## Start
 
@@ -18,13 +18,13 @@ cd e2e
 docker compose -f compose.yaml down
 ```
 
-## Rebuild (redeploy contract into snapshot)
+## Rebuild
 
 ```bash
 cd e2e
 docker compose -f compose.yaml build --no-cache
 ```
-Note: image build compiles contracts internally with `forge build` before deployment.
+Note: image build compiles contracts internally with `forge build`.
 
 ## Quick Check
 
@@ -48,4 +48,3 @@ Check the actual mnemonic in the `/bootstrap/mnemonic.txt` file.
 
 - `<admin_address>`: `0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266`
 - `<admin_private_key>`: `0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80`
-- `<bridge_contract_address>`: `0x5FbDB2315678afecb367f032d93F642f64180aa3`

contracts/ethereum/e2e/bridge/Dockerfile

@@ -18,7 +18,7 @@ RUN curl -L https://github.com/ethereum/solidity/releases/download/v0.8.30/solc-
 
 ENV PATH="/root/.foundry/bin:${PATH}"
 
-FROM foundry AS state_builder
+FROM foundry AS contract_builder
 
 WORKDIR /app
 
@@ -27,18 +27,20 @@ ARG ANVIL_MNEMONIC="test test test test test test test test test test test junk"
 COPY foundry.toml foundry.lock ./
 COPY lib ./lib
 COPY src ./src
-COPY e2e/bridge/bootstrap-state.sh /usr/local/bin/bootstrap-state.sh
 
 # Build contract artifacts inside the image.
 RUN forge build --use /usr/local/bin/solc
 
-# Bootstrap chain state and deploy Bridge.
-RUN chmod +x /usr/local/bin/bootstrap-state.sh
-RUN /usr/local/bin/bootstrap-state.sh
-
 FROM foundry
 
-COPY --from=state_builder /bootstrap /bootstrap
+WORKDIR /app
+
+ARG ANVIL_MNEMONIC="test test test test test test test test test test test junk"
+
+RUN mkdir -p /bootstrap && \
+    printf "%s" "${ANVIL_MNEMONIC}" > /bootstrap/mnemonic.txt
+
+COPY --from=contract_builder /app/out /app/out
 COPY e2e/bridge/entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh

contracts/ethereum/e2e/bridge/entrypoint.sh

@@ -30,7 +30,7 @@ then
 
 elif [[ "$1" == "run" ]] || [[ "$1" == "" ]]
 then
-  exec anvil --mnemonic "$ANVIL_MNEMONIC" --host 0.0.0.0 --port 8545 --chain-id 31337 --load-state /bootstrap/state.json
+  exec anvil --mnemonic "$ANVIL_MNEMONIC" --host 0.0.0.0 --port 8545 --chain-id 31337
 fi
 
 exec "$@"

contracts/ethereum/e2e/compose.yaml

@@ -6,6 +6,4 @@ services:
     container_name: bridge-anvil
     ports:
       - "8545:8545"
-    volumes:
-      - ./ethereum-anvil-cli-smoke.sh:/bootstrap/ethereum-anvil-cli-smoke.sh:ro
     restart: unless-stopped