op-deployer: Fee Recipients and Gas Params added to intent (#12404)

* op-deployer: Fee Recipients and Gas Params added to intent

* fix: retrieved fee recipients from docs.

* fix: added a loose test for checking fee vault recipients and gas params.

* fix: programmatically retrieving the proxy impl address to check the immutable.

* fix: fee recipient per chain

op-chain-ops/deployer/init.go

@@ -106,6 +106,11 @@ func Init(cfg InitConfig) error {
 		l2ChainIDBig := l2ChainID.Big()
 		intent.Chains = append(intent.Chains, &state.ChainIntent{
 			ID:                         l2ChainID,
+			BaseFeeVaultRecipient:      common.Address{},
+			L1FeeVaultRecipient:        common.Address{},
+			SequencerFeeVaultRecipient: common.Address{},
+			Eip1559Denominator:         50,
+			Eip1559Elasticity:          6,
 			Roles: state.ChainRoles{
 				ProxyAdminOwner:      addrFor(devkeys.L2ProxyAdminOwnerRole.Key(l2ChainIDBig)),
 				SystemConfigOwner:    addrFor(devkeys.SystemConfigOwner.Key(l2ChainIDBig)),

op-chain-ops/deployer/integration_test/apply_test.go

@@ -9,22 +9,25 @@ import (
 	"os"
 	"path"
 	"runtime"
+	"strings"
 	"testing"
 	"time"
 
-	"github.com/ethereum-optimism/optimism/op-service/testutils/anvil"
-	crypto "github.com/ethereum/go-ethereum/crypto"
-
 	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer"
 	"github.com/holiman/uint256"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/pipeline"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/deployer/state"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/devkeys"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 	opcrypto "github.com/ethereum-optimism/optimism/op-service/crypto"
+	"github.com/ethereum-optimism/optimism/op-service/predeploys"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
+	"github.com/ethereum-optimism/optimism/op-service/testutils/anvil"
 	"github.com/ethereum-optimism/optimism/op-service/testutils/kurtosisutil"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/stretchr/testify/require"
 )
@@ -141,7 +144,7 @@ func TestEndToEndApply(t *testing.T) {
 			})
 		}
 
-		validateOPChainDeployment(t, ctx, l1Client, st)
+		validateOPChainDeployment(t, ctx, l1Client, st, intent)
 	})
 
 	t.Run("subsequent chain", func(t *testing.T) {
@@ -172,7 +175,7 @@ func TestEndToEndApply(t *testing.T) {
 			})
 		}
 
-		validateOPChainDeployment(t, ctx, l1Client, st)
+		validateOPChainDeployment(t, ctx, l1Client, st, intent)
 	})
 }
 
