add helper functions for Milliseconds datatype

base-org · Jul 24, 2024 · 9a04f5f · 9a04f5f
1 parent 0cc2555
commit 9a04f5f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/op-e2e/op_geth.go b/op-e2e/op_geth.go
@@ -213,7 +213,7 @@ func (d *OpGeth) StartBlockBuilding(ctx context.Context, attrs *eth.PayloadAttri
 // CreatePayloadAttributes creates a valid PayloadAttributes containing a L1Info deposit transaction followed by the supplied transactions.
 func (d *OpGeth) CreatePayloadAttributes(txs ...*types.Transaction) (*eth.PayloadAttributes, error) {
 	timestamp := timeint.FromHexUint64MilliToMilli(d.L2Head.Milliseconds + 2*1000) // assumes two second blocktimes
-	l1Info, err := derive.L1InfoDepositBytes(d.l2Engine.RollupConfig(), d.SystemConfig, d.sequenceNum, d.L1Head, timestamp.ToMilliseconds())
+	l1Info, err := derive.L1InfoDepositBytes(d.l2Engine.RollupConfig(), d.SystemConfig, d.sequenceNum, d.L1Head, timestamp)
 	if err != nil {
 		return nil, err
 	}
@@ -245,7 +245,7 @@ func (d *OpGeth) CreatePayloadAttributes(txs ...*types.Transaction) (*eth.Payloa
 		GasLimit:              (*eth.Uint64Quantity)(&d.SystemConfig.GasLimit),
 		Withdrawals:           withdrawals,
 		ParentBeaconBlockRoot: parentBeaconBlockRoot,
-		Milliseconds:          eth.Uint64Quantity(timestamp.toUint64Milli()),
+		Milliseconds:          eth.Uint64Quantity(timestamp.ToUint64Milli()),
 	}
 	return &attrs, nil
 }
diff --git a/op-service/timeint/timeint.go b/op-service/timeint/timeint.go
@@ -69,6 +69,19 @@ func FromHexUint64SecToMilli(t hexutil.Uint64) Milliseconds {
 	return s
 }
 
+func FromUint64MilliToMilli(t uint64) Milliseconds {
+	return Milliseconds(t)
+}
+
+func FromHexUint64MilliToMilli(t hexutil.Uint64) Milliseconds {
+	return Milliseconds(t)
+}
+
 func (t Milliseconds) ToUint64Milli() uint64 {
 	return uint64(t)
 }
+
+// This function is not reccomended as it truncates the timestamp.
+func (t Milliseconds) ToUint64Sec() uint64 {
+	return uint64(t / 1000)
+}
diff --git a/op-wheel/engine/engine.go b/op-wheel/engine/engine.go
@@ -176,7 +176,7 @@ func newPayloadAttributes(evp sources.EngineVersionProvider, timestamp timeint.S
 		Timestamp:             hexutil.Uint64(timestamp.ToUint64Sec()),
 		PrevRandao:            eth.Bytes32(prevRandao),
 		SuggestedFeeRecipient: feeRecipient,
-		Milliseconds:          hexutil.Uint64(timestamp.ToUint64Milli()),
+		Milliseconds:          hexutil.Uint64(timestamp.ToMilliseconds().ToUint64Milli()),
 	}
 
 	ver := evp.ForkchoiceUpdatedVersion(pa)