wip

Author: palango

op-chain-ops/cmd/celo-migrate/main.go

@@ -391,7 +391,12 @@ func ApplyMigrationChangesToDB(ldb ethdb.Database, genesis *core.Genesis, commit
 		EIP1559Denominator: EIP1559Denominator,
 		EIP1559Elasticity:  EIP1559Elasticity,
 	}
-	// TODO(pl) Add Ecotone and other hardforks
+	cfg.CanyonTime = &cel2Header.Time
+	cfg.EcotoneTime = &cel2Header.Time
+
+	// TODO(pl): What about Ethereum hardforks
+
+	log.Info("Write new config to database", "config", cfg)
 
 	// Write the chain config to disk.
 	rawdb.WriteChainConfig(ldb, cel2Block.Hash(), cfg)

op-chain-ops/cmd/celo-migrate/test_config.json

@@ -122,6 +122,8 @@ func BuildL2Genesis(config *DeployConfig, l1StartBlock *types.Block) (*core.Gene
 }
 
 func PerformUpgradeTxs(db *state.MemoryStateDB) error {
+	log.Info("Running Ecotone upgrade transactions")
+
 	// Only the Ecotone upgrade is performed with upgrade-txs.
 	if !db.Genesis().Config.IsEcotone(db.Genesis().Timestamp) {
 		return nil

op-chain-ops/genesis/layer_two.go

@@ -165,7 +165,7 @@ func (sim *SquashSim) AddUpgradeTxs(txs []hexutil.Bytes) error {
 			return fmt.Errorf("failed to turn upgrade tx %d into message: %w", i, err)
 		}
 		if !msg.IsDepositTx {
-			return fmt.Errorf("upgrade tx %d is not a depost", i)
+			return fmt.Errorf("upgrade tx %d is not a deposit", i)
 		}
 		if res, err := sim.AddMessage(msg); err != nil {
 			return fmt.Errorf("invalid upgrade tx %d, EVM invocation failed: %w", i, err)