Merge tag 'v1.4.1' into release/polygon-1.x-fh2.4

Via commit '0b28bb5e2fde74a0bdaad83bdcca7822e1b1b715' due to tag conflicts # Conflicts: # params/version.go
streamingfast · Sep 24, 2024 · 368dc3c · 368dc3c
2 parents 63fea36 + 0b28bb5
commit 368dc3c
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 27 deletions.
diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -330,10 +330,13 @@ func MVRead[T any](s *StateDB, k blockstm.Key, defaultV T, readStorage func(s *S
 		return defaultV
 	}
 
-	// TODO: I assume we don't want to overwrite an existing read because this could - for example - change a storage
-	//  read to map if the same value is read multiple times.
-	if _, ok := s.readMap[k]; !ok {
+	if prevRd, ok := s.readMap[k]; !ok {
 		s.readMap[k] = rd
+	} else {
+		if prevRd.Kind != rd.Kind || prevRd.V.TxnIndex != rd.V.TxnIndex || prevRd.V.Incarnation != rd.V.Incarnation {
+			s.dep = rd.V.TxnIndex
+			panic("Read conflict detected")
+		}
 	}
 
 	return

diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go
@@ -786,7 +786,7 @@ func TestMVHashMapOverwrite(t *testing.T) {
 	states := []*StateDB{s}
 
 	// Create copies of the original state for each transition
-	for i := 1; i <= 4; i++ {
+	for i := 1; i <= 5; i++ {
 		sCopy := s.Copy()
 		sCopy.txIndex = i
 		states = append(states, sCopy)
@@ -829,9 +829,9 @@ func TestMVHashMapOverwrite(t *testing.T) {
 		states[1].writeMap = nil
 	}
 
-	// Tx2 read should get Tx0's value
-	v = states[2].GetState(addr, key)
-	b = states[2].GetBalance(addr)
+	// Tx3 read should get Tx0's value
+	v = states[3].GetState(addr, key)
+	b = states[3].GetBalance(addr)
 
 	assert.Equal(t, val1, v)
 	assert.Equal(t, balance1, b)
@@ -850,9 +850,9 @@ func TestMVHashMapOverwrite(t *testing.T) {
 		states[0].writeMap = nil
 	}
 
-	// Tx2 read again should get default vals
-	v = states[2].GetState(addr, key)
-	b = states[2].GetBalance(addr)
+	// Tx4 read again should get default vals
+	v = states[4].GetState(addr, key)
+	b = states[4].GetBalance(addr)
 
 	assert.Equal(t, common.Hash{}, v)
 	assert.Equal(t, common.Big0, b)
@@ -868,7 +868,7 @@ func TestMVHashMapWriteNoConflict(t *testing.T) {
 	states := []*StateDB{s}
 
 	// Create copies of the original state for each transition
-	for i := 1; i <= 4; i++ {
+	for i := 1; i <= 6; i++ {
 		sCopy := s.Copy()
 		sCopy.txIndex = i
 		states = append(states, sCopy)
@@ -919,17 +919,17 @@ func TestMVHashMapWriteNoConflict(t *testing.T) {
 		states[2].writeMap = nil
 	}
 
-	assert.Equal(t, val1, states[3].GetState(addr, key1))
-	assert.Equal(t, balance1, states[3].GetBalance(addr))
-	assert.Equal(t, common.Hash{}, states[3].GetState(addr, key2))
+	assert.Equal(t, val1, states[4].GetState(addr, key1))
+	assert.Equal(t, balance1, states[4].GetBalance(addr))
+	assert.Equal(t, common.Hash{}, states[4].GetState(addr, key2))
 
 	// Tx1 revert
 	states[1].RevertToSnapshot(tx1Snapshot)
 	states[1].FlushMVWriteSet()
 
-	assert.Equal(t, common.Hash{}, states[3].GetState(addr, key1))
-	assert.Equal(t, common.Hash{}, states[3].GetState(addr, key2))
-	assert.Equal(t, common.Big0, states[3].GetBalance(addr))
+	assert.Equal(t, common.Hash{}, states[5].GetState(addr, key1))
+	assert.Equal(t, common.Hash{}, states[5].GetState(addr, key2))
+	assert.Equal(t, common.Big0, states[5].GetBalance(addr))
 
 	// Tx1 delete
 	for _, v := range states[1].writeMap {
@@ -938,9 +938,9 @@ func TestMVHashMapWriteNoConflict(t *testing.T) {
 		states[1].writeMap = nil
 	}
 
-	assert.Equal(t, common.Hash{}, states[3].GetState(addr, key1))
-	assert.Equal(t, common.Hash{}, states[3].GetState(addr, key2))
-	assert.Equal(t, common.Big0, states[3].GetBalance(addr))
+	assert.Equal(t, common.Hash{}, states[6].GetState(addr, key1))
+	assert.Equal(t, common.Hash{}, states[6].GetState(addr, key2))
+	assert.Equal(t, common.Big0, states[6].GetBalance(addr))
 }
 
 func TestApplyMVWriteSet(t *testing.T) {

diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.4.0-beta2
+Version: 1.4.1
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.4.0-beta2
+Version: 1.4.1
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.4.0-beta2
+Version: 1.4.1
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.4.0-beta2
+Version: 1.4.1
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.4.0-beta2
+Version: 1.4.1
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.4.0-beta2
+Version: 1.4.1
 Section: develop
 Priority: standard
 Maintainer: Polygon <[email protected]>

diff --git a/params/version.go b/params/version.go
@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 1       // Major version component of the current release
 	VersionMinor = 4       // Minor version component of the current release
-	VersionPatch = 0       // Patch version component of the current release
+	VersionPatch = 1       // Patch version component of the current release
 	VersionMeta  = "fh2.4" // Version metadata to append to the version string
 
 	FirehoseVersionMajor = 2