fix(code standards): use 'sequencer' instead of 'aggregator' (#849)

block/executor.go

@@ -128,7 +128,7 @@ func (e *Executor) CreateBlock(height uint64, lastCommit *types.Commit, lastHead
 	}
 	copy(block.Header.LastCommitHash[:], e.getLastCommitHash(lastCommit, &block.Header))
 	copy(block.Header.DataHash[:], e.getDataHash(block))
-	copy(block.Header.AggregatorsHash[:], state.Validators.Hash())
+	copy(block.Header.SequencersHash[:], state.Validators.Hash())
 
 	return block
 }

block/manager.go

@@ -128,17 +128,17 @@ func (m *Manager) Start(ctx context.Context) error {
 	m.logger.Info("Starting the block manager")
 
 	// Check if proposer key matches to the one in the settlement layer
-	var isAggregator bool
+	var isSequencer bool
 	slProposerKey := m.SLClient.GetProposer().PublicKey.Bytes()
 	localProposerKey, err := m.ProposerKey.GetPublic().Raw()
 	if err != nil {
 		return fmt.Errorf("get local node public key: %w", err)
 	}
 	if bytes.Equal(slProposerKey, localProposerKey) {
-		m.logger.Info("Starting in aggregator mode")
-		isAggregator = true
+		m.logger.Info("Starting in sequencer mode")
+		isSequencer = true
 	} else {
-		m.logger.Info("Starting in non-aggregator mode")
+		m.logger.Info("Starting in non-sequencer mode")
 	}
 
 	// Check if InitChain flow is needed
@@ -151,7 +151,7 @@ func (m *Manager) Start(ctx context.Context) error {
 		}
 	}
 
