Merge branch 'main' into relayer_extra_padding_for_contracts

.github/workflows/bridge-ui.yml

@@ -17,7 +17,7 @@ on:
 
 jobs:
   build-and-test:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     uses: ./.github/workflows/bridge-ui--ci.yml
 
   # Deployment name follow the pattern: deploy_<appname(bridge-ui)>_<network(devnet|hekla|mainnet)>_<environment(preview|production)>
@@ -37,7 +37,7 @@ jobs:
 
   # Hekla testnet
   deploy_bridge-ui_hekla_preview:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     needs: build-and-test
     uses: ./.github/workflows/repo--vercel-deploy.yml
     with:
@@ -62,7 +62,7 @@ jobs:
 
   # Mainnet
   deploy_bridge-ui_mainnet_preview:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     needs: build-and-test
     uses: ./.github/workflows/repo--vercel-deploy.yml
     with:

.github/workflows/docs-site--preview.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   deploy-docs-site-preview:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.event.pull_request.head.repo.fork == false }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]' }}
     runs-on: [arc-runner-set]
     steps:
       - name: Install Git

.github/workflows/fork-diff--preview.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   deploy-fork-diff-preview:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     runs-on: [arc-runner-set]
     steps:
       - name: Install Git

.github/workflows/guardian-prover-health-check-ui--ci.yml

@@ -4,7 +4,6 @@ on: workflow_call
 
 jobs:
   check-guardian-prover-health-check-ui:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && !startsWith(github.head_ref, 'refs/heads/dependabot/') }}
     runs-on: [taiko-runner]
     steps:
       - name: Cancel previous runs

.github/workflows/guardian-prover-health-check-ui.yml

@@ -12,6 +12,7 @@ on:
 
 jobs:
   build-and-test:
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     uses: ./.github/workflows/guardian-prover-health-check-ui--ci.yml
 
   # Deployment name follow the pattern: deploy_<appname(guardian-prover-health-check-ui)>_<network(devnet|hekla|mainnet)>_<environment(preview|production)>
@@ -31,7 +32,7 @@ jobs:
 
 
   deploy_guardians-ui_hekla_preview:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     needs: build-and-test
     uses: ./.github/workflows/repo--vercel-deploy.yml
     with:
@@ -43,7 +44,7 @@ jobs:
       vercel_token: ${{ secrets.VERCEL_TOKEN }}
 
   deploy_guardians-ui_mainnet_preview:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     needs: build-and-test
     uses: ./.github/workflows/repo--vercel-deploy.yml
     with:

.github/workflows/guardian-prover-health-check.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   lint-guardian-prover-health-check:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     name: lint-guardian-prover-health-check
     runs-on: [taiko-runner]
     steps:
@@ -32,7 +32,7 @@ jobs:
           args: --config=.golangci.yml --timeout=4m
 
   test-guardian-prover-health-check:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     runs-on: [taiko-runner]
     needs: lint-guardian-prover-health-check
     steps:
@@ -58,7 +58,7 @@ jobs:
 
   push-guardian-prover-health-check-docker-image:
     # Skip dependabot PRs
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && !startsWith(github.head_ref, 'refs/heads/dependabot/') && github.event.pull_request.head.repo.fork == false }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' && github.event.pull_request.head.repo.fork == false }}
     name: Build and push docker image
     runs-on: [taiko-runner]
 

.github/workflows/protocol-monitors.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   deploy-protocol-monitors:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     runs-on: [taiko-runner]
     permissions:
       # Give the necessary permissions for stefanzweifel/git-auto-commit-action.

.github/workflows/protocol.yml

@@ -15,7 +15,7 @@ on:
 
 jobs:
   build-protocol:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     runs-on: [arc-runner-set]
     permissions:
       # Give the necessary permissions for stefanzweifel/git-auto-commit-action.
@@ -69,7 +69,7 @@ jobs:
           pnpm test:deploy:l1
 
   genesis-docker:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     runs-on: [taiko-runner]
     permissions:
       # Give the necessary permissions for stefanzweifel/git-auto-commit-action.

.github/workflows/repo--typo-check.yml

@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   check-for-typos:
-    if: contains(github.event.pull_request.labels.*.name, 'option.workflow_on') || github.event.pull_request.draft == false && github.head_ref != 'release-please-*'
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'option.workflow_on') || github.event.pull_request.draft == false && github.head_ref != 'release-please-*' && github.actor != 'dependabot[bot]' }}
     runs-on: [arc-runner-set]
 
     steps:

.github/workflows/snaefell-ui.yml

@@ -5,11 +5,13 @@ on:
 
 jobs:
   build-and-test:
+    if: ${{ github.actor != 'dependabot[bot]' }}
     uses: ./.github/workflows/snaefell-ui--ci.yml
 
   # Deployment name follow the pattern: deploy_<appname(snaefell-ui)>_<network(devnet|hekla|mainnet)>_<environment(preview|production)>
   # The following Vercel project is not found, so disable it at least for now.
   deploy_snaefell-ui_mainnet_preview:
