Merge pull request #54 from sei-protocol/yzang/SEI-6501

Various fixes from audit

sc/memiavl/db.go

@@ -731,12 +731,12 @@ func parseVersion(name string) (int64, error) {
 		return 0, fmt.Errorf("invalid snapshot name %s", name)
 	}
 
-	v, err := strconv.ParseInt(name[len(SnapshotPrefix):], 10, 32)
+	v, err := strconv.ParseUint(name[len(SnapshotPrefix):], 10, 32)
 	if err != nil {
 		return 0, fmt.Errorf("snapshot version overflows: %d", err)
 	}
 
-	return v, nil
+	return int64(v), nil
 }
 
 // seekSnapshot find the biggest snapshot version that's smaller than or equal to the target version,

sc/memiavl/layout_native.go

@@ -68,10 +68,6 @@ func (node *nodeLayout) KeyLeaf() uint32 {
 	return node.data[3]
 }
 
-func (node *nodeLayout) KeyOffset() uint64 {
-	return uint64(node.data[2]) | uint64(node.data[3])<<32
-}
-
 func (node *nodeLayout) Hash() []byte {
 	return node.hash[:]
 }

sc/memiavl/multitree.go

@@ -362,7 +362,7 @@ func (t *MultiTree) WriteSnapshot(ctx context.Context, dir string, wp *pond.Work
 	}
 
 	// write the snapshots in parallel and wait all jobs done
-	group, _ := wp.GroupContext(context.Background())
+	group, _ := wp.GroupContext(ctx)
 
 	for _, entry := range t.trees {
 		tree, name := entry.Tree, entry.Name

sc/memiavl/tree.go

@@ -126,6 +126,7 @@ func (t *Tree) Copy(cacheSize int) *Tree {
 	newTree := *t
 	// cache is not copied along because it's not thread-safe to access
 	newTree.cache = NewCache(cacheSize)
+	newTree.mtx = &sync.RWMutex{}
 	return &newTree
 }
 

ss/store.go

@@ -46,6 +46,7 @@ func NewStateStore(homeDir string, ssConfig config.StateStoreConfig) (types.Stat
 	return db, nil
 }
 
+// RecoverStateStore will be called during initialization to recover the state from rlog
 func RecoverStateStore(homePath string, logger logger.Logger, stateStore types.StateStore) error {
 	ssLatestVersion, err := stateStore.GetLatestVersion()
 	if err != nil {
@@ -79,7 +80,7 @@ func RecoverStateStore(homePath string, logger logger.Logger, stateStore types.S
 	targetStartOffset := uint64(ssLatestVersion) - delta
 	logger.Info(fmt.Sprintf("Start replaying changelog to recover StateStore from offset %d to %d", targetStartOffset, lastOffset))
 	if targetStartOffset < lastOffset {
-		return streamHandler.Replay(targetStartOffset, lastOffset, func(index uint64, entry proto.ChangelogEntry) error {
+		return streamHandler.Replay(targetStartOffset+1, lastOffset, func(index uint64, entry proto.ChangelogEntry) error {
 			// commit to state store
 			for _, cs := range entry.Changesets {
 				if err := stateStore.ApplyChangeset(entry.Version, cs); err != nil {