Merge branch 'main' into chore/rename-rpc

ithacaxyz · Oct 21, 2024 · 5e0a2a3 · 5e0a2a3
2 parents 28f3c29 + 41eeef6
commit 5e0a2a3
Show file tree

Hide file tree

Showing 14 changed files with 374 additions and 279 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -34,21 +34,17 @@ jobs:
             echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list
             sudo apt update
             sudo apt install kurtosis-cli
-      - name: Clone optimism-package
-        run: |
-            git clone https://github.com/klkvr/optimism-package
-            cd optimism-package
-            git switch odyssey
       - name: Build Odyssey
         run: docker buildx build . --load -t ghcr.io/ithacaxyz/odyssey:latest
       - name: Run enclave
         id: kurtosis
         run: |
+            git clone https://github.com/klkvr/optimism-package
             kurtosis engine start
             kurtosis run --enclave op-devnet ./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".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".public_ports.rpc.number')
+            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

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.81" # MSRV
+          toolchain: "1.82" # MSRV
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true