Merge pull request #5665 from oasisprotocol/kostko/feature/default-sy…

…nc-trustperiod go/consensus: Change default sync trust period to 30 days
oasisprotocol · Apr 29, 2024 · 4f35642 · 4f35642
2 parents 1c63a93 + 900482e
commit 4f35642
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.changelog/5665.cfg.md b/.changelog/5665.cfg.md
@@ -0,0 +1 @@
+go/consensus: Change default sync trust period to 30 days
diff --git a/go/consensus/cometbft/config/config.go b/go/consensus/cometbft/config/config.go
@@ -220,7 +220,7 @@ func DefaultConfig() Config {
 		},
 		StateSync: StateSyncConfig{
 			Enabled:     false,
-			TrustPeriod: 24 * time.Hour,
+			TrustPeriod: 30 * 24 * time.Hour,
 			TrustHeight: 0,
 			TrustHash:   "",
 		},

diff --git a/go/consensus/pricediscovery/pricediscovery.go b/go/consensus/pricediscovery/pricediscovery.go
@@ -45,7 +45,7 @@ func (pd *priceDiscovery) GasPrice() (*quantity.Quantity, error) {
 	pd.mu.RLock()
 	defer pd.mu.RUnlock()
 
-	return pd.finalGasPrice, nil
+	return pd.finalGasPrice.Clone(), nil
 }
 
 // refreshMinGasPrice refreshes minimum gas price reported by the consensus layer.

diff --git a/go/oasis-node/cmd/config/migrate/migrate_test.go b/go/oasis-node/cmd/config/migrate/migrate_test.go
@@ -629,7 +629,7 @@ func TestConfigMigrationComplex(t *testing.T) {
 	require.Equal(newConfig.Consensus.Prune.Strategy, "keep_n")
 	require.Equal(newConfig.Consensus.Prune.NumKept, uint64(86400))
 	require.Equal(newConfig.Consensus.StateSync.Enabled, false)
-	require.Equal(newConfig.Consensus.StateSync.TrustPeriod, 24*time.Hour)
+	require.Equal(newConfig.Consensus.StateSync.TrustPeriod, 30*24*time.Hour)
 	require.Equal(newConfig.Consensus.StateSync.TrustHeight, uint64(4692334))
 	require.Equal(newConfig.Consensus.StateSync.TrustHash, "2d9dd35e7254a6c5c87f49d0646ee359f06f460b72278ad3ac17130bd9a7ec19")
 	require.Equal(newConfig.Storage.Backend, "badger")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		go/consensus: Change default sync trust period to 30 days