-	if !isAggregator {
+	if !isSequencer {
 		go uevent.MustSubscribe(ctx, m.Pubsub, "applyGossipedBlocksLoop", p2p.EventQueryNewNewGossipedBlock, m.onNewGossipedBlock, m.logger)
 	}
 
@@ -160,7 +160,7 @@ func (m *Manager) Start(ctx context.Context) error {
 		return fmt.Errorf("sync block manager: %w", err)
 	}
 
-	if isAggregator {
+	if isSequencer {
 		// TODO: populate the accumulatedSize on startup
 		go m.ProduceBlockLoop(ctx)
 		go m.SubmitLoop(ctx)

block/synctarget.go

@@ -8,7 +8,7 @@ import (
 )
 
 // SyncTargetLoop is responsible for getting real time updates about settlement batch submissions.
-// For non aggregator: updating the sync target which will be used by retrieveLoop to sync until this target.
+// For non sequencer: updating the sync target which will be used by retrieveLoop to sync until this target.
 // It publishes new sync height targets which will then be synced by another process.
 func (m *Manager) SyncTargetLoop(ctx context.Context) {
 	m.logger.Info("Started sync target loop")

config/flags.go

@@ -39,9 +39,9 @@ func AddNodeFlags(cmd *cobra.Command) {
 
 	cmd.Flags().String(FlagDALayer, def.DALayer, "Data Availability Layer Client name (mock or grpc")
 	cmd.Flags().String(FlagDAConfig, def.DAConfig, "Data Availability Layer Client config")
-	cmd.Flags().Duration(FlagBlockTime, def.BlockTime, "block time (for aggregator mode)")
-	cmd.Flags().Duration(FlagMaxIdleTime, def.MaxIdleTime, "max time for empty blocks (for aggregator mode)")
-	cmd.Flags().Duration(FlagBatchSubmitMaxTime, def.BatchSubmitMaxTime, "max time for batch submit (for aggregator mode)")
+	cmd.Flags().Duration(FlagBlockTime, def.BlockTime, "block time (for sequencer mode)")
+	cmd.Flags().Duration(FlagMaxIdleTime, def.MaxIdleTime, "max time for empty blocks (for sequencer mode)")
+	cmd.Flags().Duration(FlagBatchSubmitMaxTime, def.BatchSubmitMaxTime, "max time for batch submit (for sequencer mode)")
 	cmd.Flags().String(FlagNamespaceID, def.NamespaceID, "namespace identifies (8 bytes in hex)")
 	cmd.Flags().Uint64(FlagBlockBatchMaxSizeBytes, def.BlockBatchMaxSizeBytes, "block batch size in bytes")
 

node/node_test.go

@@ -32,7 +32,7 @@ func TestStartup(t *testing.T) {
 	assert := assert.New(t)
 	require := require.New(t)
 
-	// TODO(omritoptix): Test with and without aggregator mode.
+	// TODO(omritoptix): Test with and without sequencer mode.
 	node, err := testutil.CreateNode(false, nil)
 	require.NoError(err)
 	require.NotNil(node)

proto/types/dymint/dymint.proto

@@ -28,7 +28,7 @@ message Header {
 	// Previous block info
 	bytes last_header_hash = 5;
 
-	// Commit from aggregator(s) from the last block
+	// Commit from sequencers(s) from the last block
 	bytes last_commit_hash = 6;
 
 	// Block.Data root aka Transactions
@@ -52,8 +52,8 @@ message Header {
 	// pubkey can't be recovered by the signature (e.g. ed25519).
 	bytes proposer_address = 11;
 
-	// Hash of block aggregator set, at a time of block creation
-	bytes aggregators_hash = 12;
+	// Hash of block sequencer set, at a time of block creation
+	bytes sequencers_hash = 12;
 
 	// Chain ID the block belongs to
 	string chain_id = 13;

rpc/client/client_test.go

@@ -442,7 +442,7 @@ func TestTx(t *testing.T) {
 	assert := assert.New(t)
 	require := require.New(t)
 
-	mockApp, rpc := getRPCAggregator(t)
+	mockApp, rpc := getRPCSequencer(t)
 
 	require.NotNil(rpc)
 	mockApp.On("BeginBlock", mock.Anything).Return(abci.ResponseBeginBlock{})
@@ -812,17 +812,17 @@ func getBlockMeta(rpc *Client, n int64) *tmtypes.BlockMeta {
 	return bmeta
 }
 
-// getRPC returns a mock application and a new RPC client (non-aggregator mode)
+// getRPC returns a mock application and a new RPC client (non-sequencer mode)
 func getRPC(t *testing.T) (*tmmocks.MockApplication, *Client) {
 	return getRPCInternal(t, false)
 }
 
-func getRPCAggregator(t *testing.T) (*tmmocks.MockApplication, *Client) {
+func getRPCSequencer(t *testing.T) (*tmmocks.MockApplication, *Client) {
 	return getRPCInternal(t, true)
 }
 
-// getRPC returns a mock application and a new RPC client (non-aggregator mode)
-func getRPCInternal(t *testing.T, aggregator bool) (*tmmocks.MockApplication, *Client) {
+// getRPC returns a mock application and a new RPC client (non-sequencer mode)
+func getRPCInternal(t *testing.T, sequencer bool) (*tmmocks.MockApplication, *Client) {
 	t.Helper()
 	require := require.New(t)
 	app := &tmmocks.MockApplication{}
@@ -836,7 +836,7 @@ func getRPCInternal(t *testing.T, aggregator bool) (*tmmocks.MockApplication, *C
 	proposerKey := hex.EncodeToString(pubkeyBytes)
 	require.NoError(err)
 
-	if aggregator {
+	if sequencer {
 		localKey = slSeqKey
 	}
 
@@ -868,7 +868,7 @@ func getRPCInternal(t *testing.T, aggregator bool) (*tmmocks.MockApplication, *C
 		context.Background(),
 		config,
 		key,
-		localKey, // this is where aggregator mode is set. if same key as in settlement.Config, it's aggregator
+		localKey, // this is where sequencer mode is set. if same key as in settlement.Config, it's sequencer
 		proxy.NewLocalClientCreator(app),
 		&tmtypes.GenesisDoc{ChainID: rollappID},
 		log.TestingLogger(),

rpc/json/service_test.go

@@ -272,7 +272,7 @@ func TestSubscription(t *testing.T) {
 	assert.Contains(jsonResp.Error.Message, "subscription not found")
 }
 
-// getRPC returns a mock ABCI application and a local client. (aggregator-mode)
+// getRPC returns a mock ABCI application and a local client. (sequencer-mode)
 func getRPC(t *testing.T) (*tmmocks.MockApplication, *client.Client) {
 	t.Helper()
 	require := require.New(t)

testutil/node.go

@@ -17,7 +17,7 @@ import (
 	"github.com/dymensionxyz/dymint/settlement"
 )
 
-func CreateNode(isAggregator bool, blockManagerConfig *config.BlockManagerConfig) (*node.Node, error) {
+func CreateNode(isSequencer bool, blockManagerConfig *config.BlockManagerConfig) (*node.Node, error) {
 	app := GetAppMock()
 	key, _, _ := crypto.GenerateEd25519Key(rand.Reader)
 	signingKey, pubkey, _ := crypto.GenerateEd25519Key(rand.Reader)

testutil/types.go

@@ -68,7 +68,7 @@ func generateBlock(height uint64) *types.Block {
 			AppHash:         [32]byte{},
 			LastResultsHash: getEmptyLastResultsHash(),
 			ProposerAddress: []byte{4, 3, 2, 1},
-			AggregatorsHash: h[6],
+			SequencersHash:  h[6],
 		},
 		Data: types.Data{
 			Txs:                    nil,

types/block.go

@@ -22,7 +22,7 @@ type Header struct {
 	LastHeaderHash [32]byte
 
 	// hashes of block data
-	LastCommitHash [32]byte // commit from aggregator(s) from the last block
+	LastCommitHash [32]byte // commit from sequencer(s) from the last block
 	DataHash       [32]byte // Block.Data root aka Transactions
 	ConsensusHash  [32]byte // consensus params for current block
 	AppHash        [32]byte // state after applying txs from the current block
@@ -38,8 +38,8 @@ type Header struct {
 	// pubkey can't be recovered by the signature (e.g. ed25519).
 	ProposerAddress []byte // original proposer of the block
 
-	// Hash of block aggregator set, at a time of block creation
-	AggregatorsHash [32]byte
+	// Hash of block sequencer set, at a time of block creation
+	SequencersHash [32]byte
 
 	// The Chain ID
 	ChainID string

types/conv.go

@@ -27,8 +27,8 @@ func ToABCIHeaderPB(header *Header) types.Header {
 		},
 		LastCommitHash:     header.LastCommitHash[:],
 		DataHash:           header.DataHash[:],
-		ValidatorsHash:     header.AggregatorsHash[:],
-		NextValidatorsHash: header.AggregatorsHash[:],
+		ValidatorsHash:     header.SequencersHash[:],
+		NextValidatorsHash: header.SequencersHash[:],
 		ConsensusHash:      header.ConsensusHash[:],
 		AppHash:            header.AppHash[:],
 		LastResultsHash:    header.LastResultsHash[:],
@@ -57,8 +57,8 @@ func ToABCIHeader(header *Header) tmtypes.Header {
 		},
 		LastCommitHash:     header.LastCommitHash[:],
 		DataHash:           header.DataHash[:],
-		ValidatorsHash:     header.AggregatorsHash[:],
-		NextValidatorsHash: header.AggregatorsHash[:],
+		ValidatorsHash:     header.SequencersHash[:],
+		NextValidatorsHash: header.SequencersHash[:],
 		ConsensusHash:      header.ConsensusHash[:],
 		AppHash:            header.AppHash[:],
 		LastResultsHash:    header.LastResultsHash[:],

types/hashing.go

@@ -25,8 +25,8 @@ func (h *Header) Hash() [32]byte {
 		},
 		LastCommitHash:     h.LastCommitHash[:],
 		DataHash:           h.DataHash[:],
-		ValidatorsHash:     h.AggregatorsHash[:],
-		NextValidatorsHash: h.AggregatorsHash[:],
+		ValidatorsHash:     h.SequencersHash[:],
+		NextValidatorsHash: h.SequencersHash[:],
 		ConsensusHash:      h.ConsensusHash[:],
 		AppHash:            h.AppHash[:],
 		LastResultsHash:    h.LastResultsHash[:],