diff --git a/params/config.go b/params/config.go index 4450c250f09a..acef5214f002 100644 --- a/params/config.go +++ b/params/config.go @@ -24,6 +24,7 @@ import ( "golang.org/x/crypto/sha3" "github.com/scroll-tech/go-ethereum/common" + "github.com/scroll-tech/go-ethereum/rollup/rcfg" ) // Genesis hashes to enforce below configs on. @@ -255,7 +256,6 @@ var ( } // ScrollAlphaChainConfig contains the chain parameters to run a node on the Scroll Alpha test network. - ScrollFeeVaultAddress = common.HexToAddress("0x5300000000000000000000000000000000000005") ScrollMaxTxPerBlock = 44 ScrollMaxTxPayloadBytesPerBlock = 120 * 1024 @@ -285,7 +285,7 @@ var ( UseZktrie: true, MaxTxPerBlock: &ScrollMaxTxPerBlock, MaxTxPayloadBytesPerBlock: &ScrollMaxTxPayloadBytesPerBlock, - FeeVaultAddress: &ScrollFeeVaultAddress, + FeeVaultAddress: &rcfg.ScrollFeeVaultAddress, EnableEIP2718: false, EnableEIP1559: false, }, diff --git a/rollup/rcfg/config.go b/rollup/rcfg/config.go index 3d2bd54e6753..3e0e00ce041e 100644 --- a/rollup/rcfg/config.go +++ b/rollup/rcfg/config.go @@ -16,6 +16,11 @@ var ( L2MessageQueueAddress = common.HexToAddress("0x5300000000000000000000000000000000000000") WithdrawTrieRootSlot = common.BigToHash(big.NewInt(0)) + // ScrollFeeVaultAddress is the address of the L2TxFeeVault + // predeploy + // see scroll-tech/scroll/contracts/src/L2/predeploys/L2TxFeeVault.sol + ScrollFeeVaultAddress = common.HexToAddress("0x5300000000000000000000000000000000000005") + // L1GasPriceOracleAddress is the address of the L1GasPriceOracle // predeploy // see scroll-tech/scroll/contracts/src/L2/predeploys/L1GasPriceOracle.sol