Clean up block logs functions

OffchainLabs · Dec 9, 2020 · d75d1e4 · d75d1e4
1 parent efbce16
commit d75d1e4
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/arb-evm/evm/blockresult.go b/packages/arb-evm/evm/blockresult.go
@@ -55,16 +55,17 @@ func (b *BlockInfo) LastAVMLog() *big.Int {
 }
 
 func (b *BlockInfo) FirstAVMLog() *big.Int {
-	return new(big.Int).Sub(b.LastAVMLog(), b.BlockStats.AVMLogCount)
+	val := new(big.Int).Sub(b.ChainStats.AVMLogCount, b.BlockStats.AVMLogCount)
+	// Move back one further to account for the block log itself
+	return val.Sub(val, big.NewInt(1))
 }
 
 func (b *BlockInfo) LastAVMSend() *big.Int {
 	return new(big.Int).Sub(b.ChainStats.AVMSendCount, big.NewInt(1))
 }
 
 func (b *BlockInfo) FirstAVMSend() *big.Int {
-	val := new(big.Int).Sub(b.LastAVMSend(), b.BlockStats.AVMSendCount)
-	return val.Add(val, big.NewInt(1))
+	return new(big.Int).Sub(b.ChainStats.AVMSendCount, b.BlockStats.AVMSendCount)
 }
 
 func (b *BlockInfo) AsValue() value.Value {