BEP-520: Short Block Interval Phase One: 1.5 seconds

cmd/geth/config.go

@@ -227,6 +227,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 	}
 	if ctx.IsSet(utils.OverrideMinBlocksForBlobRequests.Name) {
 		params.MinBlocksForBlobRequests = ctx.Uint64(utils.OverrideMinBlocksForBlobRequests.Name)
+		params.MinTimeDurationForBlobRequests = uint64(float64(params.MinBlocksForBlobRequests) * 1.5 /*lorentzBlockInterval*/)
 	}
 	if ctx.IsSet(utils.OverrideDefaultExtraReserveForBlobRequests.Name) {
 		params.DefaultExtraReserveForBlobRequests = ctx.Uint64(utils.OverrideDefaultExtraReserveForBlobRequests.Name)

cmd/jsutils/getchainstatus.js

@@ -347,7 +347,7 @@ async function getPerformanceData()  {
         if (difficulty == 2) {
             inturnBlocks += 1
         }
-        let timestamp = eval(eval(header.timestamp).toString(10))
+        let timestamp = eval(eval(header.milliTimestamp).toString(10))
         if (parliaEnabled) {
             let justifiedNumber = await provider.send("parlia_getJustifiedNumber", [ethers.toQuantity(i)]);
             if (justifiedNumber + 1 == i) {
@@ -363,11 +363,11 @@ async function getPerformanceData()  {
 
     let startHeader = await provider.send("eth_getHeaderByNumber", [
         ethers.toQuantity(program.startNum)]);
-    let startTime = eval(eval(startHeader.timestamp).toString(10))
+    let startTime = eval(eval(startHeader.milliTimestamp).toString(10))
     let endHeader = await provider.send("eth_getHeaderByNumber", [
         ethers.toQuantity(program.endNum)]);
-    let endTime = eval(eval(endHeader.timestamp).toString(10))
-    let timeCost = endTime - startTime
+    let endTime = eval(eval(endHeader.milliTimestamp).toString(10))
+    let timeCost = (endTime - startTime)/1000
     let avgBlockTime = timeCost/blockCount
     let inturnBlocksRatio = inturnBlocks/blockCount
     let justifiedBlocksRatio = justifiedBlocks/blockCount

common/bidutil/bidutil.go

@@ -17,7 +17,7 @@ func BidBetterBefore(parentHeader *types.Header, blockPeriod uint64, delayLeftOv
 // BidMustBefore returns the time when the next bid must be received,
 // only considering the consensus delay but not bid simulation duration.
 func BidMustBefore(parentHeader *types.Header, blockPeriod uint64, delayLeftOver time.Duration) time.Time {
-	nextHeaderTime := time.Unix(int64(parentHeader.Time+blockPeriod), 0)
+	nextHeaderTime := time.UnixMilli(int64(parentHeader.MilliTimestamp() + blockPeriod))
 	nextHeaderTime = nextHeaderTime.Add(-delayLeftOver)
 	return nextHeaderTime
 }

consensus/consensus.go

@@ -162,6 +162,5 @@ type PoSA interface {
 	GetFinalizedHeader(chain ChainHeaderReader, header *types.Header) *types.Header
 	VerifyVote(chain ChainHeaderReader, vote *types.VoteEnvelope) error
 	IsActiveValidatorAt(chain ChainHeaderReader, header *types.Header, checkVoteKeyFn func(bLSPublicKey *types.BLSPublicKey) bool) bool
-	BlockInterval() uint64
 	NextProposalBlock(chain ChainHeaderReader, header *types.Header, proposer common.Address) (uint64, uint64, error)
 }

consensus/misc/eip1559/eip1559_test.go

@@ -52,10 +52,7 @@ func copyConfig(original *params.ChainConfig) *params.ChainConfig {
 func config() *params.ChainConfig {
 	config := copyConfig(params.TestChainConfig)
 	config.Ethash = nil
-	config.Parlia = &params.ParliaConfig{
-		Period: 3,
-		Epoch:  200,
-	}
+	config.Parlia = &params.ParliaConfig{}
 	config.LondonBlock = big.NewInt(5)
 	return config
 }

consensus/misc/eip4844/eip4844.go

@@ -83,7 +83,7 @@ func CalcExcessBlobGas(config *params.ChainConfig, parent *types.Header, headTim
 func CalcBlobFee(config *params.ChainConfig, header *types.Header) *big.Int {
 	var frac uint64
 	switch config.LatestFork(header.Time) {
-	case forks.Prague:
+	case forks.Lorentz, forks.Prague:
 		frac = config.BlobScheduleConfig.Prague.UpdateFraction
 	case forks.Cancun:
 		frac = config.BlobScheduleConfig.Cancun.UpdateFraction

consensus/parlia/abi.go

@@ -1501,19 +1501,6 @@ const validatorSetABI = `
     ],
     "stateMutability": "view"
   },
-  {
-    "type": "function",
-    "name": "EPOCH",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "ERROR_FAIL_CHECK_VALIDATORS",