chore: merge genesisapplier & genesisdeployment (#63)

* genesis package

* nits

config/chain.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	registry "github.com/ethereum-optimism/superchain-registry/superchain"
-	"github.com/ethereum-optimism/supersim/genesisdeployment"
+	"github.com/ethereum-optimism/supersim/genesis"
 	"github.com/ethereum-optimism/supersim/hdaccount"
 
 	"github.com/ethereum/go-ethereum"
@@ -25,28 +25,28 @@ var (
 	DefaultChainConfigs = []ChainConfig{
 		{
 			Name:          "SourceChain",
-			ChainID:       genesisdeployment.GeneratedGenesisDeployment.L1.ChainID,
+			ChainID:       genesis.GeneratedGenesisDeployment.L1.ChainID,
 			SecretsConfig: DefaultSecretsConfig,
-			GenesisJSON:   genesisdeployment.GeneratedGenesisDeployment.L1.GenesisJSON,
+			GenesisJSON:   genesis.GeneratedGenesisDeployment.L1.GenesisJSON,
 		},
 		{
 			Name:          "OPChainA",
-			ChainID:       genesisdeployment.GeneratedGenesisDeployment.L2s[0].ChainID,
+			ChainID:       genesis.GeneratedGenesisDeployment.L2s[0].ChainID,
 			SecretsConfig: DefaultSecretsConfig,
-			GenesisJSON:   genesisdeployment.GeneratedGenesisDeployment.L2s[0].GenesisJSON,
+			GenesisJSON:   genesis.GeneratedGenesisDeployment.L2s[0].GenesisJSON,
 			L2Config: &L2Config{
-				L1ChainID:   genesisdeployment.GeneratedGenesisDeployment.L1.ChainID,
-				L1Addresses: genesisdeployment.GeneratedGenesisDeployment.L2s[0].RegistryAddressList(),
+				L1ChainID:   genesis.GeneratedGenesisDeployment.L1.ChainID,
+				L1Addresses: genesis.GeneratedGenesisDeployment.L2s[0].RegistryAddressList(),
 			},
 		},
 		{
 			Name:          "OPChainB",
-			ChainID:       genesisdeployment.GeneratedGenesisDeployment.L2s[1].ChainID,
+			ChainID:       genesis.GeneratedGenesisDeployment.L2s[1].ChainID,
 			SecretsConfig: DefaultSecretsConfig,
-			GenesisJSON:   genesisdeployment.GeneratedGenesisDeployment.L2s[1].GenesisJSON,
+			GenesisJSON:   genesis.GeneratedGenesisDeployment.L2s[1].GenesisJSON,
 			L2Config: &L2Config{
-				L1ChainID:   genesisdeployment.GeneratedGenesisDeployment.L1.ChainID,
-				L1Addresses: genesisdeployment.GeneratedGenesisDeployment.L2s[1].RegistryAddressList(),
+				L1ChainID:   genesis.GeneratedGenesisDeployment.L1.ChainID,
+				L1Addresses: genesis.GeneratedGenesisDeployment.L2s[1].RegistryAddressList(),
 			},
 		},
 	}

genesis/applier.go

@@ -0,0 +1,27 @@
+package genesis
+
+import (
+	"encoding/json"
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/core"
+)
+
+func ApplyChainID(genesisJson []byte, chainId *big.Int) ([]byte, error) {
+	var genesis core.Genesis
+	if err := json.Unmarshal(genesisJson, &genesis); err != nil {
+		return nil, fmt.Errorf("unable to parse genesis json: %w", err)
+	}
+
+	if genesis.Config.ChainID.Cmp(chainId) != 0 {
+		genesis.Config.ChainID = chainId
+	}
+
+	result, err := json.Marshal(genesis)
+	if err != nil {
+		return nil, fmt.Errorf("error marshaling genesis: %w", err)
+	}
+
+	return result, nil
+}

genesisdeployment/genesisdeployment.go → genesis/deployment.go

@@ -1,4 +1,4 @@
-package genesisdeployment
+package genesis
 
 import (
 	_ "embed"