feat(contracts): remove rate limiter related codes (#978)

Co-authored-by: silathdiir <silathdiir@users.noreply.github.com>

bridge-history-api/internal/controller/history_controller.go

@@ -49,6 +49,8 @@ func (c *HistoryController) GetAllClaimableTxsByAddr(ctx *gin.Context) {
 	cacheKey := cacheKeyPrefixClaimableTxsByAddr + req.Address
 	if cachedData, found := c.cache.Get(cacheKey); found {
 		c.cacheMetrics.cacheHits.WithLabelValues("GetAllClaimableTxsByAddr").Inc()
+		// Log cache hit along with request param.
+		log.Info("cache hit", "request", req)
 		if cachedData == nil {
 			types.RenderSuccess(ctx, &types.ResultData{})
 			return
@@ -60,6 +62,8 @@ func (c *HistoryController) GetAllClaimableTxsByAddr(ctx *gin.Context) {
 		log.Error("unexpected type in cache", "expected", "*types.ResultData", "got", reflect.TypeOf(cachedData))
 	} else {
 		c.cacheMetrics.cacheMisses.WithLabelValues("GetAllClaimableTxsByAddr").Inc()
+		// Log cache miss along with request param.
+		log.Info("cache miss", "request", req)
 	}
 
 	result, err, _ := c.singleFlight.Do(cacheKey, func() (interface{}, error) {
@@ -110,6 +114,8 @@ func (c *HistoryController) PostQueryTxsByHash(ctx *gin.Context) {
 		cacheKey := cacheKeyPrefixQueryTxsByHash + hash
 		if cachedData, found := c.cache.Get(cacheKey); found {
 			c.cacheMetrics.cacheHits.WithLabelValues("PostQueryTxsByHash").Inc()
+			// Log cache hit along with tx hash.
+			log.Info("cache hit", "tx hash", hash)
 			if cachedData == nil {
 				continue
 			} else if txInfo, ok := cachedData.(*types.TxHistoryInfo); ok {
@@ -120,6 +126,8 @@ func (c *HistoryController) PostQueryTxsByHash(ctx *gin.Context) {
 			}
 		} else {
 			c.cacheMetrics.cacheMisses.WithLabelValues("PostQueryTxsByHash").Inc()
+			// Log cache miss along with tx hash.
+			log.Info("cache miss", "tx hash", hash)
 			uncachedHashes = append(uncachedHashes, hash)
 		}
 	}

bridge-history-api/internal/types/history_types.go

@@ -26,9 +26,7 @@ const (
 
 // QueryByAddressRequest the request parameter of address api
 type QueryByAddressRequest struct {
-	Address  string `form:"address" binding:"required"`
-	Page     int    `form:"page,default=1"`
-	PageSize int    `form:"page_size,default=10"`
+	Address string `form:"address" binding:"required"`
 }
 
 // QueryByHashRequest the request parameter of hash api

common/libzkp/impl/Cargo.lock

@@ -31,7 +31,7 @@ dependencies = [
 [[package]]
 name = "aggregator"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.3#f7fb2900514c38b0ee15b1666c696df4b75a61ca"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.5#9b7e16b9412ff6b7a55fac6b9c6a943b55ef3718"
 dependencies = [
  "ark-std",
  "env_logger 0.10.0",
@@ -333,7 +333,7 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 [[package]]
 name = "bus-mapping"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.3#f7fb2900514c38b0ee15b1666c696df4b75a61ca"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.5#9b7e16b9412ff6b7a55fac6b9c6a943b55ef3718"
 dependencies = [
  "eth-types",
  "ethers-core",
@@ -959,7 +959,7 @@ dependencies = [
 [[package]]
 name = "eth-types"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.3#f7fb2900514c38b0ee15b1666c696df4b75a61ca"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.5#9b7e16b9412ff6b7a55fac6b9c6a943b55ef3718"
 dependencies = [
  "ethers-core",
  "ethers-signers",
@@ -1116,7 +1116,7 @@ dependencies = [
 [[package]]
 name = "external-tracer"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.3#f7fb2900514c38b0ee15b1666c696df4b75a61ca"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.5#9b7e16b9412ff6b7a55fac6b9c6a943b55ef3718"
 dependencies = [
  "eth-types",
  "geth-utils",
@@ -1296,7 +1296,7 @@ dependencies = [
 [[package]]
 name = "gadgets"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.3#f7fb2900514c38b0ee15b1666c696df4b75a61ca"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.5#9b7e16b9412ff6b7a55fac6b9c6a943b55ef3718"
 dependencies = [
  "digest 0.7.6",
  "eth-types",
@@ -1328,7 +1328,7 @@ dependencies = [
 [[package]]
 name = "geth-utils"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.3#f7fb2900514c38b0ee15b1666c696df4b75a61ca"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.5#9b7e16b9412ff6b7a55fac6b9c6a943b55ef3718"
 dependencies = [
  "env_logger 0.9.3",
  "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)",
@@ -1497,7 +1497,7 @@ dependencies = [
 [[package]]
 name = "halo2-mpt-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/mpt-circuit.git?tag=v0.6.5#0bae9eeb813583c11f6db1f961a7e92f8c9bda82"
+source = "git+https://github.com/scroll-tech/mpt-circuit.git?tag=v0.7.0#578c210ceb88d3c143ee2a013ad836d19285d9c1"
 dependencies = [
  "ethers-core",
  "halo2_proofs",
@@ -1519,7 +1519,7 @@ dependencies = [
 [[package]]
 name = "halo2_proofs"
 version = "0.2.0"
-source = "git+https://github.com/scroll-tech/halo2.git?branch=develop#aa86c107aeb62282d81ebce5c4930ec0c0aa540b"
+source = "git+https://github.com/scroll-tech/halo2.git?branch=develop#e3fe25eadd714fd991f35190d17ff0b8fb031188"
 dependencies = [
  "ark-std",
  "blake2b_simd",
@@ -1937,7 +1937,7 @@ dependencies = [
 [[package]]
 name = "keccak256"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.3#f7fb2900514c38b0ee15b1666c696df4b75a61ca"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.5#9b7e16b9412ff6b7a55fac6b9c6a943b55ef3718"
 dependencies = [
  "env_logger 0.9.3",
  "eth-types",
@@ -2135,7 +2135,7 @@ dependencies = [
 [[package]]
 name = "mock"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.3#f7fb2900514c38b0ee15b1666c696df4b75a61ca"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.5#9b7e16b9412ff6b7a55fac6b9c6a943b55ef3718"
 dependencies = [
  "eth-types",
  "ethers-core",
@@ -2151,7 +2151,7 @@ dependencies = [
 [[package]]
 name = "mpt-zktrie"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.3#f7fb2900514c38b0ee15b1666c696df4b75a61ca"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.5#9b7e16b9412ff6b7a55fac6b9c6a943b55ef3718"
 dependencies = [
  "eth-types",
  "halo2-mpt-circuits",
@@ -2582,7 +2582,7 @@ dependencies = [
 [[package]]
 name = "prover"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.3#f7fb2900514c38b0ee15b1666c696df4b75a61ca"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.5#9b7e16b9412ff6b7a55fac6b9c6a943b55ef3718"
 dependencies = [
  "aggregator",
  "anyhow",
@@ -4125,7 +4125,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 [[package]]
 name = "zkevm-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.3#f7fb2900514c38b0ee15b1666c696df4b75a61ca"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.9.5#9b7e16b9412ff6b7a55fac6b9c6a943b55ef3718"
 dependencies = [
  "array-init",
  "bus-mapping",

common/libzkp/impl/Cargo.toml

@@ -21,7 +21,7 @@ halo2curves = { git = "https://github.com/scroll-tech/halo2curves.git", branch =
 
 [dependencies]
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" }
-prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.9.3", default-features = false, features = ["parallel_syn", "scroll", "shanghai"] }
+prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.9.5", default-features = false, features = ["parallel_syn", "scroll", "shanghai"] }
 
 base64 = "0.13.0"
 env_logger = "0.9.0"

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.3.25"
+var tag = "v4.3.29"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

contracts/docs/apis/L1ERC1155Gateway.md

@@ -260,23 +260,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -371,22 +354,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### updateTokenMapping
 
 ```solidity
@@ -563,23 +530,6 @@ Emitted when some ERC1155 token is refunded.
 | tokenId  | uint256 | undefined |
 | amount  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### UpdateTokenMapping
 
 ```solidity

contracts/docs/apis/L1ERC721Gateway.md

@@ -227,23 +227,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -316,22 +299,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### updateTokenMapping
 
 ```solidity
@@ -502,23 +469,6 @@ Emitted when some ERC721 token is refunded.
 | recipient `indexed` | address | undefined |
 | tokenId  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### UpdateTokenMapping
 
 ```solidity

contracts/docs/apis/L1ScrollMessenger.md

@@ -239,23 +239,6 @@ Mapping from queue index to previous replay queue index.
 |---|---|---|
 | _0 | uint256 | undefined |
 
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of ETH rate limiter contract.
-
-
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
 ### relayMessageWithProof
 
 ```solidity
@@ -453,22 +436,6 @@ Update max replay times.
 |---|---|---|
 | _newMaxReplayTimes | uint256 | The new max replay times. |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### xDomainMessageSender
 
 ```solidity
@@ -642,22 +609,5 @@ Emitted when the maximum number of times each message can be replayed is updated
 | oldMaxReplayTimes  | uint256 | undefined |
 | newMaxReplayTimes  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 
 

contracts/docs/apis/L1StandardERC20Gateway.md

@@ -225,23 +225,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -292,22 +275,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 
 
 ## Events
@@ -405,22 +372,5 @@ Emitted when some ERC20 token is refunded.
 | recipient `indexed` | address | undefined |
 | amount  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 
 

contracts/docs/apis/L1WETHGateway.md

@@ -223,23 +223,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -290,22 +273,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 
 
 ## Events
@@ -403,22 +370,5 @@ Emitted when some ERC20 token is refunded.
 | recipient `indexed` | address | undefined |
 | amount  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 
 

contracts/docs/apis/L2ERC1155Gateway.md

@@ -205,23 +205,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -316,22 +299,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### updateTokenMapping
 
 ```solidity
@@ -488,23 +455,6 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 | previousOwner `indexed` | address | undefined |
 | newOwner `indexed` | address | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### UpdateTokenMapping
 
 ```solidity

contracts/docs/apis/L2ERC721Gateway.md

@@ -174,23 +174,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -263,22 +246,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### updateTokenMapping
 
 ```solidity
@@ -430,23 +397,6 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 | previousOwner `indexed` | address | undefined |
 | newOwner `indexed` | address | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### UpdateTokenMapping
 
 ```solidity

contracts/docs/apis/L2ScrollMessenger.md

@@ -155,23 +155,6 @@ function paused() external view returns (bool)
 |---|---|---|
 | _0 | bool | undefined |
 
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of ETH rate limiter contract.
-
-
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
 ### relayMessage
 
 ```solidity
@@ -290,22 +273,6 @@ Update fee vault contract.
 |---|---|---|
 | _newFeeVault | address | The address of new fee vault contract. |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### xDomainMessageSender
 
 ```solidity
@@ -479,22 +446,5 @@ Emitted when the maximum number of times each message can fail in L2 is updated.
 | oldMaxFailedExecutionTimes  | uint256 | undefined |
 | newMaxFailedExecutionTimes  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 
 

contracts/docs/apis/L2StandardERC20Gateway.md

@@ -139,23 +139,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -223,22 +206,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### withdrawERC20
 
 ```solidity
@@ -354,23 +321,6 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 | previousOwner `indexed` | address | undefined |
 | newOwner `indexed` | address | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### WithdrawERC20
 
 ```solidity

contracts/docs/apis/L2WETHGateway.md

@@ -172,23 +172,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -239,22 +222,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### withdrawERC20
 
 ```solidity
@@ -370,23 +337,6 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 | previousOwner `indexed` | address | undefined |
 | newOwner `indexed` | address | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### WithdrawERC20
 
 ```solidity

contracts/integration-test/L1MessageQueue.spec.ts

@@ -318,6 +318,53 @@ describe("L1MessageQueue", async () => {
         expect(await queue.isMessageDropped(i)).to.eq(false);
       }
     });
+
+    // @note skip this random benchmark tests
+    for (const count1 of [1, 2, 128, 129, 256]) {
+      for (const count2 of [1, 2, 128, 129, 256]) {
+        for (const count3 of [1, 2, 128, 129, 256]) {
+          it.skip(`should succeed on random tests, pop three times each with ${count1} ${count2} ${count3} msgs`, async () => {
+            // append count1 + count2 + count3 messages
+            for (let i = 0; i < count1 + count2 + count3; i++) {
+              await queue.connect(messenger).appendCrossDomainMessage(constants.AddressZero, 1000000, "0x");
+            }
+
+            // first pop `count1` messages
+            const bitmap1 = BigNumber.from(randomBytes(32));
+            let tx = await queue.connect(scrollChain).popCrossDomainMessage(0, count1, bitmap1);
+            await expect(tx)
+              .to.emit(queue, "DequeueTransaction")
+              .withArgs(0, count1, bitmap1.and(constants.One.shl(count1).sub(1)));
+            for (let i = 0; i < count1; i++) {
+              expect(await queue.isMessageSkipped(i)).to.eq(bitmap1.shr(i).and(1).eq(1));
+              expect(await queue.isMessageDropped(i)).to.eq(false);
+            }
+
+            // then pop `count2` messages
+            const bitmap2 = BigNumber.from(randomBytes(32));
+            tx = await queue.connect(scrollChain).popCrossDomainMessage(count1, count2, bitmap2);
+            await expect(tx)
+              .to.emit(queue, "DequeueTransaction")
+              .withArgs(count1, count2, bitmap2.and(constants.One.shl(count2).sub(1)));
+            for (let i = 0; i < count2; i++) {
+              expect(await queue.isMessageSkipped(i + count1)).to.eq(bitmap2.shr(i).and(1).eq(1));
+              expect(await queue.isMessageDropped(i + count1)).to.eq(false);
+            }
+
+            // last pop `count3` messages
+            const bitmap3 = BigNumber.from(randomBytes(32));
+            tx = await queue.connect(scrollChain).popCrossDomainMessage(count1 + count2, count3, bitmap3);
+            await expect(tx)
+              .to.emit(queue, "DequeueTransaction")
+              .withArgs(count1 + count2, count3, bitmap3.and(constants.One.shl(count3).sub(1)));
+            for (let i = 0; i < count3; i++) {
+              expect(await queue.isMessageSkipped(i + count1 + count2)).to.eq(bitmap3.shr(i).and(1).eq(1));
+              expect(await queue.isMessageDropped(i + count1 + count2)).to.eq(false);
+            }
+          });
+        }
+      }
+    }
   });
 
   context("#dropCrossDomainMessage", async () => {

contracts/scripts/foundry/InitializeL2RateLimiter.s.sol

@@ -1,55 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.10;
-
-import {Script} from "forge-std/Script.sol";
-
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {AccessControlEnumerable} from "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
-import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
-
-import {ScrollMessengerBase} from "../../src/libraries/ScrollMessengerBase.sol";
-import {ScrollGatewayBase} from "../../src/libraries/gateway/ScrollGatewayBase.sol";
-import {ETHRateLimiter} from "../../src/rate-limiter/ETHRateLimiter.sol";
-import {TokenRateLimiter} from "../../src/rate-limiter/TokenRateLimiter.sol";
-
-// solhint-disable max-states-count
-// solhint-disable state-visibility
-// solhint-disable var-name-mixedcase
-
-contract InitializeL2RateLimiter is Script {
-    uint256 L2_DEPLOYER_PRIVATE_KEY = vm.envUint("L2_DEPLOYER_PRIVATE_KEY");
-
-    address L2_SCROLL_MESSENGER_PROXY_ADDR = vm.envAddress("L2_SCROLL_MESSENGER_PROXY_ADDR");
-    address L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR");
-    address L2_ETH_GATEWAY_PROXY_ADDR = vm.envAddress("L2_ETH_GATEWAY_PROXY_ADDR");
-    address L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR");
-    address L2_DAI_GATEWAY_PROXY_ADDR = vm.envAddress("L2_DAI_GATEWAY_PROXY_ADDR");
-    // address L2_USDC_GATEWAY_PROXY_ADDR = vm.envAddress("L2_USDC_GATEWAY_PROXY_ADDR");
-
-    address L2_ETH_RATE_LIMITER_ADDR = vm.envAddress("L2_ETH_RATE_LIMITER_ADDR");
-    address L2_TOKEN_RATE_LIMITER_ADDR = vm.envAddress("L2_TOKEN_RATE_LIMITER_ADDR");
-
-    function run() external {
-        vm.startBroadcast(L2_DEPLOYER_PRIVATE_KEY);
-
-        ScrollMessengerBase(payable(L2_SCROLL_MESSENGER_PROXY_ADDR)).updateRateLimiter(L2_ETH_RATE_LIMITER_ADDR);
-
-        bytes32 TOKEN_SPENDER_ROLE = TokenRateLimiter(L2_TOKEN_RATE_LIMITER_ADDR).TOKEN_SPENDER_ROLE();
-        TokenRateLimiter(L2_TOKEN_RATE_LIMITER_ADDR).grantRole(TOKEN_SPENDER_ROLE, L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR);
-        TokenRateLimiter(L2_TOKEN_RATE_LIMITER_ADDR).grantRole(
-            TOKEN_SPENDER_ROLE,
-            L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR
-        );
-        TokenRateLimiter(L2_TOKEN_RATE_LIMITER_ADDR).grantRole(TOKEN_SPENDER_ROLE, L2_DAI_GATEWAY_PROXY_ADDR);
-
-        ScrollGatewayBase(payable(L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR)).updateRateLimiter(L2_TOKEN_RATE_LIMITER_ADDR);
-        ScrollGatewayBase(payable(L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR)).updateRateLimiter(L2_TOKEN_RATE_LIMITER_ADDR);
-        ScrollGatewayBase(payable(L2_DAI_GATEWAY_PROXY_ADDR)).updateRateLimiter(L2_TOKEN_RATE_LIMITER_ADDR);
-
-        // @note comments out for now
-        // limiter.grantRole(TOKEN_SPENDER_ROLE, L2_USDC_GATEWAY_PROXY_ADDR);
-        // ScrollGatewayBase(payable(L2_USDC_GATEWAY_PROXY_ADDR)).updateRateLimiter(address(limiter));
-
-        vm.stopBroadcast();
-    }
-}

contracts/src/L1/L1ScrollMessenger.sol

@@ -115,7 +115,7 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
         bytes memory _message,
         uint256 _gasLimit
     ) external payable override whenNotPaused {
-        _sendMessage(_to, _value, _message, _gasLimit, msg.sender);
+        _sendMessage(_to, _value, _message, _gasLimit, _msgSender());
     }
 
     /// @inheritdoc IScrollMessenger
@@ -316,14 +316,12 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
         uint256 _gasLimit,
         address _refundAddress
     ) internal nonReentrant {
-        _addUsedAmount(_value);
-
         address _messageQueue = messageQueue; // gas saving
         address _counterpart = counterpart; // gas saving
 
         // compute the actual cross domain message calldata.
         uint256 _messageNonce = IL1MessageQueue(_messageQueue).nextCrossDomainMessageIndex();
-        bytes memory _xDomainCalldata = _encodeXDomainCalldata(msg.sender, _to, _value, _messageNonce, _message);
+        bytes memory _xDomainCalldata = _encodeXDomainCalldata(_msgSender(), _to, _value, _messageNonce, _message);
 
         // compute and deduct the messaging fee to fee vault.
         uint256 _fee = IL1MessageQueue(_messageQueue).estimateCrossDomainMessageFee(_gasLimit);
@@ -343,7 +341,7 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
         require(messageSendTimestamp[_xDomainCalldataHash] == 0, "Duplicated message");
         messageSendTimestamp[_xDomainCalldataHash] = block.timestamp;
 
-        emit SentMessage(msg.sender, _to, _value, _messageNonce, _gasLimit, _message);
+        emit SentMessage(_msgSender(), _to, _value, _messageNonce, _gasLimit, _message);
 
         // refund fee to `_refundAddress`
         unchecked {

contracts/src/L1/gateways/L1ERC1155Gateway.sol

@@ -66,7 +66,7 @@ contract L1ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL1ERC
         uint256 _amount,
         uint256 _gasLimit
     ) external payable override {
-        _depositERC1155(_token, msg.sender, _tokenId, _amount, _gasLimit);
+        _depositERC1155(_token, _msgSender(), _tokenId, _amount, _gasLimit);
     }
 
     /// @inheritdoc IL1ERC1155Gateway
@@ -87,7 +87,7 @@ contract L1ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL1ERC
         uint256[] calldata _amounts,
         uint256 _gasLimit
     ) external payable override {
-        _batchDepositERC1155(_token, msg.sender, _tokenIds, _amounts, _gasLimit);
+        _batchDepositERC1155(_token, _msgSender(), _tokenIds, _amounts, _gasLimit);
     }
 
     /// @inheritdoc IL1ERC1155Gateway
@@ -198,19 +198,21 @@ contract L1ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL1ERC
         address _l2Token = tokenMapping[_token];
         require(_l2Token != address(0), "no corresponding l2 token");
 
+        address _sender = _msgSender();
+
         // 1. transfer token to this contract
-        IERC1155Upgradeable(_token).safeTransferFrom(msg.sender, address(this), _tokenId, _amount, "");
+        IERC1155Upgradeable(_token).safeTransferFrom(_sender, address(this), _tokenId, _amount, "");
 
         // 2. Generate message passed to L2ERC1155Gateway.
         bytes memory _message = abi.encodeCall(
             IL2ERC1155Gateway.finalizeDepositERC1155,
-            (_token, _l2Token, msg.sender, _to, _tokenId, _amount)
+            (_token, _l2Token, _sender, _to, _tokenId, _amount)
         );
 
         // 3. Send message to L1ScrollMessenger.
-        IL1ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit, msg.sender);
+        IL1ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit, _sender);
 
-        emit DepositERC1155(_token, _l2Token, msg.sender, _to, _tokenId, _amount);
+        emit DepositERC1155(_token, _l2Token, _sender, _to, _tokenId, _amount);
     }
 
     /// @dev Internal function to batch deposit ERC1155 NFT to layer 2.
@@ -236,18 +238,20 @@ contract L1ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL1ERC
         address _l2Token = tokenMapping[_token];
         require(_l2Token != address(0), "no corresponding l2 token");
 
+        address _sender = _msgSender();
+
         // 1. transfer token to this contract
-        IERC1155Upgradeable(_token).safeBatchTransferFrom(msg.sender, address(this), _tokenIds, _amounts, "");
+        IERC1155Upgradeable(_token).safeBatchTransferFrom(_sender, address(this), _tokenIds, _amounts, "");
 
         // 2. Generate message passed to L2ERC1155Gateway.
         bytes memory _message = abi.encodeCall(
             IL2ERC1155Gateway.finalizeBatchDepositERC1155,
-            (_token, _l2Token, msg.sender, _to, _tokenIds, _amounts)
+            (_token, _l2Token, _sender, _to, _tokenIds, _amounts)
         );
 
         // 3. Send message to L1ScrollMessenger.
-        IL1ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit, msg.sender);
+        IL1ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit, _sender);
 
-        emit BatchDepositERC1155(_token, _l2Token, msg.sender, _to, _tokenIds, _amounts);
+        emit BatchDepositERC1155(_token, _l2Token, _sender, _to, _tokenIds, _amounts);
     }
 }

contracts/src/L1/gateways/L1ERC20Gateway.sol

@@ -35,7 +35,7 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
         uint256 _amount,
         uint256 _gasLimit
     ) external payable override {
-        _deposit(_token, msg.sender, _amount, new bytes(0), _gasLimit);
+        _deposit(_token, _msgSender(), _amount, new bytes(0), _gasLimit);
     }
 
     /// @inheritdoc IL1ERC20Gateway
@@ -144,11 +144,12 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
             bytes memory
         )
     {
-        address _from = msg.sender;
-        if (router == msg.sender) {
+        address _sender = _msgSender();
+        address _from = _sender;
+        if (router == _sender) {
             // Extract real sender if this call is from L1GatewayRouter.
             (_from, _data) = abi.decode(_data, (address, bytes));
-            _amount = IL1GatewayRouter(msg.sender).requestERC20(_from, _token, _amount);
+            _amount = IL1GatewayRouter(_sender).requestERC20(_from, _token, _amount);
         } else {
             // common practice to handle fee on transfer token.
             uint256 _before = IERC20Upgradeable(_token).balanceOf(address(this));
@@ -160,9 +161,6 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
         // ignore weird fee on transfer token
         require(_amount > 0, "deposit zero amount");
 
-        // rate limit
-        _addUsedAmount(_token, _amount);
-
         return (_from, _amount, _data);
     }
 

contracts/src/L1/gateways/L1ERC721Gateway.sol

@@ -64,7 +64,7 @@ contract L1ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL1ERC72
         uint256 _tokenId,
         uint256 _gasLimit
     ) external payable override {
-        _depositERC721(_token, msg.sender, _tokenId, _gasLimit);
+        _depositERC721(_token, _msgSender(), _tokenId, _gasLimit);
     }
 
     /// @inheritdoc IL1ERC721Gateway
@@ -83,7 +83,7 @@ contract L1ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL1ERC72
         uint256[] calldata _tokenIds,
         uint256 _gasLimit
     ) external payable override {
-        _batchDepositERC721(_token, msg.sender, _tokenIds, _gasLimit);
+        _batchDepositERC721(_token, _msgSender(), _tokenIds, _gasLimit);
     }
 
     /// @inheritdoc IL1ERC721Gateway
@@ -190,19 +190,21 @@ contract L1ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL1ERC72
         address _l2Token = tokenMapping[_token];
         require(_l2Token != address(0), "no corresponding l2 token");
 
+        address _sender = _msgSender();
+
         // 1. transfer token to this contract
-        IERC721Upgradeable(_token).safeTransferFrom(msg.sender, address(this), _tokenId);
+        IERC721Upgradeable(_token).safeTransferFrom(_sender, address(this), _tokenId);
 
         // 2. Generate message passed to L2ERC721Gateway.
         bytes memory _message = abi.encodeCall(
             IL2ERC721Gateway.finalizeDepositERC721,
-            (_token, _l2Token, msg.sender, _to, _tokenId)
+            (_token, _l2Token, _sender, _to, _tokenId)
         );
 
         // 3. Send message to L1ScrollMessenger.
-        IL1ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit, msg.sender);
+        IL1ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit, _sender);
 
-        emit DepositERC721(_token, _l2Token, msg.sender, _to, _tokenId);
+        emit DepositERC721(_token, _l2Token, _sender, _to, _tokenId);
     }
 
     /// @dev Internal function to batch deposit ERC721 NFT to layer 2.
@@ -221,20 +223,22 @@ contract L1ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL1ERC72
         address _l2Token = tokenMapping[_token];
         require(_l2Token != address(0), "no corresponding l2 token");
 
+        address _sender = _msgSender();
+
         // 1. transfer token to this contract
         for (uint256 i = 0; i < _tokenIds.length; i++) {
-            IERC721Upgradeable(_token).safeTransferFrom(msg.sender, address(this), _tokenIds[i]);
+            IERC721Upgradeable(_token).safeTransferFrom(_sender, address(this), _tokenIds[i]);
         }
 
         // 2. Generate message passed to L2ERC721Gateway.
         bytes memory _message = abi.encodeCall(
             IL2ERC721Gateway.finalizeBatchDepositERC721,
-            (_token, _l2Token, msg.sender, _to, _tokenIds)
+            (_token, _l2Token, _sender, _to, _tokenIds)
         );
 
         // 3. Send message to L1ScrollMessenger.
-        IL1ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit, msg.sender);
+        IL1ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit, _sender);
 
-        emit BatchDepositERC721(_token, _l2Token, msg.sender, _to, _tokenIds);
+        emit BatchDepositERC721(_token, _l2Token, _sender, _to, _tokenIds);
     }
 }

contracts/src/L1/gateways/L1ETHGateway.sol

@@ -44,7 +44,7 @@ contract L1ETHGateway is ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback
 
     /// @inheritdoc IL1ETHGateway
     function depositETH(uint256 _amount, uint256 _gasLimit) external payable override {
-        _deposit(msg.sender, _amount, new bytes(0), _gasLimit);
+        _deposit(_msgSender(), _amount, new bytes(0), _gasLimit);
     }
 
     /// @inheritdoc IL1ETHGateway
@@ -119,8 +119,8 @@ contract L1ETHGateway is ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback
         require(_amount > 0, "deposit zero eth");
 
         // 1. Extract real sender if this call is from L1GatewayRouter.
-        address _from = msg.sender;
-        if (router == msg.sender) {
+        address _from = _msgSender();
+        if (router == _from) {
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
 

contracts/src/L1/gateways/L1GatewayRouter.sol

@@ -45,7 +45,7 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
     }
 
     modifier onlyInContext() {
-        require(msg.sender == gatewayInContext, "Only in deposit context");
+        require(_msgSender() == gatewayInContext, "Only in deposit context");
         _;
     }
 
@@ -110,9 +110,10 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
         address _token,
         uint256 _amount
     ) external onlyInContext returns (uint256) {
-        uint256 _balance = IERC20Upgradeable(_token).balanceOf(msg.sender);
-        IERC20Upgradeable(_token).safeTransferFrom(_sender, msg.sender, _amount);
-        _amount = IERC20Upgradeable(_token).balanceOf(msg.sender) - _balance;
+        address _caller = _msgSender();
+        uint256 _balance = IERC20Upgradeable(_token).balanceOf(_caller);
+        IERC20Upgradeable(_token).safeTransferFrom(_sender, _caller, _amount);
+        _amount = IERC20Upgradeable(_token).balanceOf(_caller) - _balance;
         return _amount;
     }
 
@@ -126,7 +127,7 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
         uint256 _amount,
         uint256 _gasLimit
     ) external payable override {
-        depositERC20AndCall(_token, msg.sender, _amount, new bytes(0), _gasLimit);
+        depositERC20AndCall(_token, _msgSender(), _amount, new bytes(0), _gasLimit);
     }
 
     /// @inheritdoc IL1ERC20Gateway
@@ -154,7 +155,7 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
         gatewayInContext = _gateway;
 
         // encode msg.sender with _data
-        bytes memory _routerData = abi.encode(msg.sender, _data);
+        bytes memory _routerData = abi.encode(_msgSender(), _data);
 
         IL1ERC20Gateway(_gateway).depositERC20AndCall{value: msg.value}(_token, _to, _amount, _routerData, _gasLimit);
 
@@ -180,7 +181,7 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
 
     /// @inheritdoc IL1ETHGateway
     function depositETH(uint256 _amount, uint256 _gasLimit) external payable override {
-        depositETHAndCall(msg.sender, _amount, new bytes(0), _gasLimit);
+        depositETHAndCall(_msgSender(), _amount, new bytes(0), _gasLimit);
     }
 
     /// @inheritdoc IL1ETHGateway
@@ -203,7 +204,7 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
         require(_gateway != address(0), "eth gateway available");
 
         // encode msg.sender with _data
-        bytes memory _routerData = abi.encode(msg.sender, _data);
+        bytes memory _routerData = abi.encode(_msgSender(), _data);
 
         IL1ETHGateway(_gateway).depositETHAndCall{value: msg.value}(_to, _amount, _routerData, _gasLimit);
     }

contracts/src/L1/gateways/L1WETHGateway.sol

@@ -54,7 +54,7 @@ contract L1WETHGateway is L1ERC20Gateway {
     }
 
     receive() external payable {
-        require(msg.sender == WETH, "only WETH");
+        require(_msgSender() == WETH, "only WETH");
     }
 
     /*************************

contracts/src/L1/gateways/usdc/L1USDCGateway.sol

@@ -84,7 +84,7 @@ contract L1USDCGateway is L1ERC20Gateway, IUSDCBurnableSourceBridge {
 
     /// @inheritdoc IUSDCBurnableSourceBridge
     function burnAllLockedUSDC() external override {
-        require(msg.sender == circleCaller, "only circle caller");
+        require(_msgSender() == circleCaller, "only circle caller");
 
         // @note Only bridged USDC will be burned. We may refund the rest if possible.
         uint256 _balance = totalBridgedUSDC;

contracts/src/L1/rollup/L1MessageQueue.sol

@@ -75,7 +75,7 @@ contract L1MessageQueue is OwnableUpgradeable, IL1MessageQueue {
      **********************/
 
     modifier onlyMessenger() {
-        require(msg.sender == messenger, "Only callable by the L1ScrollMessenger");
+        require(_msgSender() == messenger, "Only callable by the L1ScrollMessenger");
         _;
     }
 
@@ -292,7 +292,7 @@ contract L1MessageQueue is OwnableUpgradeable, IL1MessageQueue {
         _validateGasLimit(_gasLimit, _data);
 
         // do address alias to avoid replay attack in L2.
-        address _sender = AddressAliasHelper.applyL1ToL2Alias(msg.sender);
+        address _sender = AddressAliasHelper.applyL1ToL2Alias(_msgSender());
 
         _queueTransaction(_sender, _target, 0, _gasLimit, _data);
     }
@@ -305,7 +305,7 @@ contract L1MessageQueue is OwnableUpgradeable, IL1MessageQueue {
         uint256 _gasLimit,
         bytes calldata _data
     ) external override {
-        require(msg.sender == enforcedTxGateway, "Only callable by the EnforcedTxGateway");
+        require(_msgSender() == enforcedTxGateway, "Only callable by the EnforcedTxGateway");
         // We will check it in EnforcedTxGateway, just in case.
         require(_sender.code.length == 0, "only EOA");
 
@@ -321,7 +321,7 @@ contract L1MessageQueue is OwnableUpgradeable, IL1MessageQueue {
         uint256 _count,
         uint256 _skippedBitmap
     ) external {
-        require(msg.sender == scrollChain, "Only callable by the ScrollChain");
+        require(_msgSender() == scrollChain, "Only callable by the ScrollChain");
 
         require(_count <= 256, "pop too many messages");
         require(pendingQueueIndex == _startIndex, "start index mismatch");

contracts/src/L1/rollup/L2GasPriceOracle.sol

@@ -111,7 +111,7 @@ contract L2GasPriceOracle is OwnableUpgradeable, IL2GasPriceOracle {
     /// @notice Allows whitelisted caller to modify the l2 base fee.
     /// @param _newL2BaseFee The new l2 base fee.
     function setL2BaseFee(uint256 _newL2BaseFee) external {
-        require(whitelist.isSenderAllowed(msg.sender), "Not whitelisted sender");
+        require(whitelist.isSenderAllowed(_msgSender()), "Not whitelisted sender");
 
         uint256 _oldL2BaseFee = l2BaseFee;
         l2BaseFee = _newL2BaseFee;

contracts/src/L1/rollup/ScrollChain.sol

@@ -85,12 +85,12 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
 
     modifier OnlySequencer() {
         // @note In the decentralized mode, it should be only called by a list of validator.
-        require(isSequencer[msg.sender], "caller not sequencer");
+        require(isSequencer[_msgSender()], "caller not sequencer");
         _;
     }
 
     modifier OnlyProver() {
-        require(isProver[msg.sender], "caller not prover");
+        require(isProver[_msgSender()], "caller not prover");
         _;
     }
 

contracts/src/L2/L2ScrollMessenger.sol

@@ -92,7 +92,7 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
         bytes memory _message
     ) external override whenNotPaused {
         // It is impossible to deploy a contract with the same address, reentrance is prevented in nature.
-        require(AddressAliasHelper.undoL1ToL2Alias(msg.sender) == counterpart, "Caller is not L1ScrollMessenger");
+        require(AddressAliasHelper.undoL1ToL2Alias(_msgSender()) == counterpart, "Caller is not L1ScrollMessenger");
 
         bytes32 _xDomainCalldataHash = keccak256(_encodeXDomainCalldata(_from, _to, _value, _nonce, _message));
 
@@ -117,10 +117,9 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
         uint256 _gasLimit
     ) internal nonReentrant {
         require(msg.value == _value, "msg.value mismatch");
-        _addUsedAmount(_value);
 
         uint256 _nonce = L2MessageQueue(messageQueue).nextMessageIndex();
-        bytes32 _xDomainCalldataHash = keccak256(_encodeXDomainCalldata(msg.sender, _to, _value, _nonce, _message));
+        bytes32 _xDomainCalldataHash = keccak256(_encodeXDomainCalldata(_msgSender(), _to, _value, _nonce, _message));
 
         // normally this won't happen, since each message has different nonce, but just in case.
         require(messageSendTimestamp[_xDomainCalldataHash] == 0, "Duplicated message");
@@ -128,7 +127,7 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
 
         L2MessageQueue(messageQueue).appendMessage(_xDomainCalldataHash);
 
-        emit SentMessage(msg.sender, _to, _value, _nonce, _gasLimit, _message);
+        emit SentMessage(_msgSender(), _to, _value, _nonce, _gasLimit, _message);
     }
 
     /// @dev Internal function to execute a L1 => L2 message.

contracts/src/L2/gateways/L2CustomERC20Gateway.sol

@@ -121,14 +121,11 @@ contract L2CustomERC20Gateway is L2ERC20Gateway {
         require(_amount > 0, "withdraw zero amount");
 
         // 1. Extract real sender if this call is from L2GatewayRouter.
-        address _from = msg.sender;
-        if (router == msg.sender) {
+        address _from = _msgSender();
+        if (router == _from) {
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
 
-        // rate limit
-        _addUsedAmount(_token, _amount);
-
         // 2. Burn token.
         IScrollERC20Upgradeable(_token).burn(_from, _amount);
 

contracts/src/L2/gateways/L2ERC1155Gateway.sol

@@ -61,7 +61,7 @@ contract L2ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC
         uint256 _amount,
         uint256 _gasLimit
     ) external payable override {
-        _withdrawERC1155(_token, msg.sender, _tokenId, _amount, _gasLimit);
+        _withdrawERC1155(_token, _msgSender(), _tokenId, _amount, _gasLimit);
     }
 
     /// @inheritdoc IL2ERC1155Gateway
@@ -82,7 +82,7 @@ contract L2ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC
         uint256[] calldata _amounts,
         uint256 _gasLimit
     ) external payable override {
-        _batchWithdrawERC1155(_token, msg.sender, _tokenIds, _amounts, _gasLimit);
+        _batchWithdrawERC1155(_token, _msgSender(), _tokenIds, _amounts, _gasLimit);
     }
 
     /// @inheritdoc IL2ERC1155Gateway
@@ -168,19 +168,21 @@ contract L2ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC
         address _l1Token = tokenMapping[_token];
         require(_l1Token != address(0), "no corresponding l1 token");
 
+        address _sender = _msgSender();
+
         // 1. burn token
-        IScrollERC1155(_token).burn(msg.sender, _tokenId, _amount);
+        IScrollERC1155(_token).burn(_sender, _tokenId, _amount);
 
         // 2. Generate message passed to L1ERC1155Gateway.
         bytes memory _message = abi.encodeCall(
             IL1ERC1155Gateway.finalizeWithdrawERC1155,
-            (_l1Token, _token, msg.sender, _to, _tokenId, _amount)
+            (_l1Token, _token, _sender, _to, _tokenId, _amount)
         );
 
         // 3. Send message to L2ScrollMessenger.
         IL2ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit);
 
-        emit WithdrawERC1155(_l1Token, _token, msg.sender, _to, _tokenId, _amount);
+        emit WithdrawERC1155(_l1Token, _token, _sender, _to, _tokenId, _amount);
     }
 
     /// @dev Internal function to batch withdraw ERC1155 NFT to layer 2.
@@ -206,18 +208,20 @@ contract L2ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC
         address _l1Token = tokenMapping[_token];
         require(_l1Token != address(0), "no corresponding l1 token");
 
+        address _sender = _msgSender();
+
         // 1. transfer token to this contract
-        IScrollERC1155(_token).batchBurn(msg.sender, _tokenIds, _amounts);
+        IScrollERC1155(_token).batchBurn(_sender, _tokenIds, _amounts);
 
         // 2. Generate message passed to L1ERC1155Gateway.
         bytes memory _message = abi.encodeCall(
             IL1ERC1155Gateway.finalizeBatchWithdrawERC1155,
-            (_l1Token, _token, msg.sender, _to, _tokenIds, _amounts)
+            (_l1Token, _token, _sender, _to, _tokenIds, _amounts)
         );
 
         // 3. Send message to L2ScrollMessenger.
         IL2ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit);
 
-        emit BatchWithdrawERC1155(_l1Token, _token, msg.sender, _to, _tokenIds, _amounts);
+        emit BatchWithdrawERC1155(_l1Token, _token, _sender, _to, _tokenIds, _amounts);
     }
 }

contracts/src/L2/gateways/L2ERC20Gateway.sol

@@ -24,7 +24,7 @@ abstract contract L2ERC20Gateway is ScrollGatewayBase, IL2ERC20Gateway {
         uint256 _amount,
         uint256 _gasLimit
     ) external payable override {
-        _withdraw(_token, msg.sender, _amount, new bytes(0), _gasLimit);
+        _withdraw(_token, _msgSender(), _amount, new bytes(0), _gasLimit);
     }
 
     /// @inheritdoc IL2ERC20Gateway

contracts/src/L2/gateways/L2ERC721Gateway.sol

@@ -59,7 +59,7 @@ contract L2ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC72
         uint256 _tokenId,
         uint256 _gasLimit
     ) external payable override {
-        _withdrawERC721(_token, msg.sender, _tokenId, _gasLimit);
+        _withdrawERC721(_token, _msgSender(), _tokenId, _gasLimit);
     }
 
     /// @inheritdoc IL2ERC721Gateway
@@ -78,7 +78,7 @@ contract L2ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC72
         uint256[] calldata _tokenIds,
         uint256 _gasLimit
     ) external payable override {
-        _batchWithdrawERC721(_token, msg.sender, _tokenIds, _gasLimit);
+        _batchWithdrawERC721(_token, _msgSender(), _tokenIds, _gasLimit);
     }
 
     /// @inheritdoc IL2ERC721Gateway
@@ -159,21 +159,23 @@ contract L2ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC72
         address _l1Token = tokenMapping[_token];
         require(_l1Token != address(0), "no corresponding l1 token");
 
+        address _sender = _msgSender();
+
         // 1. burn token
         // @note in case the token has given too much power to the gateway, we check owner here.
-        require(IScrollERC721(_token).ownerOf(_tokenId) == msg.sender, "token not owned");
+        require(IScrollERC721(_token).ownerOf(_tokenId) == _sender, "token not owned");
         IScrollERC721(_token).burn(_tokenId);
 
         // 2. Generate message passed to L1ERC721Gateway.
         bytes memory _message = abi.encodeCall(
             IL1ERC721Gateway.finalizeWithdrawERC721,
-            (_l1Token, _token, msg.sender, _to, _tokenId)
+            (_l1Token, _token, _sender, _to, _tokenId)
         );
 
         // 3. Send message to L2ScrollMessenger.
         IL2ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit);
 
-        emit WithdrawERC721(_l1Token, _token, msg.sender, _to, _tokenId);
+        emit WithdrawERC721(_l1Token, _token, _sender, _to, _tokenId);
     }
 
     /// @dev Internal function to batch withdraw ERC721 NFT to layer 1.
@@ -192,22 +194,24 @@ contract L2ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC72
         address _l1Token = tokenMapping[_token];
         require(_l1Token != address(0), "no corresponding l1 token");
 
+        address _sender = _msgSender();
+
         // 1. transfer token to this contract
         for (uint256 i = 0; i < _tokenIds.length; i++) {
             // @note in case the token has given too much power to the gateway, we check owner here.
-            require(IScrollERC721(_token).ownerOf(_tokenIds[i]) == msg.sender, "token not owned");
+            require(IScrollERC721(_token).ownerOf(_tokenIds[i]) == _sender, "token not owned");
             IScrollERC721(_token).burn(_tokenIds[i]);
         }
 
         // 2. Generate message passed to L1ERC721Gateway.
         bytes memory _message = abi.encodeCall(
             IL1ERC721Gateway.finalizeBatchWithdrawERC721,
-            (_l1Token, _token, msg.sender, _to, _tokenIds)
+            (_l1Token, _token, _sender, _to, _tokenIds)
         );
 
         // 3. Send message to L2ScrollMessenger.
         IL2ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit);
 
-        emit BatchWithdrawERC721(_l1Token, _token, msg.sender, _to, _tokenIds);
+        emit BatchWithdrawERC721(_l1Token, _token, _sender, _to, _tokenIds);
     }
 }

contracts/src/L2/gateways/L2ETHGateway.sol

@@ -40,7 +40,7 @@ contract L2ETHGateway is ScrollGatewayBase, IL2ETHGateway {
 
     /// @inheritdoc IL2ETHGateway
     function withdrawETH(uint256 _amount, uint256 _gasLimit) external payable override {
-        _withdraw(msg.sender, _amount, new bytes(0), _gasLimit);
+        _withdraw(_msgSender(), _amount, new bytes(0), _gasLimit);
     }
 
     /// @inheritdoc IL2ETHGateway
@@ -93,8 +93,8 @@ contract L2ETHGateway is ScrollGatewayBase, IL2ETHGateway {
         require(msg.value > 0, "withdraw zero eth");
 
         // 1. Extract real sender if this call is from L1GatewayRouter.
-        address _from = msg.sender;
-        if (router == msg.sender) {
+        address _from = _msgSender();
+        if (router == _from) {
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
 

contracts/src/L2/gateways/L2GatewayRouter.sol

@@ -91,7 +91,7 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {
         uint256 _amount,
         uint256 _gasLimit
     ) external payable override {
-        withdrawERC20AndCall(_token, msg.sender, _amount, new bytes(0), _gasLimit);
+        withdrawERC20AndCall(_token, _msgSender(), _amount, new bytes(0), _gasLimit);
     }
 
     /// @inheritdoc IL2ERC20Gateway
@@ -116,14 +116,14 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {
         require(_gateway != address(0), "no gateway available");
 
         // encode msg.sender with _data
-        bytes memory _routerData = abi.encode(msg.sender, _data);
+        bytes memory _routerData = abi.encode(_msgSender(), _data);
 
         IL2ERC20Gateway(_gateway).withdrawERC20AndCall{value: msg.value}(_token, _to, _amount, _routerData, _gasLimit);
     }
 
     /// @inheritdoc IL2ETHGateway
     function withdrawETH(uint256 _amount, uint256 _gasLimit) external payable override {
-        withdrawETHAndCall(msg.sender, _amount, new bytes(0), _gasLimit);
+        withdrawETHAndCall(_msgSender(), _amount, new bytes(0), _gasLimit);
     }
 
     /// @inheritdoc IL2ETHGateway
@@ -146,7 +146,7 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {
         require(_gateway != address(0), "eth gateway available");
 
         // encode msg.sender with _data
-        bytes memory _routerData = abi.encode(msg.sender, _data);
+        bytes memory _routerData = abi.encode(_msgSender(), _data);
 
         IL2ETHGateway(_gateway).withdrawETHAndCall{value: msg.value}(_to, _amount, _routerData, _gasLimit);
     }

contracts/src/L2/gateways/L2StandardERC20Gateway.sol

@@ -132,17 +132,14 @@ contract L2StandardERC20Gateway is L2ERC20Gateway {
         require(_amount > 0, "withdraw zero amount");
 
         // 1. Extract real sender if this call is from L2GatewayRouter.
-        address _from = msg.sender;
-        if (router == msg.sender) {
+        address _from = _msgSender();
+        if (router == _from) {
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
 
         address _l1Token = tokenMapping[_token];
         require(_l1Token != address(0), "no corresponding l1 token");
 
-        // rate limit
-        _addUsedAmount(_token, _amount);
-
         // 2. Burn token.
         IScrollERC20Upgradeable(_token).burn(_from, _amount);
 

contracts/src/L2/gateways/L2WETHGateway.sol

@@ -53,7 +53,7 @@ contract L2WETHGateway is L2ERC20Gateway {
     }
 
     receive() external payable {
-        require(msg.sender == WETH, "only WETH");
+        require(_msgSender() == WETH, "only WETH");
     }
 
     /*************************
@@ -111,14 +111,11 @@ contract L2WETHGateway is L2ERC20Gateway {
         require(_token == WETH, "only WETH is allowed");
 
         // 1. Extract real sender if this call is from L1GatewayRouter.
-        address _from = msg.sender;
-        if (router == msg.sender) {
+        address _from = _msgSender();
+        if (router == _from) {
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
 
-        // rate limit
-        _addUsedAmount(_token, _amount);
-
         // 2. Transfer token into this contract.
         IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
         IWETH(_token).withdraw(_amount);

contracts/src/L2/gateways/usdc/L2USDCGateway.sol

@@ -116,7 +116,7 @@ contract L2USDCGateway is L2ERC20Gateway, IUSDCDestinationBridge {
 
     /// @inheritdoc IUSDCDestinationBridge
     function transferUSDCRoles(address _owner) external {
-        require(msg.sender == circleCaller, "only circle caller");
+        require(_msgSender() == circleCaller, "only circle caller");
 
         OwnableUpgradeable(l2USDC).transferOwnership(_owner);
     }
@@ -156,15 +156,12 @@ contract L2USDCGateway is L2ERC20Gateway, IUSDCDestinationBridge {
         require(!withdrawPaused, "withdraw paused");
 
         // 1. Extract real sender if this call is from L2GatewayRouter.
-        address _from = msg.sender;
-        if (router == msg.sender) {
+        address _from = _msgSender();
+        if (router == _from) {
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
         require(_data.length == 0, "call is not allowed");
 
-        // rate limit
-        _addUsedAmount(_token, _amount);
-
         // 2. Transfer token into this contract.
         IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
         IFiatToken(_token).burn(_amount);

contracts/src/L2/gateways/usdc/draft-L2USDCGatewayCCTP.sol

@@ -119,8 +119,8 @@ contract L2USDCGatewayCCTP is CCTPGatewayBase, L2ERC20Gateway {
         require(_token == l2USDC, "only USDC is allowed");
 
         // 1. Extract real sender if this call is from L1GatewayRouter.
-        address _from = msg.sender;
-        if (router == msg.sender) {
+        address _from = _msgSender();
+        if (router == _from) {
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
 

contracts/src/L2/predeploys/WrappedEther.sol

@@ -27,17 +27,21 @@ contract WrappedEther is ERC20Permit {
     }
 
     function deposit() public payable {
-        _mint(msg.sender, msg.value);
+        address _sender = _msgSender();
 
-        emit Deposit(msg.sender, msg.value);
+        _mint(_sender, msg.value);
+
+        emit Deposit(_sender, msg.value);
     }
 
     function withdraw(uint256 wad) external {
-        _burn(msg.sender, wad);
+        address _sender = _msgSender();
 
-        (bool success, ) = msg.sender.call{value: wad}("");
+        _burn(_sender, wad);
+
+        (bool success, ) = _sender.call{value: wad}("");
         require(success, "withdraw ETH failed");
 
-        emit Withdrawal(msg.sender, wad);
+        emit Withdrawal(_sender, wad);
     }
 }

contracts/src/gas-swap/GasSwap.sol

@@ -144,10 +144,10 @@ contract GasSwap is ERC2771Context, Ownable, ReentrancyGuard {
     /// @param _amount The amount of token to withdraw.
     function withdraw(address _token, uint256 _amount) external onlyOwner {
         if (_token == address(0)) {
-            (bool success, ) = msg.sender.call{value: _amount}("");
+            (bool success, ) = _msgSender().call{value: _amount}("");
             require(success, "ETH transfer failed");
         } else {
-            IERC20(_token).safeTransfer(msg.sender, _amount);
+            IERC20(_token).safeTransfer(_msgSender(), _amount);
         }
     }
 

contracts/src/libraries/ScrollMessengerBase.sol

@@ -7,7 +7,6 @@ import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/
 import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
 
 import {ScrollConstants} from "./constants/ScrollConstants.sol";
-import {IETHRateLimiter} from "../rate-limiter/IETHRateLimiter.sol";
 import {IScrollMessenger} from "./IScrollMessenger.sol";
 
 // solhint-disable var-name-mixedcase
@@ -27,11 +26,6 @@ abstract contract ScrollMessengerBase is
     /// @param _newFeeVault The address of new fee vault contract.
     event UpdateFeeVault(address _oldFeeVault, address _newFeeVault);
 
-    /// @notice Emitted when owner updates rate limiter contract.
-    /// @param _oldRateLimiter The address of old rate limiter contract.
-    /// @param _newRateLimiter The address of new rate limiter contract.
-    event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter);
-
     /*************
      * Variables *
      *************/
@@ -45,8 +39,8 @@ abstract contract ScrollMessengerBase is
     /// @notice The address of fee vault, collecting cross domain messaging fee.
     address public feeVault;
 
-    /// @notice The address of ETH rate limiter contract.
-    address public rateLimiter;
+    /// @dev The storage slot used as ETH rate limiter contract, which is deprecated now.
+    address private __rateLimiter;
 
     /// @dev The storage slots for future usage.
     uint256[46] private __gap;
@@ -98,16 +92,6 @@ abstract contract ScrollMessengerBase is
         emit UpdateFeeVault(_oldFeeVault, _newFeeVault);
     }
 
-    /// @notice Update rate limiter contract.
-    /// @dev This function can only called by contract owner.
-    /// @param _newRateLimiter The address of new rate limiter contract.
-    function updateRateLimiter(address _newRateLimiter) external onlyOwner {
-        address _oldRateLimiter = rateLimiter;
-
-        rateLimiter = _newRateLimiter;
-        emit UpdateRateLimiter(_oldRateLimiter, _newRateLimiter);
-    }
-
     /// @notice Pause the contract
     /// @dev This function can only called by contract owner.
     /// @param _status The pause status to update.
@@ -148,26 +132,11 @@ abstract contract ScrollMessengerBase is
             );
     }
 
-    /// @dev Internal function to increase ETH usage for the given `_sender`.
-    /// @param _amount The amount of ETH used.
-    function _addUsedAmount(uint256 _amount) internal {
-        if (_amount == 0) return;
-
-        address _rateLimiter = rateLimiter;
-        if (_rateLimiter != address(0)) {
-            IETHRateLimiter(_rateLimiter).addUsedAmount(_amount);
-        }
-    }
-
     /// @dev Internal function to check whether the `_target` address is allowed to avoid attack.
     /// @param _target The address of target address to check.
     function _validateTargetAddress(address _target) internal view {
         // @note check more `_target` address to avoid attack in the future when we add more external contracts.
 
-        address _rateLimiter = rateLimiter;
-        if (_rateLimiter != address(0)) {
-            require(_target != _rateLimiter, "Forbid to call rate limiter");
-        }
         require(_target != address(this), "Forbid to call self");
     }
 }

contracts/src/libraries/gateway/ScrollGatewayBase.sol

@@ -14,15 +14,6 @@ import {ITokenRateLimiter} from "../../rate-limiter/ITokenRateLimiter.sol";
 /// @title ScrollGatewayBase
 /// @notice The `ScrollGatewayBase` is a base contract for gateway contracts used in both in L1 and L2.
 abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgradeable, IScrollGateway {
-    /**********
-     * Events *
-     **********/
-
-    /// @notice Emitted when owner updates rate limiter contract.
-    /// @param _oldRateLimiter The address of old rate limiter contract.
-    /// @param _newRateLimiter The address of new rate limiter contract.
-    event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter);
-
     /*************
      * Variables *
      *************/
@@ -36,8 +27,8 @@ abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgrad
     /// @inheritdoc IScrollGateway
     address public override messenger;
 
-    /// @notice The address of token rate limiter contract.
-    address public rateLimiter;
+    /// @dev The storage slot used as token rate limiter contract, which is deprecated now.
+    address private __rateLimiter;
 
     /// @dev The storage slots for future usage.
     uint256[46] private __gap;
@@ -48,14 +39,14 @@ abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgrad
 
     modifier onlyCallByCounterpart() {
         address _messenger = messenger; // gas saving
-        require(msg.sender == _messenger, "only messenger can call");
+        require(_msgSender() == _messenger, "only messenger can call");
         require(counterpart == IScrollMessenger(_messenger).xDomainMessageSender(), "only call by counterpart");
         _;
     }
 
     modifier onlyInDropContext() {
         address _messenger = messenger; // gas saving
-        require(msg.sender == _messenger, "only messenger can call");
+        require(_msgSender() == _messenger, "only messenger can call");
         require(
             ScrollConstants.DROP_XDOMAIN_MESSAGE_SENDER == IScrollMessenger(_messenger).xDomainMessageSender(),
             "only called in drop context"
@@ -87,20 +78,6 @@ abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgrad
         }
     }
 
-    /************************
-     * Restricted Functions *
-     ************************/
-
-    /// @notice Update rate limiter contract.
-    /// @dev This function can only called by contract owner.
-    /// @param _newRateLimiter The address of new rate limiter contract.
-    function updateRateLimiter(address _newRateLimiter) external onlyOwner {
-        address _oldRateLimiter = rateLimiter;
-
-        rateLimiter = _newRateLimiter;
-        emit UpdateRateLimiter(_oldRateLimiter, _newRateLimiter);
-    }
-
     /**********************
      * Internal Functions *
      **********************/
@@ -113,16 +90,4 @@ abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgrad
             IScrollGatewayCallback(_to).onScrollGatewayCallback(_data);
         }
     }
-
-    /// @dev Internal function to increase token usage for the given `_sender`.
-    /// @param _token The address of token.
-    /// @param _amount The amount of token used.
-    function _addUsedAmount(address _token, uint256 _amount) internal {
-        if (_amount == 0) return;
-
-        address _rateLimiter = rateLimiter;
-        if (_rateLimiter != address(0)) {
-            ITokenRateLimiter(_rateLimiter).addUsedAmount(_token, _amount);
-        }
-    }
 }

contracts/src/libraries/token/ScrollStandardERC20.sol

@@ -24,7 +24,7 @@ contract ScrollStandardERC20 is ERC20PermitUpgradeable, IScrollERC20Upgradeable
     uint8 private decimals_;
 
     modifier onlyGateway() {
-        require(gateway == msg.sender, "Only Gateway");
+        require(gateway == _msgSender(), "Only Gateway");
         _;
     }
 
@@ -72,7 +72,7 @@ contract ScrollStandardERC20 is ERC20PermitUpgradeable, IScrollERC20Upgradeable
         bytes memory data
     ) private {
         IERC677Receiver receiver = IERC677Receiver(to);
-        receiver.onTokenTransfer(msg.sender, value, data);
+        receiver.onTokenTransfer(_msgSender(), value, data);
     }
 
     function isContract(address _addr) private view returns (bool hasCode) {

contracts/src/misc/ScrollOwner.sol

@@ -52,7 +52,7 @@ contract ScrollOwner is AccessControlEnumerable {
      ***************/
 
     constructor() {
-        _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
+        _grantRole(DEFAULT_ADMIN_ROLE, _msgSender());
     }
 
     /*************************

contracts/src/rate-limiter/ETHRateLimiter.sol

@@ -67,7 +67,7 @@ contract ETHRateLimiter is Ownable, IETHRateLimiter {
 
     /// @inheritdoc IETHRateLimiter
     function addUsedAmount(uint256 _amount) external override {
-        if (msg.sender != spender) {
+        if (_msgSender() != spender) {
             revert CallerNotSpender();
         }
         if (_amount == 0) return;

contracts/src/rate-limiter/TokenRateLimiter.sol

@@ -54,7 +54,7 @@ contract TokenRateLimiter is AccessControlEnumerable, ITokenRateLimiter {
             revert PeriodIsZero();
         }
 
-        _grantRole(DEFAULT_ADMIN_ROLE, msg.sender);
+        _grantRole(DEFAULT_ADMIN_ROLE, _msgSender());
 
         periodDuration = _periodDuration;
     }

contracts/src/test/L1ScrollMessengerTest.t.sol

@@ -42,26 +42,6 @@ contract L1ScrollMessengerTest is L1GatewayTestBase {
         l1Messenger.relayMessageWithProof(address(this), address(messageQueue), 0, 0, new bytes(0), proof);
     }
 
-    function testForbidCallRateLimiterFromL2() external {
-        l1Messenger.updateRateLimiter(address(1));
-        bytes32 _xDomainCalldataHash = keccak256(
-            abi.encodeWithSignature(
-                "relayMessage(address,address,uint256,uint256,bytes)",
-                address(this),
-                address(1),
-                0,
-                0,
-                new bytes(0)
-            )
-        );
-        prepareL2MessageRoot(_xDomainCalldataHash);
-        IL1ScrollMessenger.L2MessageProof memory proof;
-        proof.batchIndex = rollup.lastFinalizedBatchIndex();
-
-        hevm.expectRevert("Forbid to call rate limiter");
-        l1Messenger.relayMessageWithProof(address(this), address(1), 0, 0, new bytes(0), proof);
-    }
-
     function testForbidCallSelfFromL2() external {
         bytes32 _xDomainCalldataHash = keccak256(
             abi.encodeWithSignature(

contracts/src/test/L2ScrollMessenger.t.sol

@@ -51,15 +51,10 @@ contract L2ScrollMessengerTest is DSTestPlus {
     }
 
     function testForbidCallFromL1() external {
-        l2Messenger.updateRateLimiter(address(1));
-
         hevm.startPrank(AddressAliasHelper.applyL1ToL2Alias(address(l1Messenger)));
         hevm.expectRevert("Forbid to call message queue");
         l2Messenger.relayMessage(address(this), address(l2MessageQueue), 0, 0, new bytes(0));
 
-        hevm.expectRevert("Forbid to call rate limiter");
-        l2Messenger.relayMessage(address(this), address(1), 0, 0, new bytes(0));
-
         hevm.expectRevert("Forbid to call self");
         l2Messenger.relayMessage(address(this), address(l2Messenger), 0, 0, new bytes(0));
         hevm.stopPrank();

database/migrate/migrate_test.go

@@ -63,7 +63,7 @@ func testResetDB(t *testing.T) {
 	cur, err := Current(pgDB.DB)
 	assert.NoError(t, err)
 	// total number of tables.
-	assert.Equal(t, 13, int(cur))
+	assert.Equal(t, 14, int(cur))
 }
 
 func testMigrate(t *testing.T) {

database/migrate/migrations/00014_add_chunk_get_task_index.sql

@@ -0,0 +1,27 @@
+-- +goose Up
+-- +goose StatementBegin
+
+drop index if exists idx_total_attempts_active_attempts_end_block_number;
+drop index if exists idx_total_attempts_active_attempts_chunk_proofs_status;
+
+create index if not exists idx_chunk_proving_status_index on chunk (proving_status, index) where deleted_at IS NULL;
+create index if not exists idx_batch_proving_status_index on batch (proving_status, chunk_proofs_status, index) where deleted_at IS NULL;
+
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+
+create index if not exists idx_total_attempts_active_attempts_end_block_number
+    on chunk (total_attempts, active_attempts, end_block_number)
+    where deleted_at IS NULL;
+
+create index if not exists idx_total_attempts_active_attempts_chunk_proofs_status
+    on batch (total_attempts, active_attempts, chunk_proofs_status)
+    where deleted_at IS NULL;
+
+
+drop index if exists idx_chunk_proving_status_index;
+drop index if exists idx_batch_proving_status_index;
+
+-- +goose StatementEnd

rollup/internal/controller/relayer/l2_relayer.go

@@ -582,7 +582,8 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 			status = types.RollupCommitted
 		} else {
 			status = types.RollupCommitFailed
-			log.Warn("transaction confirmed but failed in layer1", "confirmation", confirmation)
+			r.metrics.rollupL2BatchesCommittedConfirmedFailedTotal.Inc()
+			log.Warn("commitBatch transaction confirmed but failed in layer1", "confirmation", confirmation)
 		}
 		// @todo handle db error
 		err := r.batchOrm.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHash.(string), confirmation.TxHash.String(), status)
@@ -603,7 +604,8 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 			status = types.RollupFinalized
 		} else {
 			status = types.RollupFinalizeFailed
-			log.Warn("transaction confirmed but failed in layer1", "confirmation", confirmation)
+			r.metrics.rollupL2BatchesFinalizedConfirmedFailedTotal.Inc()
+			log.Warn("finalizeBatchWithProof transaction confirmed but failed in layer1", "confirmation", confirmation)
 		}
 
 		// @todo handle db error

rollup/internal/controller/relayer/l2_relayer_metrics.go

@@ -16,7 +16,9 @@ type l2RelayerMetrics struct {
 	rollupL2RelayerProcessCommittedBatchesFinalizedTotal        prometheus.Counter
 	rollupL2RelayerProcessCommittedBatchesFinalizedSuccessTotal prometheus.Counter
 	rollupL2BatchesCommittedConfirmedTotal                      prometheus.Counter
+	rollupL2BatchesCommittedConfirmedFailedTotal                prometheus.Counter
 	rollupL2BatchesFinalizedConfirmedTotal                      prometheus.Counter
+	rollupL2BatchesFinalizedConfirmedFailedTotal                prometheus.Counter
 	rollupL2BatchesGasOraclerConfirmedTotal                     prometheus.Counter
 	rollupL2ChainMonitorLatestFailedCall                        prometheus.Counter
 	rollupL2ChainMonitorLatestFailedBatchStatus                 prometheus.Counter
@@ -62,10 +64,18 @@ func initL2RelayerMetrics(reg prometheus.Registerer) *l2RelayerMetrics {
 				Name: "rollup_layer2_process_committed_batches_confirmed_total",
 				Help: "The total number of layer2 process committed batches confirmed total",
 			}),
+			rollupL2BatchesCommittedConfirmedFailedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
+				Name: "rollup_layer2_process_committed_batches_confirmed_failed_total",
+				Help: "The total number of layer2 process committed batches confirmed failed total",
+			}),
 			rollupL2BatchesFinalizedConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
 				Name: "rollup_layer2_process_finalized_batches_confirmed_total",
 				Help: "The total number of layer2 process finalized batches confirmed total",
 			}),
+			rollupL2BatchesFinalizedConfirmedFailedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
+				Name: "rollup_layer2_process_finalized_batches_confirmed_failed_total",
+				Help: "The total number of layer2 process finalized batches confirmed failed total",
+			}),
 			rollupL2BatchesGasOraclerConfirmedTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
 				Name: "rollup_layer2_process_gras_oracler_confirmed_total",
 				Help: "The total number of layer2 process finalized batches confirmed total",

rollup/internal/controller/watcher/l2_watcher.go

@@ -180,6 +180,9 @@ func (w *L2WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to u
 	}
 
 	if len(blocks) > 0 {
+		for _, block := range blocks {
+			w.metrics.rollupL2BlockL1CommitCalldataSize.Set(float64(block.EstimateL1CommitCalldataSize()))
+		}
 		if err := w.l2BlockOrm.InsertL2Blocks(w.ctx, blocks); err != nil {
 			return fmt.Errorf("failed to batch insert BlockTraces: %v", err)
 		}

rollup/internal/controller/watcher/l2_watcher_metrics.go

@@ -8,12 +8,13 @@ import (
 )
 
 type l2WatcherMetrics struct {
-	fetchRunningMissingBlocksTotal  prometheus.Counter
-	fetchRunningMissingBlocksHeight prometheus.Gauge
-	fetchContractEventTotal         prometheus.Counter
-	fetchContractEventHeight        prometheus.Gauge
-	rollupL2MsgsRelayedEventsTotal  prometheus.Counter
-	rollupL2BlocksFetchedGap        prometheus.Gauge
+	fetchRunningMissingBlocksTotal    prometheus.Counter
+	fetchRunningMissingBlocksHeight   prometheus.Gauge
+	fetchContractEventTotal           prometheus.Counter
+	fetchContractEventHeight          prometheus.Gauge
+	rollupL2MsgsRelayedEventsTotal    prometheus.Counter
+	rollupL2BlocksFetchedGap          prometheus.Gauge
+	rollupL2BlockL1CommitCalldataSize prometheus.Gauge
 }
 
 var (
@@ -48,6 +49,10 @@ func initL2WatcherMetrics(reg prometheus.Registerer) *l2WatcherMetrics {
 				Name: "rollup_l2_watcher_blocks_fetched_gap",
 				Help: "The gap of l2 fetch",
 			}),
+			rollupL2BlockL1CommitCalldataSize: promauto.With(reg).NewGauge(prometheus.GaugeOpts{
+				Name: "rollup_l2_block_l1_commit_calldata_size",
+				Help: "The l1 commitBatch calldata size of the l2 block",
+			}),
 		}
 	})
 	return l2WatcherMetric