move espresso logic to arbos, handle nil justifications

EspressoSystems · Nov 14, 2023 · ca02150 · ca02150
1 parent 00f9ecc
commit ca02150
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 16 deletions.
diff --git a/arbnode/inbox_reader.go b/arbnode/inbox_reader.go
@@ -17,8 +17,8 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	flag "github.com/spf13/pflag"
 
+	"github.com/offchainlabs/nitro/arbos/espresso"
 	"github.com/offchainlabs/nitro/arbutil"
-	"github.com/offchainlabs/nitro/espresso"
 	"github.com/offchainlabs/nitro/util/arbmath"
 	"github.com/offchainlabs/nitro/util/headerreader"
 	"github.com/offchainlabs/nitro/util/stopwaiter"

diff --git a/arbnode/inbox_tracker.go b/arbnode/inbox_tracker.go
@@ -19,10 +19,10 @@ import (
 	"github.com/ethereum/go-ethereum/rlp"
 
 	"github.com/offchainlabs/nitro/arbos/arbostypes"
+	"github.com/offchainlabs/nitro/arbos/espresso"
 	"github.com/offchainlabs/nitro/arbstate"
 	"github.com/offchainlabs/nitro/arbutil"
 	"github.com/offchainlabs/nitro/broadcaster"
-	"github.com/offchainlabs/nitro/espresso"
 	"github.com/offchainlabs/nitro/staker"
 	"github.com/offchainlabs/nitro/util/containers"
 )

diff --git a/arbos/arbostypes/incomingmessage.go b/arbos/arbostypes/incomingmessage.go
@@ -15,8 +15,8 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
 
+	"github.com/offchainlabs/nitro/arbos/espresso"
 	"github.com/offchainlabs/nitro/arbos/util"
-	"github.com/offchainlabs/nitro/espresso"
 	"github.com/offchainlabs/nitro/util/arbmath"
 )
 
