Merge pull request #3554 from nspcc-dev/add-echidna

nspcc-dev · Aug 12, 2024 · 8ea0bc6 · 8ea0bc6
2 parents 79e7898 + 2c24cb3
commit 8ea0bc6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/pkg/config/hardfork.go b/pkg/config/hardfork.go
@@ -43,6 +43,9 @@ const (
 	// different ApplicationLogs comparing to the C# node, but the node states
 	// match. See #3485 for details.
 	HFDomovoi // Domovoi
+	// HFEchidna represents hard-fork introduced in #3554 (ported from
+	// https://github.com/neo-project/neo/pull/3454).
+	HFEchidna // Echidna
 	// hfLast denotes the end of hardforks enum. Consider adding new hardforks
 	// before hfLast.
 	hfLast

diff --git a/pkg/config/hardfork_string.go b/pkg/config/hardfork_string.go
diff --git a/pkg/core/blockchain_core_test.go b/pkg/core/blockchain_core_test.go
@@ -371,6 +371,7 @@ func TestNewBlockchain_InitHardforks(t *testing.T) {
 			config.HFBasilisk.String():      0,
 			config.HFCockatrice.String():    0,
 			config.HFDomovoi.String():       0,
+			config.HFEchidna.String():       0,
 		}, bc.GetConfig().Hardforks)
 	})
 	t.Run("empty set", func(t *testing.T) {
@@ -401,14 +402,15 @@ func TestNewBlockchain_InitHardforks(t *testing.T) {
 	})
 	t.Run("all present", func(t *testing.T) {
 		bc := newTestChainWithCustomCfg(t, func(c *config.Config) {
-			c.ProtocolConfiguration.Hardforks = map[string]uint32{config.HFAspidochelone.String(): 5, config.HFBasilisk.String(): 10, config.HFCockatrice.String(): 15, config.HFDomovoi.String(): 20}
+			c.ProtocolConfiguration.Hardforks = map[string]uint32{config.HFAspidochelone.String(): 5, config.HFBasilisk.String(): 10, config.HFCockatrice.String(): 15, config.HFDomovoi.String(): 20, config.HFEchidna.String(): 25}
 			require.NoError(t, c.ProtocolConfiguration.Validate())
 		})
 		require.Equal(t, map[string]uint32{
 			config.HFAspidochelone.String(): 5,
 			config.HFBasilisk.String():      10,
 			config.HFCockatrice.String():    15,
 			config.HFDomovoi.String():       20,
+			config.HFEchidna.String():       25,
 		}, bc.GetConfig().Hardforks)
 	})
 }
diff --git a/pkg/core/blockchain_neotest_test.go b/pkg/core/blockchain_neotest_test.go
@@ -271,7 +271,7 @@ func TestBlockchain_StartFromExistingDB(t *testing.T) {
 
 		_, _, _, err = chain.NewMultiWithCustomConfigAndStoreNoCheck(t, customConfig, cache)
 		require.Error(t, err)
-		require.True(t, strings.Contains(err.Error(), fmt.Sprintf("native %s: version mismatch for the latest hardfork Domovoi (stored contract state differs from autogenerated one)", nativenames.CryptoLib)), err)
+		require.True(t, strings.Contains(err.Error(), fmt.Sprintf("native %s: version mismatch for the latest hardfork Echidna (stored contract state differs from autogenerated one)", nativenames.CryptoLib)), err)
 	})
 
 	t.Run("good", func(t *testing.T) {