@@ -208,6 +211,11 @@ func makeIntent(
 		Chains: []*state.ChainIntent{
 			{
 				ID:                         l2ChainID.Bytes32(),
+				BaseFeeVaultRecipient:      addrFor(devkeys.BaseFeeVaultRecipientRole.Key(l1ChainID)),
+				L1FeeVaultRecipient:        addrFor(devkeys.L1FeeVaultRecipientRole.Key(l1ChainID)),
+				SequencerFeeVaultRecipient: addrFor(devkeys.SequencerFeeVaultRecipientRole.Key(l1ChainID)),
+				Eip1559Denominator:         50,
+				Eip1559Elasticity:          6,
 				Roles: state.ChainRoles{
 					ProxyAdminOwner:      addrFor(devkeys.L2ProxyAdminOwnerRole.Key(l1ChainID)),
 					SystemConfigOwner:    addrFor(devkeys.SystemConfigOwner.Key(l1ChainID)),
@@ -226,7 +234,7 @@ func makeIntent(
 	return intent, st
 }
 
-func validateOPChainDeployment(t *testing.T, ctx context.Context, l1Client *ethclient.Client, st *state.State) {
+func validateOPChainDeployment(t *testing.T, ctx context.Context, l1Client *ethclient.Client, st *state.State, intent *state.Intent) {
 	for _, chainState := range st.Chains {
 		chainAddrs := []struct {
 			name string
@@ -261,10 +269,40 @@ func validateOPChainDeployment(t *testing.T, ctx context.Context, l1Client *ethc
 
 		t.Run("l2 genesis", func(t *testing.T) {
 			require.Greater(t, len(chainState.Allocs), 0)
+			l2Allocs, _ := chainState.UnmarshalAllocs()
+			alloc := l2Allocs.Copy().Accounts
+
+			firstChainIntent := intent.Chains[0]
+			checkImmutable(t, alloc, predeploys.BaseFeeVaultAddr, firstChainIntent.BaseFeeVaultRecipient)
+			checkImmutable(t, alloc, predeploys.L1FeeVaultAddr, firstChainIntent.L1FeeVaultRecipient)
+			checkImmutable(t, alloc, predeploys.SequencerFeeVaultAddr, firstChainIntent.SequencerFeeVaultRecipient)
+
+			require.Equal(t, int(firstChainIntent.Eip1559Denominator), 50, "EIP1559Denominator should be set")
+			require.Equal(t, int(firstChainIntent.Eip1559Elasticity), 6, "EIP1559Elasticity should be set")
 		})
 	}
 }
 
+func getEIP1967ImplementationAddress(t *testing.T, allocations types.GenesisAlloc, proxyAddress common.Address) common.Address {
+	storage := allocations[proxyAddress].Storage
+	storageValue := storage[genesis.ImplementationSlot]
+	require.NotEmpty(t, storageValue, "Implementation address for %s should be set", proxyAddress)
+	return common.HexToAddress(storageValue.Hex())
+}
+
+func checkImmutable(t *testing.T, allocations types.GenesisAlloc, proxyContract common.Address, feeRecipient common.Address) {
+	implementationAddress := getEIP1967ImplementationAddress(t, allocations, proxyContract)
+	account, ok := allocations[implementationAddress]
+	require.True(t, ok, "%s not found in allocations", implementationAddress.Hex())
+	require.NotEmpty(t, account.Code, "%s should have code", implementationAddress.Hex())
+	require.Contains(
+		t,
+		strings.ToLower(common.Bytes2Hex(account.Code)),
+		strings.ToLower(strings.TrimPrefix(feeRecipient.Hex(), "0x")),
+		"%s code should contain %s immutable", implementationAddress.Hex(), feeRecipient.Hex(),
+	)
+}
+
 func TestApplyExistingOPCM(t *testing.T) {
 	anvil.Test(t)
 
@@ -321,7 +359,7 @@ func TestApplyExistingOPCM(t *testing.T) {
 		st,
 	))
 
-	validateOPChainDeployment(t, ctx, l1Client, st)
+	validateOPChainDeployment(t, ctx, l1Client, st, intent)
 }
 
 func TestL2BlockTimeOverride(t *testing.T) {

op-chain-ops/deployer/state/deploy_config.go

@@ -18,7 +18,7 @@ var (
 	vaultMinWithdrawalAmount = mustHexBigFromHex("0x8ac7230489e80000")
 )
 
-func DefaultDeployConfig() genesis.DeployConfig {
+func DefaultDeployConfig(chainIntent *ChainIntent) genesis.DeployConfig {
 	return genesis.DeployConfig{
 		L2InitializationConfig: genesis.L2InitializationConfig{
 			L2GenesisBlockDeployConfig: genesis.L2GenesisBlockDeployConfig{
@@ -32,6 +32,9 @@ func DefaultDeployConfig() genesis.DeployConfig {
 				SequencerFeeVaultMinimumWithdrawalAmount: vaultMinWithdrawalAmount,
 				BaseFeeVaultMinimumWithdrawalAmount:      vaultMinWithdrawalAmount,
 				L1FeeVaultMinimumWithdrawalAmount:        vaultMinWithdrawalAmount,
+				BaseFeeVaultRecipient:                    chainIntent.BaseFeeVaultRecipient,
+				L1FeeVaultRecipient:                      chainIntent.L1FeeVaultRecipient,
+				SequencerFeeVaultRecipient:               chainIntent.SequencerFeeVaultRecipient,
 			},
 			GovernanceDeployConfig: genesis.GovernanceDeployConfig{
 				EnableGovernance:      true,
@@ -43,9 +46,9 @@ func DefaultDeployConfig() genesis.DeployConfig {
 				GasPriceOracleBlobBaseFeeScalar: 810949,
 			},
 			EIP1559DeployConfig: genesis.EIP1559DeployConfig{
-				EIP1559Denominator:       50,
+				EIP1559Denominator:       chainIntent.Eip1559Denominator,
 				EIP1559DenominatorCanyon: 250,
-				EIP1559Elasticity:        6,
+				EIP1559Elasticity:        chainIntent.Eip1559Elasticity,
 			},
 			UpgradeScheduleDeployConfig: genesis.UpgradeScheduleDeployConfig{
 				L2GenesisRegolithTimeOffset: u64UtilPtr(0),
@@ -76,7 +79,8 @@ func DefaultDeployConfig() genesis.DeployConfig {
 }
 
 func CombineDeployConfig(intent *Intent, chainIntent *ChainIntent, state *State, chainState *ChainState) (genesis.DeployConfig, error) {
-	cfg := DefaultDeployConfig()
+	firstChainIntent := intent.Chains[0]
+	cfg := DefaultDeployConfig(firstChainIntent)
 
 	var err error
 	if len(intent.GlobalDeployOverrides) > 0 {

op-chain-ops/deployer/state/intent.go

@@ -97,6 +97,16 @@ type SuperchainRoles struct {
 type ChainIntent struct {
 	ID common.Hash `json:"id" toml:"id"`
 
+	BaseFeeVaultRecipient common.Address `json:"baseFeeVaultRecipient" toml:"baseFeeVaultRecipient"`
+
+	L1FeeVaultRecipient common.Address `json:"l1FeeVaultRecipient" toml:"l1FeeVaultRecipient"`
+
+	SequencerFeeVaultRecipient common.Address `json:"sequencerFeeVaultRecipient" toml:"sequencerFeeVaultRecipient"`
+
+	Eip1559Denominator uint64 `json:"eip1559Denominator" toml:"eip1559Denominator"`
+
+	Eip1559Elasticity uint64 `json:"eip1559Elasticity" toml:"eip1559Elasticity"`
+
 	Roles ChainRoles `json:"roles" toml:"roles"`
 
 	DeployOverrides map[string]any `json:"deployOverrides" toml:"deployOverrides"`