Skip to content

Commit

Permalink
chore: migrate to upstream kurtosis package (#70)
Browse files Browse the repository at this point in the history
Uses https://github.com/ethpandaops/optimism-package directly and
updates README a bit as we no more need to build contract deployer image
separately

Also removed hack from #52 as
it shouldn't be needed after
paradigmxyz/reth#11847
  • Loading branch information
klkvr authored Oct 24, 2024
1 parent 6f4a962 commit aa1bf0a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 23 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,15 @@ jobs:
- name: Run enclave
id: kurtosis
run: |
git clone https://github.com/klkvr/optimism-package
cd optimism-package
git checkout e5a9dc4
cd ..
kurtosis engine start
kurtosis run --enclave op-devnet ./optimism-package --args-file ./etc/kurtosis.yaml
kurtosis run --enclave op-devnet github.com/ethpandaops/optimism-package --args-file ./etc/kurtosis.yaml
ENCLAVE_ID=$(curl http://127.0.0.1:9779/api/enclaves | jq --raw-output 'keys[0]')
SEQUENCER_EL_PORT=$(curl "http://127.0.0.1:9779/api/enclaves/$ENCLAVE_ID/services" | jq '."op-el-1-op-reth-op-node-op-kurtosis".public_ports.rpc.number')
REPLICA_EL_PORT=$(curl "http://127.0.0.1:9779/api/enclaves/$ENCLAVE_ID/services" | jq '."op-el-2-op-reth-op-node-op-kurtosis".public_ports.rpc.number')
echo "SEQUENCER_RPC=http://127.0.0.1:$SEQUENCER_EL_PORT" >> $GITHUB_ENV
echo "REPLICA_RPC=http://127.0.0.1:$REPLICA_EL_PORT" >> $GITHUB_ENV
- name: Run E2E tests
run: |
cast send $(cast az) --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" --rpc-url $REPLICA_RPC
cargo nextest run \
--locked \
--workspace \
Expand Down
19 changes: 3 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,23 +103,10 @@ Running a local network with a full Odyssey OP stack with Kurtosis requires some

To get started, follow [these instructions](https://docs.kurtosis.com/install/) to install Kurtosis.

Next, clone and build the modified `optimism-contract-deployer` image:
Next, start a Kurtosis enclave:

```bash
git clone [email protected]:klkvr/optimism-package.git
cd optimism-package
git switch odyssey
docker build . -t ethpandaops/optimism-contract-deployer:latest --progress plain
```

> [!NOTE]
>
> The image may fail to build if you have not allocated enough memory for Docker.
Finally, run start a Kurtosis enclave (ensure you are still in `optimism-package`):

```bash
kurtosis run --enclave op-devnet github.com/klkvr/optimism-package@odyssey \
kurtosis run --enclave op-devnet github.com/ethpandaops/optimism-package \
--args-file https://raw.githubusercontent.com/ithacaxyz/odyssey/main/etc/kurtosis.yaml
```

Expand All @@ -129,7 +116,7 @@ This will start an enclave named `op-devnet`. You can tear down the enclave with
>
> If you want to use a custom build of Odyssey, simply build an Odyssey image with `docker build . -t ghcr.io/ithacaxyz/odyssey:latest`.
Consult the [Kurtosis OP package](https://github.com/ethpandaops/optimism-package) repository for instructions on how to adjust the args file to spin up additional services, like a block exporer.
Consult the [Kurtosis OP package](https://github.com/ethpandaops/optimism-package) repository for instructions on how to adjust the args file to spin up additional services, like a block explorer.

### Wallet extension

Expand Down
3 changes: 2 additions & 1 deletion etc/kurtosis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ optimism_package:
EXP1_WHITELIST: "0x0116686E2291dbd5e317F47faDBFb43B599786Ef"
el_extra_params:
- "--rollup.discovery.v4"
batcher_params:
image: ghcr.io/paradigmxyz/op-batcher:latest
network_params:
network_id: "41144114"
seconds_per_slot: 1
batcher_image: ghcr.io/paradigmxyz/op-batcher:latest

0 comments on commit aa1bf0a

Please sign in to comment.