fix(kt-devnet): Update config, endpoints and justfile

* Updates eigenda-devnet config to new `optimism-package` format
* Updates endpoints to match new container names
* Updates `eigenda-devnet-add-tx-fuzzer` command (kt bug fix)
* Updates `eigenda-devnet-restart-batcher` command to use
	`kurtosis service update` introduced in newer kt versions
* Fixes ci after rebase

Author: iquidus

.github/workflows/kurtosis-devnet.yml

@@ -89,37 +89,3 @@ jobs:
           DOCKER_API_VERSION: 1.45
       - run: just eigenda-devnet-test-holesky -v
         working-directory: kurtosis-devnet
-      - run: just eigenda-devnet-test-memstore -v
-        working-directory: kurtosis-devnet
-
-  # This is an optimism devnet which talks to the eigenda holesky testnet via an eigenda-proxy.
-  # TODO: we should connect this to an eigenda kurtosis devnet instead of using our holesky testnet.
-  run_op_eigenda_holesky_devnet:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false # run all matrix jobs even if one fails
-      matrix:
-        # This list should be kept up-to-date with the files in eigenda-template-values
-        valuesFile: ["holesky-sequential-large-blobs.json", "holesky-concurrent-small-blobs.json"]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: jdx/mise-action@v2
-        with:
-          version: ${{ env.MISE_VERSION }}
-          experimental: true
-      # This config gets injected into the eigenda.yaml kurtosis template config file
-      - name: Inject secrets into values config files
-        run: |
-          jq --argjson newconfig '{
-            "eigenda-proxy": {
-              "secrets": {
-                "eigenda.signer-private-key-hex": "${{ secrets.EIGENDA_V1_HOLESKY_TESTNET_SIGNER_KEY }}",
-                "eigenda.eth_rpc": "https://ethereum-holesky-rpc.publicnode.com"
-              }
-            }
-          }' '. *= $newconfig' eigenda-template-values/${{ matrix.valuesFile }} > holesky-config-with-secrets.json
-        working-directory: kurtosis-devnet
-      - run: just eigenda-devnet-start holesky-config-with-secrets.json
-        working-directory: kurtosis-devnet
-      - run: just eigenda-devnet-test-holesky -v
-        working-directory: kurtosis-devnet

kurtosis-devnet/eigenda.yaml

@@ -35,27 +35,29 @@ optimism_package:
     da_bond_size: 0
     da_resolver_refund_percentage: 0
   chains:
-    - participants:
-      - el_type: op-geth
-        # latest tag is currently broken until the next stable release, see https://github.com/ethereum-optimism/op-geth/pull/515
-        # Also see discussion in https://discord.com/channels/1244729134312198194/1260624141497798706/1342556343495692320
-        el_image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:optimism"
-        el_log_level: ""
-        el_extra_env_vars: {}
-        el_extra_labels: {}
-        el_extra_params: []
-        cl_type: op-node
-        cl_image: {{ localDockerImage "op-node" }}
-        cl_log_level: "debug"
-        cl_extra_env_vars: {}
-        cl_extra_labels: {}
-        cl_extra_params: []
-        count: 1
+    op-kurtosis:
+      participants:
+        node0:
+          el:
+            type: op-geth
+            # latest tag is currently broken until the next stable release, see https://github.com/ethereum-optimism/op-geth/pull/515
+            # Also see discussion in https://discord.com/channels/1244729134312198194/1260624141497798706/1342556343495692320
+            image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:optimism"
+            log_level: ""
+            extra_env_vars: {}
+            extra_labels: {}
+            extra_params: []
+          cl:
+            type: op-node
+            image: {{ localDockerImage "op-node" }}
+            log_level: "debug"
+            extra_env_vars: {}
+            extra_labels: {}
+            extra_params: []
       network_params:
         network: "kurtosis"
         network_id: "2151908"
         seconds_per_slot: 2
-        name: "op-kurtosis"
         fjord_time_offset: 0
         granite_time_offset: 0
         holocene_time_offset: 0
@@ -84,14 +86,8 @@ optimism_package:
         extra_params: []
         game_type: 1
         proposal_interval: 10m
-      challenger_params:
-        # TODO: reenable once we start testing secure integrations
-        enabled: false
-        image: {{ localDockerImage "op-challenger" }}
-        cannon_prestate_path: ""
-        cannon_prestates_url: "http://fileserver/proofs/op-program/cannon"
-        extra_params: []
-      da_server_params:
+      da_params:
+        enabled: true
         image: ghcr.io/layr-labs/eigenda-proxy:v1.7.0
         cmd:
           - --addr=0.0.0.0
