Update CommitScalarSlot to ExecScalarSlot

Author: ranchalp

consensus/misc/curie.go

@@ -18,6 +18,6 @@ func ApplyCurieHardFork(statedb *state.StateDB) {
 	// initialize new storage slots
 	statedb.SetState(rcfg.L1GasPriceOracleAddress, rcfg.IsCurieSlot, common.BytesToHash([]byte{1}))
 	statedb.SetState(rcfg.L1GasPriceOracleAddress, rcfg.L1BlobBaseFeeSlot, common.BytesToHash([]byte{1}))
-	statedb.SetState(rcfg.L1GasPriceOracleAddress, rcfg.CommitScalarSlot, common.BigToHash(rcfg.InitialCommitScalar))
+	statedb.SetState(rcfg.L1GasPriceOracleAddress, rcfg.ExecScalarSlot, common.BigToHash(rcfg.InitialCommitScalar))
 	statedb.SetState(rcfg.L1GasPriceOracleAddress, rcfg.BlobScalarSlot, common.BigToHash(rcfg.InitialBlobScalar))
 }

core/blockchain_test.go

@@ -3757,7 +3757,7 @@ func TestCurieTransition(t *testing.T) {
 		poseidonCodeHash := statedb.GetPoseidonCodeHash(rcfg.L1GasPriceOracleAddress)
 
 		l1BlobBaseFee := statedb.GetState(rcfg.L1GasPriceOracleAddress, rcfg.L1BlobBaseFeeSlot)
-		commitScalar := statedb.GetState(rcfg.L1GasPriceOracleAddress, rcfg.CommitScalarSlot)
+		commitScalar := statedb.GetState(rcfg.L1GasPriceOracleAddress, rcfg.ExecScalarSlot)
 		blobScalar := statedb.GetState(rcfg.L1GasPriceOracleAddress, rcfg.BlobScalarSlot)
 		isCurie := statedb.GetState(rcfg.L1GasPriceOracleAddress, rcfg.IsCurieSlot)
 

ethclient/ethclient_test.go

@@ -201,7 +201,7 @@ var genesis = &core.Genesis{
 				rcfg.OverheadSlot:      common.BigToHash(big.NewInt(10000)),
 				rcfg.ScalarSlot:        common.BigToHash(big.NewInt(10000)),
 				rcfg.L1BlobBaseFeeSlot: common.BigToHash(big.NewInt(10000)),
-				rcfg.CommitScalarSlot:  common.BigToHash(big.NewInt(10000)),
+				rcfg.ExecScalarSlot:    common.BigToHash(big.NewInt(10000)),
 				rcfg.BlobScalarSlot:    common.BigToHash(big.NewInt(10000)),
 				rcfg.IsCurieSlot:       common.BytesToHash([]byte{1}),
 			},

ethclient/gethclient/gethclient_test.go

@@ -85,7 +85,7 @@ func generateTestChain() (*core.Genesis, []*types.Block) {
 					rcfg.OverheadSlot:      common.BigToHash(big.NewInt(10000)),
 					rcfg.ScalarSlot:        common.BigToHash(big.NewInt(10000)),
 					rcfg.L1BlobBaseFeeSlot: common.BigToHash(big.NewInt(10000)),
-					rcfg.CommitScalarSlot:  common.BigToHash(big.NewInt(10000)),
+					rcfg.ExecScalarSlot:    common.BigToHash(big.NewInt(10000)),
 					rcfg.BlobScalarSlot:    common.BigToHash(big.NewInt(10000)),
 					rcfg.IsCurieSlot:       common.BytesToHash([]byte{1}),
 				},

rollup/fees/rollup_fee.go

@@ -166,7 +166,7 @@ func readGPOStorageSlots(addr common.Address, state StateDB) gpoState {
 	gpoState.overhead = state.GetState(addr, rcfg.OverheadSlot).Big()
 	gpoState.scalar = state.GetState(addr, rcfg.ScalarSlot).Big()
 	gpoState.l1BlobBaseFee = state.GetState(addr, rcfg.L1BlobBaseFeeSlot).Big()
-	gpoState.execScalar = state.GetState(addr, rcfg.CommitScalarSlot).Big()
+	gpoState.execScalar = state.GetState(addr, rcfg.ExecScalarSlot).Big()
 	gpoState.blobScalar = state.GetState(addr, rcfg.BlobScalarSlot).Big()
 	return gpoState
 }

rollup/rcfg/config.go

@@ -32,7 +32,7 @@ var (
 
 	// New fields added in the Curie hard fork
 	L1BlobBaseFeeSlot = common.BigToHash(big.NewInt(5))
-	CommitScalarSlot  = common.BigToHash(big.NewInt(6))
+	ExecScalarSlot    = common.BigToHash(big.NewInt(6))
 	BlobScalarSlot    = common.BigToHash(big.NewInt(7))
 	IsCurieSlot       = common.BigToHash(big.NewInt(8))
 

rollup/tracing/tracing.go

@@ -543,7 +543,7 @@ func (env *TraceEnv) fillBlockTrace(block *types.Block) (*types.BlockTrace, erro
 			rcfg.OverheadSlot,
 			rcfg.ScalarSlot,
 			rcfg.L1BlobBaseFeeSlot,
-			rcfg.CommitScalarSlot,
+			rcfg.ExecScalarSlot,
 			rcfg.BlobScalarSlot,
 			rcfg.IsCurieSlot,
 		},