+    if: ${{ github.actor != 'dependabot[bot]' }}
     needs: build-and-test
     uses: ./.github/workflows/repo--vercel-deploy.yml
     with:
@@ -21,6 +23,7 @@ jobs:
       vercel_token: ${{ secrets.VERCEL_TOKEN }}
 
   deploy_snaefell-ui_mainnet_production:
+    if: ${{ github.actor != 'dependabot[bot]' }}
     needs: build-and-test
     uses: ./.github/workflows/repo--vercel-deploy.yml
     with:

.github/workflows/taiko-client--test.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   lint:
-    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') }}
+    if: ${{ github.event.pull_request.draft == false  && !startsWith(github.head_ref, 'release-please') && github.actor != 'dependabot[bot]' }}
     name: Lint
     runs-on: [ubuntu-latest]
     steps:

packages/taiko-client/proposer/transaction_builder/fallback.go

@@ -143,29 +143,38 @@ func (b *TxBuilderWithFallback) estimateCandidateCost(
 	ctx context.Context,
 	candidate *txmgr.TxCandidate,
 ) (*big.Int, error) {
-	txmgr, _ := b.txmgrSelector.Select()
-	gasTipCap, baseFee, blobBaseFee, err := txmgr.SuggestGasPriceCaps(ctx)
+	txMgr, _ := b.txmgrSelector.Select()
+	gasTipCap, baseFee, blobBaseFee, err := txMgr.SuggestGasPriceCaps(ctx)
 	if err != nil {
 		return nil, err
 	}
 	log.Debug("Suggested gas price", "gasTipCap", gasTipCap, "baseFee", baseFee, "blobBaseFee", blobBaseFee)
 
-	gasPrice := new(big.Int).Add(baseFee, gasTipCap)
-	gasUsed, err := b.rpc.L1.EstimateGas(ctx, ethereum.CallMsg{
-		From:      txmgr.From(),
+	gasFeeCap := new(big.Int).Add(baseFee, gasTipCap)
+	msg := ethereum.CallMsg{
+		From:      txMgr.From(),
 		To:        candidate.To,
 		Gas:       candidate.GasLimit,
-		GasPrice:  gasPrice,
-		GasFeeCap: gasPrice,
+		GasFeeCap: gasFeeCap,
 		GasTipCap: gasTipCap,
 		Value:     candidate.Value,
 		Data:      candidate.TxData,
-	})
+	}
+	if len(candidate.Blobs) != 0 {
+		var blobHashes []common.Hash
+		if _, blobHashes, err = txmgr.MakeSidecar(candidate.Blobs); err != nil {
+			return nil, fmt.Errorf("failed to make sidecar: %w", err)
+		}
+		msg.BlobHashes = blobHashes
+		msg.BlobGasFeeCap = blobBaseFee
+	}
+
+	gasUsed, err := b.rpc.L1.EstimateGas(ctx, msg)
 	if err != nil {
 		return nil, fmt.Errorf("failed to estimate gas used: %w", err)
 	}
 
-	feeWithoutBlob := new(big.Int).Mul(gasPrice, new(big.Int).SetUint64(gasUsed))
+	feeWithoutBlob := new(big.Int).Mul(gasFeeCap, new(big.Int).SetUint64(gasUsed))
 
 	// If its a type-2 transaction, we won't calculate blob fee.
 	if len(candidate.Blobs) == 0 {

packages/taiko-client/proposer/transaction_builder/fallback_test.go

@@ -30,6 +30,13 @@ func (s *TransactionBuilderTestSuite) TestBuildCalldataWithBlobAllowed() {
 	s.NotZero(len(candidate.Blobs))
 }
 
+func (s *TransactionBuilderTestSuite) TestBlobAllowed() {
+	builder := s.newTestBuilderWithFallback(false, false)
+	s.False(builder.BlobAllow())
+	builder = s.newTestBuilderWithFallback(true, false)
+	s.True(builder.BlobAllow())
+}
+
 func (s *TransactionBuilderTestSuite) newTestBuilderWithFallback(blobAllowed, fallback bool) *TxBuilderWithFallback {
 	l1ProposerPrivKey, err := crypto.ToECDSA(common.FromHex(os.Getenv("L1_PROPOSER_PRIVATE_KEY")))
 	s.Nil(err)

release-please-config.json

@@ -27,7 +27,13 @@
     },
     "packages/relayer": {},
     "packages/taiko-client": {
-      "package-name": "taiko-alethia-client"
+      "package-name": "taiko-alethia-client",
+      "extra-files": [
+        {
+          "type": "generic",
+          "path": "internal/version/version.go"
+        }
+      ]
     },
     "packages/ui-lib": {}
   }