test(all): improve test running time && update bindings (#456)

.github/workflows/test.yml

@@ -45,7 +45,7 @@ jobs:
         with:
           repository: taikoxyz/taiko-mono
           path: ${{ env.TAIKO_MONO_DIR }}
-          ref: based_contestable_zkrollup_improved
+          ref: based_contestable_zkrollup_improved_log
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1

bindings/.githead

@@ -1 +1 @@
-b20ff337693efc3191a00ff883d258de322fdf3c
+9d497eae8fd1886dad7ab27bc9c31cb95af9ada5

integration_test/entrypoint.sh

@@ -27,7 +27,7 @@ DEPLOYMENT_JSON=$(cat $TAIKO_MONO_DIR/packages/protocol/deployments/deploy_l1.js
 TAIKO_L1_CONTRACT_ADDRESS=$(echo $DEPLOYMENT_JSON | jq '.taiko' | sed 's/\"//g')
 L1_SIGNAL_SERVICE_CONTRACT_ADDRESS=$(echo $DEPLOYMENT_JSON | jq '.signal_service' | sed 's/\"//g')
 TAIKO_TOKEN_CONTRACT_ADDRESS=$(echo $DEPLOYMENT_JSON | jq '.taiko_token' | sed 's/\"//g')
-ADDRESS_MANAGER_CONTRACT_ADDRESS=$(echo $DEPLOYMENT_JSON | jq '.address_manager_for_rollup' | sed 's/\"//g')
+ADDRESS_MANAGER_CONTRACT_ADDRESS=$(echo $DEPLOYMENT_JSON | jq '.rollup_address_manager' | sed 's/\"//g')
 GUARDIAN_PROVER_CONTRACT_ADDRESS=$(echo $DEPLOYMENT_JSON | jq '.guardian_prover' | sed 's/\"//g')
 ASSIGNMENT_HOOK_CONTRACT_ADDRESS=$(echo $DEPLOYMENT_JSON | jq '.assignment_hook' | sed 's/\"//g')
 TIMELOCK_CONTROLLER=$(echo $DEPLOYMENT_JSON | jq '.timelock_controller' | sed 's/\"//g')

integration_test/nodes/init.sh

@@ -45,6 +45,7 @@ cd $TAIKO_MONO_DIR/packages/protocol &&
     TAIKO_TOKEN_NAME="Taiko Token Test" \
     TAIKO_TOKEN_SYMBOL=TTKOt \
     L2_GENESIS_HASH=$L2_GENESIS_HASH \
+    MIN_GUARDIANS=5 \
     forge script script/DeployOnL1.s.sol:DeployOnL1 \
         --fork-url http://localhost:18545 \
         --broadcast \

pkg/rpc/utils.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"math/big"
+	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -106,23 +107,30 @@ func WaitReceipt(
 		ticker.Stop()
 	}()
 
-	for {
-		select {
-		case <-ctxWithTimeout.Done():
+	// If we are running tests, we don't need to wait for `waitL1OriginPollingInterval` seconds
+	// at first, just start fetching the receipt immediately.
+	if os.Getenv("RUN_TESTS") == "" {
+		<-time.After(waitL1OriginPollingInterval)
+	}
+
+	for ; true; <-ticker.C {
+		if ctxWithTimeout.Err() != nil {
 			return nil, ctxWithTimeout.Err()
-		case <-ticker.C:
-			receipt, err := client.TransactionReceipt(ctxWithTimeout, tx.Hash())
-			if err != nil {
-				continue
-			}
+		}
 
-			if receipt.Status != types.ReceiptStatusSuccessful {
-				return nil, fmt.Errorf("transaction reverted, hash: %s", tx.Hash())
-			}
+		receipt, err := client.TransactionReceipt(ctxWithTimeout, tx.Hash())
+		if err != nil {
+			continue
+		}
 
-			return receipt, nil
+		if receipt.Status != types.ReceiptStatusSuccessful {
+			return nil, fmt.Errorf("transaction reverted, hash: %s", tx.Hash())
 		}
+
+		return receipt, nil
 	}
+
+	return nil, fmt.Errorf("failed to find the receipt for transaction %s", tx.Hash())
 }
 
 // BlockProofStatus represents the proving status of the given L2 block.

prover/prover.go

@@ -395,7 +395,7 @@ func (p *Prover) onBlockProposed(
 	// via API for liveness checks.
 	if p.IsGuardianProver() {
 		if err := p.signBlock(ctx, event.BlockId); err != nil {
-			return fmt.Errorf("faile to sign block data (eventID %d): %w", event.BlockId, err)
+			return fmt.Errorf("failed to sign block data (eventID %d): %w", event.BlockId, err)
 		}
 	}
 

prover/prover_test.go

@@ -266,7 +266,7 @@ func (s *ProverTestSuite) TestContestWrongBlocks() {
 
 	if contestedEvent.Tier >= encoding.TierSgxAndPseZkevmID {
 		approvedSink := make(chan *bindings.GuardianProverApproved)
-		approvedSub, err := s.p.rpc.GuardianProver.WatchApproved(nil, approvedSink, []uint64{})
+		approvedSub, err := s.p.rpc.GuardianProver.WatchApproved(nil, approvedSink, [](*big.Int){})
 		s.Nil(err)
 		defer func() {
 			approvedSub.Unsubscribe()
@@ -276,7 +276,7 @@ func (s *ProverTestSuite) TestContestWrongBlocks() {
 		s.Nil(s.p.selectSubmitter(encoding.TierGuardianID).SubmitProof(context.Background(), <-s.p.proofGenerationCh))
 		approvedEvent := <-approvedSink
 
-		s.Equal(header.Number.Uint64(), approvedEvent.BlockId)
+		s.Equal(header.Number.Uint64(), approvedEvent.OperationId)
 		return
 	}