Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/aggkit-e2e-single-chain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ on:
required: false
type: boolean
default: false

fail-fast:
description: "Stop test execution on first failure"
required: false
Expand Down Expand Up @@ -184,7 +184,6 @@ jobs:
else
# Always-run tests
run_test ./tests/aggkit/bridge-e2e.bats
run_test ./tests/aggkit/e2e-pp.bats
run_test ./tests/aggkit/bridge-sovereign-chain-e2e.bats

# Extra tests, whose execution is time consuming
Expand Down
7 changes: 4 additions & 3 deletions TESTSINVENTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,12 @@ Table of tests currently implemented or being implemented in the E2E repository.
| Remove single validator from committee | [Link](./tests/aggkit/aggsender-committee-updates.bats#L147) | |
| Test Aggoracle committee | [Link](./tests/aggkit/bridge-e2e-aggoracle-committee.bats#L10) | |
| Test L2 to L2 bridge | [Link](./tests/aggkit/bridge-e2e-2-chains.bats#L15) | |
| Test Sovereign Chain Bridge Events | [Link](./tests/aggkit/bridge-sovereign-chain-e2e.bats#L48) | |
| Test Sovereign Chain Bridge Events | [Link](./tests/aggkit/bridge-sovereign-chain-e2e.bats#L57) | |
| Test backwardLET with reorg scenarios | [Link](./tests/aggkit/bridge-sovereign-chain-e2e.bats#L319) | |
| Test block gas limit increase to 60M | [Link](./tests/fusaka/eip7935.bats#L19) | |
| Test execute multiple claimMessages via testClaim with internal reentrancy and bridgeAsset call | [Link](./tests/aggkit/claim-reetrancy.bats#L472) | |
| Test inject invalid GER on L2 (bridges are valid) | [Link](./tests/aggkit/bridge-sovereign-chain-e2e.bats#L212) | |
| Test forwardLET with reorg scenarios | [Link](./tests/aggkit/bridge-sovereign-chain-e2e.bats#L507) | |
| Test inject invalid GER on L2 - B1 case | [Link](./tests/aggkit/bridge-sovereign-chain-e2e.bats#L221) | |
| Test invalid GER injection case A (FEP mode) | [Link](./tests/aggkit/latest-n-injected-ger.bats#L825) | |
| Test invalid GER injection case A (PP mode) | [Link](./tests/aggkit/latest-n-injected-ger.bats#L716) | |
| Test invalid GER injection case B2 (FEP mode) | [Link](./tests/aggkit/latest-n-injected-ger.bats#L396) | |
Expand All @@ -307,7 +309,6 @@ Table of tests currently implemented or being implemented in the E2E repository.
| Transfer message L2 to L2 | [Link](./tests/aggkit/bridge-e2e-2-chains.bats#L68) | |
| Transfer message | [Link](./tests/aggkit/bridge-e2e.bats#L11) | |
| Verify batches | [Link](./tests/zkevm/batch-verification.bats#L10) | |
| Verify certificate settlement | [Link](./tests/aggkit/e2e-pp.bats#L10) | |
| foo | [Link](./tests/foo.bats#L10) | |
| p256verify call | [Link](./tests/fusaka/eip7951.bats#L46) | |
| prover stress test | [Link](./tests/pessimistic/prover-stress.bats#L10) | |
Expand Down
33 changes: 33 additions & 0 deletions core/helpers/agglayer-cdk-common-setup.bash
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ _agglayer_cdk_common_setup() {
# ✅ Resolve URLs
_resolve_required_urls

manage_kurtosis_service "stop" "zkevm-bridge-service-001"

# ✅ Generate and fund wallet
_generate_and_fund_wallet

Expand Down Expand Up @@ -598,3 +600,34 @@ log_prefix_test(){
echo "=== $1 $test_log_prefix" >&3
echo "=====================================================================" >&3
}

# Helper function to manage kurtosis service
manage_kurtosis_service() {
local action="$1" # start or stop
local service="$2"

if [[ "$action" == "stop" ]]; then
# Check if service is running before attempting to stop
if kurtosis service inspect "$ENCLAVE_NAME" "$service" >/dev/null 2>&1; then
echo "Stopping $service..." >&3
kurtosis service stop "$ENCLAVE_NAME" "$service" || {
echo "Error: Failed to stop $service" >&3
return 1
}
echo "$service stopped." >&3
else
echo "$service is not running, skipping stop." >&3
fi
elif [[ "$action" == "start" ]]; then
if kurtosis service inspect "$ENCLAVE_NAME" "$service" >/dev/null 2>&1; then
echo "Starting $service..." >&3
kurtosis service start "$ENCLAVE_NAME" "$service" || {
echo "Error: Failed to start $service" >&3
return 1
}
echo "$service started." >&3
else
echo "$service is not running, skipping start." >&3
fi
fi
}
26 changes: 0 additions & 26 deletions core/helpers/scripts/kurtosis-helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,3 @@ function kurtosis_filer_exec_method() {
# So if kurtosis version is <1.7.0 need tail -n +2, if not just same output
dpkg --compare-versions "$_kurtosis_version" "ge" "1.7.0" && cat || tail -n +2
}

function update_kurtosis_service_state() {
local service="$1"
local action="$2" # start or stop

if [[ "$action" == "stop" ]]; then
if docker ps | grep "$service"; then
echo "Stopping $service..." >&3
kurtosis service stop "$ENCLAVE_NAME" "$service" || {
echo "Error: Failed to stop $service" >&3
return 1
}
echo "$service stopped." >&3
else
echo "Error: $service does not exist in enclave $ENCLAVE_NAME" >&3
return 1
fi
elif [[ "$action" == "start" ]]; then
echo "Starting $service..." >&3
kurtosis service start "$ENCLAVE_NAME" "$service" || {
echo "Error: Failed to start $service" >&3
return 1
}
echo "$service started." >&3
fi
}
8 changes: 4 additions & 4 deletions tests/aggkit/bridge-e2e-aggoracle-committee.bats
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ setup() {
assert_success

echo "Step 2: Stopping aggkit-001-aggoracle-committee-001, aggkit-001-aggoracle-committee-002 service..." >&3
update_kurtosis_service_state "aggkit-001-aggoracle-committee-001" "stop"
update_kurtosis_service_state "aggkit-001-aggoracle-committee-002" "stop"
manage_kurtosis_service "stop" "aggkit-001-aggoracle-committee-001"
manage_kurtosis_service "stop" "aggkit-001-aggoracle-committee-002"

echo "Step 3: Bridging asset from L1 to L2 (without claiming)..." >&3
destination_addr=$sender_addr
Expand All @@ -43,8 +43,8 @@ setup() {
assert_equal "$l2_ger_status" "0"

echo "Step 5: Starting aggkit-001-aggoracle-committee-001, aggkit-001-aggoracle-committee-002 service..." >&3
update_kurtosis_service_state "aggkit-001-aggoracle-committee-001" "start"
update_kurtosis_service_state "aggkit-001-aggoracle-committee-002" "start"
manage_kurtosis_service "start" "aggkit-001-aggoracle-committee-001"
manage_kurtosis_service "start" "aggkit-001-aggoracle-committee-002"

echo "Step 6: Attempting to claim the second bridge transaction..., should succeed" >&3
run process_bridge_claim "aggoracle_committee: $LINENO" "$l1_rpc_network_id" "$bridge_tx_hash" "$l2_rpc_network_id" "$l2_bridge_addr" "$aggkit_bridge_url" "$aggkit_bridge_url" "$L2_RPC_URL" "$sender_addr"
Expand Down
Loading