@@ -116,8 +112,16 @@ optimism_package:
           - --eigenda.v2.signer-payment-key-hex={{ $eigendaV2SignerKey }}
           - --eigenda.v2.eth-rpc={{ $eigendaBackendEthRpc }}
         {{- end }}
-      additional_services:
-        - da_server
+
+  challengers:
+    challenger:
+      # TODO: reenable once we start testing secure integrations
+      enabled: false
+      image: {{ localDockerImage "op-challenger" }}
+      participants: "*"
+      cannon_prestates_url: {{ localPrestate.URL }}
+      cannon_trace_types: ["cannon", "permissioned"]
+      extra_params: []
   global_log_level: "info"
   global_node_selectors: {}
   global_tolerations: []

kurtosis-devnet/justfile

@@ -106,12 +106,12 @@ eigenda-devnet-test-holesky *ARGS="":
     go test ./tests/eigenda/... -run "_Holesky$" -v -timeout 40m {{ARGS}}
 [group('eigenda')]
 eigenda-devnet-add-tx-fuzzer ENCLAVE_NAME="eigenda-devnet" *ARGS="":
-  kurtosis service add {{ENCLAVE_NAME}} tx-fuzz ethpandaops/tx-fuzz:master -- \
-    spam \
-    --sk "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" \
-    --rpc "http://op-el-1-op-geth-op-node-op-kurtosis:8545" \
+  kurtosis service add {{ENCLAVE_NAME}} tx-fuzz ethpandaops/tx-fuzz:master --cmd \
+    "spam \
+    --sk 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 \
+    --rpc http://op-el-2151908-node0-op-geth:8545 \
     --slot-time 2 \
-    --accounts 100 --txcount 1 \
+    --accounts 100 --txcount 1" \
     {{ARGS}}
 
 ##### EigenDA Commands below are for debugging and manual testing #####
@@ -136,13 +136,13 @@ eigenda-devnet-grafana ENCLAVE_NAME="eigenda-devnet":
 [group('eigenda')]
 eigenda-devnet-sync-status ENCLAVE_NAME="eigenda-devnet":
   #!/usr/bin/env bash
-  OPNODE_ENDPOINT=$(kurtosis port print {{ENCLAVE_NAME}} op-cl-1-op-node-op-geth-op-kurtosis http)
+  OPNODE_ENDPOINT=$(kurtosis port print {{ENCLAVE_NAME}} op-cl-2151908-node0-op-node rpc)
   cast rpc optimism_syncStatus --rpc-url $OPNODE_ENDPOINT | jq
 [group('eigenda')]
 eigenda-devnet-configs ENCLAVE_NAME="eigenda-devnet":
   #!/usr/bin/env bash
   echo "OP-NODE ROLLUP CONFIG:"
-  OPNODE_ENDPOINT=$(kurtosis port print {{ENCLAVE_NAME}} op-cl-1-op-node-op-geth-op-kurtosis http)
+  OPNODE_ENDPOINT=$(kurtosis port print {{ENCLAVE_NAME}} op-cl-2151908-node0-op-node http)
   cast rpc optimism_rollupConfig --rpc-url $OPNODE_ENDPOINT | jq
   echo "TEKU L1-CL SPEC:"
   TEKU_ENDPOINT=$(kurtosis port print {{ENCLAVE_NAME}} cl-1-teku-geth http)
@@ -158,49 +158,10 @@ eigenda-devnet-change-proxy-backend backend="V1" ENCLAVE_NAME="eigenda-devnet":
   curl -X PUT $PROXY_ENDPOINT/admin/eigenda-dispersal-backend \
     -H "Content-Type: application/json" \
     -d '{"eigenDADispersalBackend": "{{backend}}"}'
-# We unfortunately have to restart the batcher in this ugly way right now just to change even a single flag.
-# This is b/c op's kurtosis setup right now is not idempotent so if we change a param in a values file
-# and rerun `just eigenda-devnet-start`, the entire devnet gets respun up which takes a long time.
-# Track progress for fixing this in https://github.com/ethereum-optimism/optimism/issues/14390.
-# Kurtosis also doesn't have a simple way to update a running service's config, like `kubectl edit` for k8s.
-# See https://github.com/kurtosis-tech/kurtosis/issues/2628 for this issue.
-# Restart batcher with new flags or image.
+# See https://docs.kurtosis.com/service-update/
 [group('eigenda')]
 eigenda-devnet-restart-batcher ENCLAVE_NAME="eigenda-devnet":
