From ff72ed5715d52780cd2823960642f07c619de872 Mon Sep 17 00:00:00 2001
From: Roman Khimov <roman@nspcc.ru>
Date: Mon, 8 Aug 2022 16:16:53 +0300
Subject: [PATCH] actor: take ValidatorsHistory into account for
 CalculateValidUntilBlock

Which makes permanent result.Version caching safe for all cases.
---
 pkg/rpcclient/actor/maker.go      | 11 ++++++++++-
 pkg/rpcclient/actor/maker_test.go | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/pkg/rpcclient/actor/maker.go b/pkg/rpcclient/actor/maker.go
index 57ce83adb..392a84391 100644
--- a/pkg/rpcclient/actor/maker.go
+++ b/pkg/rpcclient/actor/maker.go
@@ -191,5 +191,14 @@ func (a *Actor) CalculateValidUntilBlock() (uint32, error) {
 	if err != nil {
 		return 0, fmt.Errorf("can't get block count: %w", err)
 	}
-	return blockCount + uint32(a.version.Protocol.ValidatorsCount) + 1, nil
+	var vc = int(a.version.Protocol.ValidatorsCount)
+	var bestH = uint32(0)
+	for h, n := range a.version.Protocol.ValidatorsHistory { // In case it's enabled.
+		if h >= bestH && h <= blockCount {
+			vc = n
+			bestH = h
+		}
+	}
+
+	return blockCount + uint32(vc+1), nil
 }
diff --git a/pkg/rpcclient/actor/maker_test.go b/pkg/rpcclient/actor/maker_test.go
index 0e741b7cd..116baf46b 100644
--- a/pkg/rpcclient/actor/maker_test.go
+++ b/pkg/rpcclient/actor/maker_test.go
@@ -24,6 +24,23 @@ func TestCalculateValidUntilBlock(t *testing.T) {
 	vub, err := a.CalculateValidUntilBlock()
 	require.NoError(t, err)
 	require.Equal(t, uint32(42+7+1), vub)
+
+	client.version.Protocol.ValidatorsHistory = map[uint32]int{
+		0:  7,
+		40: 4,
+		80: 10,
+	}
+	a, err = NewSimple(client, acc)
+	require.NoError(t, err)
+
+	vub, err = a.CalculateValidUntilBlock()
+	require.NoError(t, err)
+	require.Equal(t, uint32(42+4+1), vub)
+
+	client.bCount = 101
+	vub, err = a.CalculateValidUntilBlock()
+	require.NoError(t, err)
+	require.Equal(t, uint32(101+10+1), vub)
 }
 
 func TestMakeUnsigned(t *testing.T) {