Skip to content

Commit

Permalink
Merge pull request #10947 from vegaprotocol/fix_gov_transfer_dispatch
Browse files Browse the repository at this point in the history
fix: Save dispatch strategy for recurring governance transfer in the …
  • Loading branch information
EVODelavega authored Mar 20, 2024
2 parents 248c3e8 + 917eb0c commit 15557fb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

### 🐛 Fixes

- [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
Expand Down
5 changes: 3 additions & 2 deletions core/types/banking.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}
}
Expand Down
3 changes: 2 additions & 1 deletion datanode/entities/transfer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 15557fb

Please sign in to comment.