addressed feedback

0xPolygon · Dec 12, 2024 · 797e048 · 797e048
1 parent 832a21a
commit 797e048
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 120 deletions.
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -95,6 +95,8 @@ jobs:
         KURTOSIS_FOLDER: ${{ github.workspace }}/kurtosis-cdk
         BATS_LIB_PATH: /usr/lib/
         agglayer_prover_sp1_key: ${{ secrets.SP1_PRIVATE_KEY }}
+        TARGET_CERTIFICATE: 2
+        DEPOSIT_COUNT: 2
 
     - name: Dump enclave logs
       if: failure()

diff --git a/test/Makefile b/test/Makefile
@@ -101,8 +101,7 @@ test-e2e-fork12-rollup: stop
 .PHONY: test-e2e-fork12-pessimistic
 test-e2e-fork12-pessimistic: stop
 	./run-e2e.sh fork12 pessimistic
-	bats bats/pp/bridge-ci-e2e.bats
-	bats bats/pp/e2e-pp.bats
+	bats bats/pp/
 
 .PHONY: stop
 stop:

diff --git a/test/bats/pp/bridge-ci-e2e.bats b/test/bats/pp/bridge-ci-e2e.bats
diff --git a/test/bats/pp/bridge-e2e.bats b/test/bats/pp/bridge-e2e.bats
@@ -16,6 +16,7 @@ setup() {
     fi
     echo "Bridge address=$BRIDGE_ADDRESS" >&3
 
+    readonly deposit_count=${DEPOSIT_COUNT:-1}
     readonly sender_private_key=${SENDER_PRIVATE_KEY:-"12d7de8621a77640c9241b2595ba78ce443d05e94090365ab3bb5e19df82c625"}
     readonly sender_addr="$(cast wallet address --private-key $sender_private_key)"
     destination_net=${DESTINATION_NET:-"1"}
@@ -54,24 +55,34 @@ setup() {
     local initial_receiver_balance=$(cast call --rpc-url "$l2_rpc_url" "$weth_token_addr" "$balance_of_fn_sig" "$destination_addr" | awk '{print $1}')
     echo "Initial receiver balance of native token on L2 $initial_receiver_balance" >&3
 
-    echo "=== Running LxLy deposit on L1 to network: $l2_rpc_network_id native_token: $native_token_addr" >&3
+    for i in $(seq 1 $deposit_count); do
+        echo "=== Running #$i LxLy deposit on L1 to network: $l2_rpc_network_id native_token: $native_token_addr" >&3
 
-    destination_net=$l2_rpc_network_id
-    run bridge_asset "$native_token_addr" "$l1_rpc_url"
-    assert_success
+        destination_net=$l2_rpc_network_id
+        destination_net=1
+        run bridge_asset "$native_token_addr" "$l1_rpc_url"
+        assert_success
 
-    echo "=== Running LxLy claim on L2" >&3
-    timeout="120"
-    claim_frequency="10"
-    run wait_for_claim "$timeout" "$claim_frequency" "$l2_rpc_url"
-    assert_success
+        echo "=== Running #$i LxLy claim on L2" >&3
+        timeout="120"
+        claim_frequency="10"
+        run wait_for_claim "$timeout" "$claim_frequency" "$l2_rpc_url"
+        assert_success
 
-    run verify_balance "$l2_rpc_url" "$weth_token_addr" "$destination_addr" "$initial_receiver_balance" "$ether_value"
-    assert_success
+        run verify_balance "$l2_rpc_url" "$weth_token_addr" "$destination_addr" \
+        "$initial_receiver_balance" "$ether_value"
+        assert_success
 
-    echo "=== bridgeAsset L2 WETH: $weth_token_addr to L1 ETH" >&3
-    destination_addr=$sender_addr
-    destination_net=0
-    run bridge_asset "$weth_token_addr" "$l2_rpc_url"
-    assert_success
+        echo "=== bridgeAsset L2 WETH: $weth_token_addr to L1 ETH" >&3
+        destination_addr=$sender_addr
+        destination_net=0
+        run bridge_asset "$weth_token_addr" "$l2_rpc_url"
+        assert_success
+
+        echo "Waiting for agglayer certificate to settle before sending another transaction..." >&3
+        settle_certificates_target=1
+        agglayer_timeout=600
+        run $PROJECT_ROOT/../scripts/agglayer_certificates_monitor.sh "$settle_certificates_target" "$agglayer_timeout" "$l2_rpc_network_id"
+        assert_success
+    done
 }
diff --git a/test/bats/pp/e2e-pp.bats b/test/bats/pp/e2e-pp.bats
@@ -3,6 +3,7 @@ setup() {
 
     _common_setup
 
+    local target_certificate=${TARGET_CERTIFICATE:-1}
     if [ -z "$BRIDGE_ADDRESS" ]; then
         local combined_json_file="/opt/zkevm/combined.json"
         echo "BRIDGE_ADDRESS env variable is not provided, resolving the bridge address from the Kurtosis CDK '$combined_json_file'" >&3
@@ -21,6 +22,7 @@ setup() {
     readonly bridge_addr=$BRIDGE_ADDRESS
     readonly l2_rpc_network_id=$(cast call --rpc-url $l2_rpc_url $bridge_addr 'networkID() (uint32)')
 
-    run $PROJECT_ROOT/../scripts/agglayer_certificates_monitor.sh 2 600 $l2_rpc_network_id
+    run $PROJECT_ROOT/../scripts/agglayer_certificates_monitor.sh \
+    $target_certificate 600 $l2_rpc_network_id
     assert_success
-}
+}