Merge branch 'develop' into adding-more-matc-feature-tests

Author: peterbarrow

CHANGELOG.md

@@ -17,7 +17,8 @@
 
 ### 🐛 Fixes
 
-- [](https://github.com/vegaprotocol/vega/issues/xxxxx)
+- [10946](https://github.com/vegaprotocol/vega/issues/10945) - Save dispatch strategy for recurring governance transfer in the database.
+- [10943](https://github.com/vegaprotocol/vega/issues/10943) - Fix error message format when node vote is sent again.
 
 ## 0.75.0
 

core/types/banking.go

@@ -180,8 +180,9 @@ func (g *GovernanceTransfer) IntoEvent(amount *num.Uint, reason, gameID *string)
 	} else {
 		out.Kind = &eventspb.Transfer_RecurringGovernance{
 			RecurringGovernance: &eventspb.RecurringGovernanceTransfer{
-				StartEpoch: g.Config.RecurringTransferConfig.StartEpoch,
-				EndEpoch:   g.Config.RecurringTransferConfig.EndEpoch,
+				StartEpoch:       g.Config.RecurringTransferConfig.StartEpoch,
+				EndEpoch:         g.Config.RecurringTransferConfig.EndEpoch,
+				DispatchStrategy: g.Config.RecurringTransferConfig.DispatchStrategy,
 			},
 		}
 	}

core/validators/witness.go

@@ -18,6 +18,7 @@ package validators
 import (
 	"context"
 	"errors"
+	"fmt"
 	"math/rand"
 	"sort"
 	"strconv"
@@ -409,7 +410,7 @@ func (w *Witness) OnTick(ctx context.Context, t time.Time) {
 			if v.selfVoteReceived(w.top.SelfVegaPubKey()) {
 				continue
 			}
-			w.onCommandSent(v.res.GetID())("", errors.New("no self votes received after 10 seconds"))
+			w.onCommandSent(v.res.GetID())("", fmt.Errorf("no self votes received after %s", w.cfg.NodeVoteResendInterval.Duration.String()))
 		}
 	}
 }

datanode/entities/transfer.go

@@ -150,7 +150,8 @@ func (t *Transfer) ToProto(ctx context.Context, accountSource AccountSource) (*e
 		proto.Kind = &eventspb.Transfer_OneOffGovernance{OneOffGovernance: &eventspb.OneOffGovernanceTransfer{DeliverOn: t.DeliverOn.UnixNano()}}
 	case GovernanceRecurring:
 		recurringTransfer := &eventspb.RecurringGovernanceTransfer{
-			StartEpoch: *t.StartEpoch,
+			StartEpoch:       *t.StartEpoch,
+			DispatchStrategy: t.DispatchStrategy,
 		}
 
 		if t.EndEpoch != nil {