remove timestamp from ExpiredMerkleRootSnapshot event

OffchainLabs · Jul 12, 2023 · 1fb74c7 · 1fb74c7
1 parent 6f65365
commit 1fb74c7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/arbos/block_processor.go b/arbos/block_processor.go
@@ -44,7 +44,7 @@ var L2ToL1TxEventID common.Hash
 var EmitReedeemScheduledEvent func(*vm.EVM, uint64, uint64, [32]byte, [32]byte, common.Address, *big.Int, *big.Int) error
 var EmitTicketCreatedEvent func(*vm.EVM, [32]byte) error
 var EmitExpiredMerkleUpdateEvent func(*vm.EVM, [32]byte, *big.Int) error
-var EmitExpiredMerkleRootSnapshotEvent func(*vm.EVM, [32]byte, uint64, uint64) error
+var EmitExpiredMerkleRootSnapshotEvent func(*vm.EVM, [32]byte, uint64) error
 var EmitRetryableExpiredEvent func(*vm.EVM, [32]byte, *big.Int, [32]byte, uint64) error
 
 type L1Info struct {

diff --git a/arbos/internal_tx.go b/arbos/internal_tx.go
@@ -114,8 +114,7 @@ func ApplyInternalTxUpdate(tx *types.ArbitrumInternalTx, state *arbosState.Arbos
 			if err != nil {
 				log.Error("Failed to try rotating expired root snapshots", "err", err)
 			} else if newRootSnapshot != nil {
-				// TODO(magic) do we want to emit current time? it could be sourced later on based on block number in log, but probably would require query for the block header
-				if err = EmitExpiredMerkleRootSnapshotEvent(evm, *newRootSnapshot, expiredSize, currentTime); err != nil {
+				if err = EmitExpiredMerkleRootSnapshotEvent(evm, *newRootSnapshot, expiredSize); err != nil {
 					log.Error("Failed to emit ExpiredMerkleRootSnapshot event", "err", err)
 				}
 			}

diff --git a/contracts b/contracts
diff --git a/precompiles/ArbRetryableTx.go b/precompiles/ArbRetryableTx.go
@@ -24,14 +24,14 @@ type ArbRetryableTx struct {
 	RedeemScheduled                  func(ctx, mech, bytes32, bytes32, uint64, uint64, addr, huge, huge) error
 	Canceled                         func(ctx, mech, bytes32) error
 	ExpiredMerkleUpdate              func(ctx, mech, bytes32, huge) error
-	ExpiredMerkleRootSnapshot        func(ctx, mech, bytes32, uint64, uint64) error
+	ExpiredMerkleRootSnapshot        func(ctx, mech, bytes32, uint64) error
 	RetryableExpired                 func(ctx, mech, bytes32, huge, bytes32, uint64) error
 	TicketCreatedGasCost             func(bytes32) (uint64, error)
 	LifetimeExtendedGasCost          func(bytes32, huge) (uint64, error)
 	RedeemScheduledGasCost           func(bytes32, bytes32, uint64, uint64, addr, huge, huge) (uint64, error)
 	CanceledGasCost                  func(bytes32) (uint64, error)
 	ExpiredMerkleUpdateGasCost       func(bytes32, huge) (uint64, error)
-	ExpiredMerkleRootSnapshotGasCost func(bytes32, uint64, uint64) (uint64, error)
+	ExpiredMerkleRootSnapshotGasCost func(bytes32, uint64) (uint64, error)
 	RetryableExpiredGasCost          func(bytes32, huge, bytes32, uint64) (uint64, error)
 
 	// deprecated event

diff --git a/precompiles/precompile.go b/precompiles/precompile.go
@@ -577,9 +577,9 @@ func Precompiles() map[addr]ArbosPrecompile {
 		context := eventCtx(ArbRetryableImpl.ExpiredMerkleUpdateGasCost(hash{}, common.Big0))
 		return ArbRetryableImpl.ExpiredMerkleUpdate(context, evm, nodeHash, position)
 	}
-	arbos.EmitExpiredMerkleRootSnapshotEvent = func(evm mech, root bytes32, numLeaves uint64, timestamp uint64) error {
-		context := eventCtx(ArbRetryableImpl.ExpiredMerkleRootSnapshotGasCost(hash{}, 0, 0))
-		return ArbRetryableImpl.ExpiredMerkleRootSnapshot(context, evm, root, numLeaves, timestamp)
+	arbos.EmitExpiredMerkleRootSnapshotEvent = func(evm mech, root bytes32, numLeaves uint64) error {
+		context := eventCtx(ArbRetryableImpl.ExpiredMerkleRootSnapshotGasCost(hash{}, 0))
+		return ArbRetryableImpl.ExpiredMerkleRootSnapshot(context, evm, root, numLeaves)
 	}
 	arbos.EmitRetryableExpiredEvent = func(evm mech, nodeHash bytes32, position huge, ticketId bytes32, numTries uint64) error {
 		context := eventCtx(ArbRetryableImpl.RetryableExpiredGasCost(hash{}, common.Big0, hash{}, 0))