-  #!/usr/bin/env bash
-  # IMAGE=op-batcher:{{ENCLAVE_NAME}}
-  IMAGE=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:v1.10.0
-  kurtosis service add {{ENCLAVE_NAME}} op-batcher-op-kurtosis \
-    $IMAGE \
-    --ports "http=8548,metrics=9001" \
-    -- op-batcher \
-      --l2-eth-rpc=http://op-el-1-op-geth-op-node-op-kurtosis:8545 \
-      --rollup-rpc=http://op-cl-1-op-node-op-geth-op-kurtosis:8547 \
-      --poll-interval=1s \
-      --sub-safety-margin=6 \
-      --num-confirmations=1 \
-      --safe-abort-nonce-too-low-count=3 \
-      --resubmission-timeout=30s \
-      --rpc.addr=0.0.0.0 \
-      --rpc.port=8548 \
-      --rpc.enable-admin \
-      --metrics.enabled \
-      --metrics.addr=0.0.0.0 \
-      --metrics.port=9001 \
-      --l1-eth-rpc=http://el-1-geth-teku:8545 \
-      --private-key=0xb3d2d558e3491a3709b7c451100a0366b5872520c7aa020c17a0e7fa35b6a8df \
-      --data-availability-type=calldata \
-      --altda.enabled=True \
-      --altda.da-server=http://da-server-op-kurtosis:3100 \
-      --altda.da-service \
-      --altda.max-concurrent-da-requests=100 \
-      --max-pending-tx=100 \
-      --max-channel-duration=10 \
-      --target-num-frames=10 \
-      --max-l1-tx-size-bytes=1000 \
-      --batch-type=1 \
-      --throttle-threshold=500_000 \
-      --throttle-block-size=1000
+  kurtosis service update {{ENCLAVE_NAME}} op-batcher-2151908-op-kurtosis
 
 
 # Simple devnet

kurtosis-devnet/tests/eigenda/harness.go

@@ -75,7 +75,7 @@ func NewHarness(t *testing.T) *Harness {
 	testStartL1BlockNum, err := clients.GethL1Client.BlockNumber(ctxWithTimeout)
 	require.NoError(t, err)
 
-	batcherCtx, err := enclaveCtx.GetServiceContext("op-batcher-op-kurtosis")
+	batcherCtx, err := enclaveCtx.GetServiceContext("op-batcher-2151908-op-kurtosis")
 	require.NoError(t, err)
 
 	return &Harness{
@@ -118,10 +118,10 @@ func (h *Harness) QueryBatcherLogs(ctx context.Context, shouldFollowLogs bool, l
 // using external shell commands like `cast rpc ...` and `cast geth ...`.
 // The public endpoints are the ones that are exposed to the host machine.
 type EnclaveServicePublicEndpoints struct {
-	OpNodeEndpoint       string `kurtosis:"op-cl-1-op-node-op-geth-op-kurtosis,http"`
-	OpGethEndpoint       string `kurtosis:"op-el-1-op-geth-op-node-op-kurtosis,rpc"`
+	OpNodeEndpoint       string `kurtosis:"op-cl-2151908-node0-op-node,rpc"`
+	OpGethEndpoint       string `kurtosis:"op-el-2151908-node0-op-geth,rpc"`
 	GethL1Endpoint       string `kurtosis:"el-1-geth-teku,rpc"`
-	EigendaProxyEndpoint string `kurtosis:"da-server-op-kurtosis,http"`
+	EigendaProxyEndpoint string `kurtosis:"op-da-da-server-2151908-op-kurtosis,http"`
 	// Adding new endpoints is as simple as adding a new field with a kurtosis tag
 	// NewServiceEndpoint   string `kurtosis:"new-service-name,port-name"`
 }

op-batcher/readme.md

@@ -111,6 +111,7 @@ When a Tx fails, an asynchronous receipts handler is triggered. The channel from
 > Note: there is an issue with this simple logic. See https://github.com/ethereum-optimism/optimism/issues/13283
 
 #### Channel Times Out
+
 When a Tx is confirmed, an asynchronous receipts handler is triggered. We only update the batcher's state if the channel timed out on chain. In that case, the `blockCursor` is rewound to the first block added to that channel, and the channel queue is cleared out. This allows the batcher to start fresh building a new channel starting from the same block -- it does not need to refetch blocks from the sequencer.
 
 #### AltDA Submission Fails