From 137752325eecfcf0f4229b7f01849f25f2c2cf81 Mon Sep 17 00:00:00 2001
From: Kodey Kilday-Thomas <kodey.kildaythomas@smartcontract.com>
Date: Thu, 20 Jun 2024 14:48:12 +0100
Subject: [PATCH] Ignore L1MessageTx from Gas Calculation

---
 core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml | 4 ++--
 core/chains/evm/gas/chain_specific.go                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml b/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml
index 83b2e4cda7d..cc39990fc18 100644
--- a/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Scroll_Sepolia.toml
@@ -2,7 +2,7 @@ ChainID = '534351'
 FinalityDepth = 10
 FinalityTagEnabled = true
 ChainType = 'scroll'
-LogPollInterval = '3s'
+LogPollInterval = '5s'
 MinIncomingConfirmations = 1
 # Scroll only emits blocks when a new tx is received, so this method of liveness detection is not useful
 NoNewHeadsThreshold = '0'
@@ -13,7 +13,7 @@ PriceMin = '1 wei'
 BumpMin = '100 wei'
 
 [GasEstimator.BlockHistory]
-BlockHistorySize = 500
+BlockHistorySize = 50
 
 [HeadTracker]
 HistoryDepth = 50
diff --git a/core/chains/evm/gas/chain_specific.go b/core/chains/evm/gas/chain_specific.go
index fba2eda66a0..4be7d1972f8 100644
--- a/core/chains/evm/gas/chain_specific.go
+++ b/core/chains/evm/gas/chain_specific.go
@@ -19,7 +19,7 @@ func chainSpecificIsUsable(tx evmtypes.Transaction, baseFee *assets.Wei, chainTy
 			return false
 		}
 	}
-	if chainType == chaintype.ChainOptimismBedrock || chainType == chaintype.ChainKroma {
+	if chainType == chaintype.ChainOptimismBedrock || chainType == chaintype.ChainKroma || chainType == chaintype.ChainScroll {
 		// This is a special deposit transaction type introduced in Bedrock upgrade.
 		// This is a system transaction that it will occur at least one time per block.
 		// We should discard this type before even processing it to avoid flooding the