@@ -41,13 +41,13 @@ type EspressoBlockJustification struct {
 }
 
 type L1IncomingMessageHeader struct {
-	Kind               uint8          `json:"kind"`
-	Poster             common.Address `json:"sender"`
-	BlockNumber        uint64         `json:"blockNumber"`
-	Timestamp          uint64         `json:"timestamp"`
-	RequestId          *common.Hash   `json:"requestId" rlp:"nilList"`
-	L1BaseFee          *big.Int       `json:"baseFeeL1"`
-	BlockJustification *EspressoBlockJustification
+	Kind               uint8                       `json:"kind"`
+	Poster             common.Address              `json:"sender"`
+	BlockNumber        uint64                      `json:"blockNumber"`
+	Timestamp          uint64                      `json:"timestamp"`
+	RequestId          *common.Hash                `json:"requestId" rlp:"nilList"`
+	L1BaseFee          *big.Int                    `json:"baseFeeL1"`
+	BlockJustification *EspressoBlockJustification `json:"justification" rlp:"optional"`
 }
 
 func (h L1IncomingMessageHeader) SeqNum() (uint64, error) {

diff --git a/arbos/block_processor.go b/arbos/block_processor.go
@@ -12,9 +12,9 @@ import (
 
 	"github.com/offchainlabs/nitro/arbos/arbosState"
 	"github.com/offchainlabs/nitro/arbos/arbostypes"
+	"github.com/offchainlabs/nitro/arbos/espresso"
 	"github.com/offchainlabs/nitro/arbos/l2pricing"
 	"github.com/offchainlabs/nitro/arbos/util"
-	"github.com/offchainlabs/nitro/espresso"
 	"github.com/offchainlabs/nitro/solgen/go/precompilesgen"
 	"github.com/offchainlabs/nitro/util/arbmath"
 

diff --git a/espresso/client.go → arbos/espresso/client.go b/espresso/client.go → arbos/espresso/client.go
diff --git a/espresso/commit.go → arbos/espresso/commit.go b/espresso/commit.go → arbos/espresso/commit.go
diff --git a/espresso/hotshot/hotshot.go → arbos/espresso/hotshot/hotshot.go b/espresso/hotshot/hotshot.go → arbos/espresso/hotshot/hotshot.go
diff --git a/espresso/nmt.go → arbos/espresso/nmt.go b/espresso/nmt.go → arbos/espresso/nmt.go
diff --git a/espresso/query.go → arbos/espresso/query.go b/espresso/query.go → arbos/espresso/query.go
diff --git a/espresso/types.go → arbos/espresso/types.go b/espresso/types.go → arbos/espresso/types.go
diff --git a/espresso/types_test.go → arbos/espresso/types_test.go b/espresso/types_test.go → arbos/espresso/types_test.go
diff --git a/cmd/replay/main.go b/cmd/replay/main.go
@@ -25,11 +25,11 @@ import (
 	"github.com/offchainlabs/nitro/arbos/arbosState"
 	"github.com/offchainlabs/nitro/arbos/arbostypes"
 	"github.com/offchainlabs/nitro/arbos/burn"
+	"github.com/offchainlabs/nitro/arbos/espresso"
 	"github.com/offchainlabs/nitro/arbstate"
 	"github.com/offchainlabs/nitro/arbutil"
 	"github.com/offchainlabs/nitro/cmd/chaininfo"
 	"github.com/offchainlabs/nitro/das/dastree"
-	"github.com/offchainlabs/nitro/espresso"
 	"github.com/offchainlabs/nitro/gethhook"
 	"github.com/offchainlabs/nitro/wavmio"
 )

diff --git a/execution/gethexec/espresso_sequencer.go b/execution/gethexec/espresso_sequencer.go
@@ -8,7 +8,7 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/offchainlabs/nitro/espresso"
+	"github.com/offchainlabs/nitro/arbos/espresso"
 	"github.com/offchainlabs/nitro/util/stopwaiter"
 
 	"github.com/ethereum/go-ethereum/arbitrum_types"

diff --git a/execution/gethexec/executionengine.go b/execution/gethexec/executionengine.go
@@ -17,6 +17,7 @@ import (
 	"github.com/offchainlabs/nitro/arbos"
 	"github.com/offchainlabs/nitro/arbos/arbosState"
 	"github.com/offchainlabs/nitro/arbos/arbostypes"
+	"github.com/offchainlabs/nitro/arbos/espresso"
 	"github.com/offchainlabs/nitro/arbos/l1pricing"
 	"github.com/offchainlabs/nitro/arbutil"
 	"github.com/offchainlabs/nitro/execution"
@@ -287,14 +288,19 @@ func (s *ExecutionEngine) sequenceTransactionsWithBlockMutex(header *arbostypes.
 	}
 
 	delayedMessagesRead := lastBlockHeader.Nonce.Uint64()
+	jst := header.BlockJustification
+	var hotShotHeader espresso.Header
+	if jst != nil {
+		hotShotHeader = jst.Header
+	}
 
 	startTime := time.Now()
 	block, receipts, err := arbos.ProduceBlockAdvanced(
 		header,
 		txes,
 		delayedMessagesRead,
 		lastBlockHeader,
-		&header.BlockJustification.Header,
+		&hotShotHeader,
 		statedb,
 		s.bc,
 		s.bc.Config(),
@@ -442,12 +448,17 @@ func (s *ExecutionEngine) createBlockFromNextMessage(msg *arbostypes.MessageWith
 	}
 	statedb.StartPrefetcher("TransactionStreamer")
 	defer statedb.StopPrefetcher()
+	jst := msg.Message.Header.BlockJustification
+	var hotShotHeader espresso.Header
+	if jst != nil {
+		hotShotHeader = jst.Header
+	}
 
 	block, receipts, err := arbos.ProduceBlock(
 		msg.Message,
 		msg.DelayedMessagesRead,
 		currentHeader,
-		&msg.Message.Header.BlockJustification.Header,
+		&hotShotHeader,
 		statedb,
 		s.bc,
 		s.bc.Config(),

diff --git a/staker/stateless_block_validator.go b/staker/stateless_block_validator.go
@@ -11,7 +11,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/offchainlabs/nitro/espresso"
+	"github.com/offchainlabs/nitro/arbos/espresso"
 	"github.com/offchainlabs/nitro/execution"
 	"github.com/offchainlabs/nitro/util/rpcclient"
 	"github.com/offchainlabs/nitro/validator/server_api"