Merge branch 'master' into alertIfNoConnections

Author: StephenButtolph

config/config.go

@@ -1077,7 +1077,7 @@ func getSubnetConfigsFromFlags(v *viper.Viper, subnetIDs []ids.ID) (map[ids.ID]s
 	return res, nil
 }
 
-// getSubnetConfigs reads SubnetConfigs to node config map
+// getSubnetConfigsFromDir reads SubnetConfigs to node config map
 func getSubnetConfigsFromDir(v *viper.Viper, subnetIDs []ids.ID) (map[ids.ID]subnets.Config, error) {
 	subnetConfigPath, err := getPathFromDirKey(v, SubnetConfigDirKey)
 	if err != nil {

database/corruptabledb/db_test.go

@@ -184,7 +184,7 @@ func TestIterator(t *testing.T) {
 			// Put a key-value pair in the database.
 			require.NoError(corruptableDB.Put([]byte{0}, []byte{1}))
 
-			// Mark database as corupted, if applicable
+			// Mark database as corrupted, if applicable
 			_ = corruptableDB.handleError(tt.databaseErrBefore)
 
 			// Make an iterator

tests/fixture/tmpnet/kube.go

@@ -46,7 +46,7 @@ func DefaultPodFlags(networkName string, dataDir string) map[string]string {
 	}
 }
 
-// newNodeStatefulSet returns a statefulset for an avalanchego node.
+// NewNodeStatefulSet returns a statefulset for an avalanchego node.
 func NewNodeStatefulSet(
 	name string,
 	imageName string,

vms/avm/block/executor/block.go

@@ -246,14 +246,12 @@ func (b *Block) Accept(context.Context) error {
 		return err
 	}
 
-	txChecksum, utxoChecksum := b.manager.state.Checksums()
 	b.manager.backend.Ctx.Log.Trace(
 		"accepted block",
 		zap.Stringer("blkID", blkID),
 		zap.Uint64("height", b.Height()),
 		zap.Stringer("parentID", b.Parent()),
-		zap.Stringer("txChecksum", txChecksum),
-		zap.Stringer("utxoChecksum", utxoChecksum),
+		zap.Stringer("checksum", b.manager.state.Checksum()),
 	)
 	return nil
 }

vms/avm/block/executor/block_test.go

@@ -749,7 +749,7 @@ func TestBlockAccept(t *testing.T) {
 				// because we mock the call to shared memory
 				mockManagerState.EXPECT().CommitBatch().Return(nil, nil)
 				mockManagerState.EXPECT().Abort()
-				mockManagerState.EXPECT().Checksums().Return(ids.Empty, ids.Empty)
+				mockManagerState.EXPECT().Checksum().Return(ids.Empty)
 
 				mockSharedMemory := atomicmock.NewSharedMemory(ctrl)
 				mockSharedMemory.EXPECT().Apply(gomock.Any(), gomock.Any()).Return(nil)

vms/avm/state/state.go

@@ -89,8 +89,8 @@ type State interface {
 	// pending changes to the base database.
 	CommitBatch() (database.Batch, error)
 
-	// Checksums returns the current TxChecksum and UTXOChecksum.
-	Checksums() (txChecksum ids.ID, utxoChecksum ids.ID)
+	// Checksum returns the current state checksum.
+	Checksum() ids.ID
 
 	Close() error
 }
@@ -134,9 +134,6 @@ type state struct {
 	lastAccepted, persistedLastAccepted ids.ID
 	timestamp, persistedTimestamp       time.Time
 	singletonDB                         database.Database
-
-	trackChecksum bool
-	txChecksum    ids.ID
 }
 
 func New(
@@ -183,7 +180,7 @@ func New(
 		return nil, err
 	}
 
-	s := &state{
+	return &state{
 		parser: parser,
 		db:     db,
 
@@ -204,10 +201,7 @@ func New(
 		blockDB:     blockDB,
 
 		singletonDB: singletonDB,
-
-		trackChecksum: trackChecksums,
-	}
-	return s, s.initTxChecksum()
+	}, nil
 }
 
 func (s *state) GetUTXO(utxoID ids.ID) (*avax.UTXO, error) {
@@ -264,7 +258,6 @@ func (s *state) GetTx(txID ids.ID) (*txs.Tx, error) {
 
 func (s *state) AddTx(tx *txs.Tx) {
 	txID := tx.ID()
-	s.updateTxChecksum(txID)
 	s.addedTxs[txID] = tx
 }
 
@@ -500,36 +493,6 @@ func (s *state) writeMetadata() error {
 	return nil
 }
 
-func (s *state) Checksums() (ids.ID, ids.ID) {
-	return s.txChecksum, s.utxoState.Checksum()
-}
-
-func (s *state) initTxChecksum() error {
-	if !s.trackChecksum {
-		return nil
-	}
-
-	txIt := s.txDB.NewIterator()
-	defer txIt.Release()
-
-	for txIt.Next() {
-		txIDBytes := txIt.Key()
-
-		txID, err := ids.ToID(txIDBytes)
-		if err != nil {
-			return err
-		}
-
-		s.updateTxChecksum(txID)
-	}
-
-	return txIt.Error()
-}
-
-func (s *state) updateTxChecksum(modifiedID ids.ID) {
-	if !s.trackChecksum {
-		return
-	}
-
-	s.txChecksum = s.txChecksum.XOR(modifiedID)
+func (s *state) Checksum() ids.ID {
+	return s.utxoState.Checksum()
 }

vms/avm/state/statemock/state.go

@@ -110,7 +110,7 @@ func (a *acceptor) ApricotAtomicBlock(b *block.ApricotAtomicBlock) error {
 		zap.Stringer("blkID", blkID),
 		zap.Uint64("height", b.Height()),
 		zap.Stringer("parentID", b.Parent()),
-		zap.Stringer("utxoChecksum", a.state.Checksum()),
+		zap.Stringer("checksum", a.state.Checksum()),
 	)
 
 	return nil
@@ -180,7 +180,7 @@ func (a *acceptor) optionBlock(b block.Block, blockType string) error {
 		zap.Stringer("blkID", blkID),
 		zap.Uint64("height", b.Height()),
 		zap.Stringer("parentID", parentID),
-		zap.Stringer("utxoChecksum", a.state.Checksum()),
+		zap.Stringer("checksum", a.state.Checksum()),
 	)
 
 	return nil
@@ -212,7 +212,7 @@ func (a *acceptor) proposalBlock(b block.Block, blockType string) {
 		zap.Stringer("blkID", blkID),
 		zap.Uint64("height", b.Height()),
 		zap.Stringer("parentID", b.Parent()),
-		zap.Stringer("utxoChecksum", a.state.Checksum()),
+		zap.Stringer("checksum", a.state.Checksum()),
 	)
 }
 
@@ -259,7 +259,7 @@ func (a *acceptor) standardBlock(b block.Block, blockType string) error {
 		zap.Stringer("blkID", blkID),
 		zap.Uint64("height", b.Height()),
 		zap.Stringer("parentID", b.Parent()),
-		zap.Stringer("utxoChecksum", a.state.Checksum()),
+		zap.Stringer("checksum", a.state.Checksum()),
 	)
 
 	return nil