Merge remote-tracking branch 'origin/main' into multistore

.github/workflows/build.yml

@@ -66,7 +66,7 @@ jobs:
             access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.2
+          go-version: '^1.20.0'
       - id: changed-files
         uses: tj-actions/changed-files@v34
         with:

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.2
+          go-version: '^1.20.0'
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

.github/workflows/lint.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.2
+          go-version: '^1.20.0'
       - uses: actions/checkout@v3
       - uses: cachix/install-nix-action@v19
         with:

.github/workflows/sims.yml

@@ -110,7 +110,7 @@ jobs:
         if: github.event_name == 'push' || github.event_name == 'pull_request' 
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.2
+          go-version: '^1.20.0'
       - name: Display go version
         run: go version
       - run: make build
@@ -131,7 +131,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.2
+          go-version: '^1.20.0'
       - name: Display go version
         run: go version
       - name: Install runsim
@@ -157,7 +157,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.2
+          go-version: '^1.20.0'
       - name: Checkout Comment PR Branch
         uses: actions/checkout@v3
         if: github.event_name == 'issue_comment'
@@ -212,7 +212,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.2
+          go-version: '^1.20.0'
       - name: Checkout Comment PR Branch
         uses: actions/checkout@v3
         if: github.event_name == 'issue_comment'
@@ -267,7 +267,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.2
+          go-version: '^1.20.0'
       - name: Checkout Comment PR Branch
         uses: actions/checkout@v3
         if: github.event_name == 'issue_comment'
@@ -322,7 +322,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.20.2
+          go-version: '^1.20.0'
       - name: Checkout Comment PR Branch
         uses: actions/checkout@v3
         if: github.event_name == 'issue_comment'

memiavl/go.mod

@@ -47,6 +47,7 @@ require (
 	github.com/linxGnu/grocksdb v1.7.10 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect

memiavl/tree.go

@@ -14,12 +14,12 @@ var emptyHash = sha256.New().Sum(nil)
 
 // verify change sets by replay them to rebuild iavl tree and verify the root hashes
 type Tree struct {
-	snapshot       *Snapshot
-	initialVersion uint32
-
 	version uint32
 	// root node of empty tree is represented as `nil`
-	root Node
+	root     Node
+	snapshot *Snapshot
+
+	initialVersion, cowVersion uint32
 }
 
 // NewEmptyTree creates an empty tree at an arbitrary version.
@@ -50,10 +50,9 @@ func NewFromSnapshot(snapshot *Snapshot) *Tree {
 		version:  snapshot.Version(),
 		snapshot: snapshot,
 	}
-	return &Tree{
-		snapshot: snapshot,
-		version:  snapshot.Version(),
-		root:     snapshot.RootNode(),
+
+	if !snapshot.IsEmpty() {
+		tree.root = snapshot.RootNode()
 	}
 
 	return tree
@@ -114,11 +113,7 @@ func (t *Tree) remove(key []byte) {
 func (t *Tree) saveVersion(updateHash bool) ([]byte, int64, error) {
 	var hash []byte
 	if updateHash {
-		if t.root == nil {
-			hash = emptyHash
-		} else {
-			hash = t.root.Hash()
-		}
+		hash = t.RootHash()
 	}
 
 	if t.version >= uint32(math.MaxUint32) {