luxfi/geth
1
0
Fork 0
mirror of https://github.com/luxfi/geth.git synced 2026-07-27 01:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

canonical: drop SubnetEVMTimestamp alias — single evmTimestamp field

Browse Source 
Lux EVM activation is gated by a single canonical chain config field:
  EVMTimestamp / json:'evmTimestamp'

The legacy 'SubnetEVMTimestamp' / 'subnetEVMTimestamp' field was a duplicate
alias for the same activation. Removed:
  - geth/params/config.go: ChainConfig.SubnetEVMTimestamp field
  - geth/params/config.go: IsEVM() now checks EVMTimestamp only
  - geth/params/config.go: isLuxL2Chain check uses EVMTimestamp only
  - all genesis JSON configs (mainnet/testnet/devnet × all chains)
  - all helm chart genesis files (charts/lux/genesis/*.json)
  - all docs (LLM.md, *.mdx)

One field, one way.
This commit is contained in:
Hanzo AI
2026-05-05 21:30:05 -07:00
parent d9d2d2b9cd
commit ca61a8b70c
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LLM.md
+3 -3
View File
@@ -961,7 +961,7 @@ type ChainConfig struct {
// ... existing fields ...
// SubnetEVM compatibility fields
SubnetEVMTimestamp *uint64 `json:"subnetEVMTimestamp,omitempty"` // nil = standard geth, 0 = always SubnetEVM
EVMTimestamp *uint64 `json:"evmTimestamp,omitempty"` // nil = standard geth, 0 = always SubnetEVM
DurangoTimestamp *uint64 `json:"durangoTimestamp,omitempty"` // Durango upgrade time
}
@@ -1006,7 +1006,7 @@ For SubnetEVM chains (like Lux Mainnet), include these fields in genesis.json:
{
"config": {
"chainId": 96369,
"subnetEVMTimestamp": 0,
"evmTimestamp": 0,
"durangoTimestamp": 0,
// ... other fields
}
@@ -1022,7 +1022,7 @@ go test -v ./core/... -run "TestSubnetEVMGasAccounting"
### Files Modified
1. `params/config.go` - Added SubnetEVMTimestamp and DurangoTimestamp fields, IsSubnetEVM() and IsDurango() methods
1. `params/config.go` - Added EVMTimestamp and DurangoTimestamp fields, IsSubnetEVM() and IsDurango() methods
2. `core/state_transition.go` - Modified coinbase payment and gas refund calculation
3. `core/state_processor_test.go` - Added TestSubnetEVMGasAccounting test
params/config.go
+15 -16
View File
@@ -539,13 +539,13 @@ type ChainConfig struct {
AmsterdamTime *uint64 `json:"amsterdamTime,omitempty"` // Amsterdam switch time (nil = no fork, 0 = already on amsterdam)
VerkleTime *uint64 `json:"verkleTime,omitempty"` // Verkle switch time (nil = no fork, 0 = already on verkle)
// EVM compatibility fields - for chains migrated from ava-labs/evm
// When EVMTimestamp or SubnetEVMTimestamp is set, the chain uses EVM gas accounting:
// - Coinbase receives full gas payment (no EIP-1559 burning)
// - Gas refunds are disabled (ApricotPhase1 behavior)
EVMTimestamp *uint64 `json:"evmTimestamp,omitempty"` // EVM activation time (nil = standard geth, 0 = always EVM)
SubnetEVMTimestamp *uint64 `json:"subnetEVMTimestamp,omitempty"` // SubnetEVM activation time (alias for EVMTimestamp)
DurangoTimestamp *uint64 `json:"durangoTimestamp,omitempty"` // Durango upgrade time (for future compatibility)
// Lux EVM activation. When EVMTimestamp is set, the chain uses Lux EVM
// gas accounting:
// - Coinbase receives full gas payment (no EIP-1559 burning)
// - Gas refunds are disabled (ApricotPhase1 behavior)
// Single canonical field — no aliases. Old `subnetEVMTimestamp` is gone.
EVMTimestamp *uint64 `json:"evmTimestamp,omitempty"` // EVM activation time (nil = standard geth, 0 = always EVM)
DurangoTimestamp *uint64 `json:"durangoTimestamp,omitempty"` // Durango upgrade time
// TerminalTotalDifficulty is the amount of total difficulty reached by
// the network that triggers the consensus upgrade.
@@ -1005,12 +1005,11 @@ func (c *ChainConfig) IsVerkleGenesis() bool {
}
// IsEVM returns whether time is either equal to the EVM activation time or greater.
// When active, the chain uses EVM-compatible gas accounting:
// - Coinbase receives full gas payment (no EIP-1559 base fee burning)
// - Gas refunds are disabled (ApricotPhase1 behavior)
// Checks both EVMTimestamp (preferred) and SubnetEVMTimestamp (legacy compat)
// When active, the chain uses Lux EVM gas accounting:
// - Coinbase receives full gas payment (no EIP-1559 base fee burning)
// - Gas refunds are disabled (ApricotPhase1 behavior)
func (c *ChainConfig) IsEVM(time uint64) bool {
return isTimestampForked(c.EVMTimestamp, time) || isTimestampForked(c.SubnetEVMTimestamp, time)
return isTimestampForked(c.EVMTimestamp, time)
}
// IsDurango returns whether time is either equal to the Durango upgrade time or greater.
@@ -1148,10 +1147,10 @@ func (c *ChainConfig) CheckConfigForkOrder() error {
}
if cur.timestamp != nil {
// If the fork is configured, a blob schedule must be defined for it.
// Exception: Lux L2 chains (EVMTimestamp or SubnetEVMTimestamp set) don't use
// blob transactions, so they don't need blobSchedule. This allows importing
// historic chains with their original genesis that predates blob transaction support.
isLuxL2Chain := c.EVMTimestamp != nil || c.SubnetEVMTimestamp != nil
// Exception: Lux L2 chains (EVMTimestamp set) don't use blob transactions,
// so they don't need blobSchedule. This allows importing historic chains
// with their original genesis that predates blob transaction support.
isLuxL2Chain := c.EVMTimestamp != nil
if cur.config == nil && !isLuxL2Chain {
return fmt.Errorf("invalid chain configuration: missing entry for fork %q in blobSchedule", cur.name)
}