mcmurphy/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#873] node: Use dynamic notary deposit duration

Browse source 
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2021-10-12 15:57:57 +03:00 committed by Alex Vanin
parent 5e816dc01a
commit 2a3a6cc0ba
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/neofs-node/morph.go
View file

@ -133,9 +133,14 @@ func makeNotaryDeposit(c *cfg) (util.Uint256, error) {
return util.Uint256{}, fmt.Errorf("could not calculate notary deposit: %w", err) return util.Uint256{}, fmt.Errorf("could not calculate notary deposit: %w", err)
} }
epochDur, err := c.cfgNetmap.wrapper.EpochDuration()
if err != nil {
return util.Uint256{}, fmt.Errorf("could not get current epoch duration: %w", err)
}
return c.cfgMorph.client.DepositNotary( return c.cfgMorph.client.DepositNotary(
depositAmount, depositAmount,
c.cfgMorph.notaryDepositDuration+notaryDepositExtraBlocks, uint32(epochDur)+notaryDepositExtraBlocks,
) )
} }

3
cmd/neofs-node/netmap.go
View file

@ -7,7 +7,6 @@ import (
netmapSDK "github.com/nspcc-dev/neofs-api-go/pkg/netmap" netmapSDK "github.com/nspcc-dev/neofs-api-go/pkg/netmap"
netmapV2 "github.com/nspcc-dev/neofs-api-go/v2/netmap" netmapV2 "github.com/nspcc-dev/neofs-api-go/v2/netmap"
netmapGRPC "github.com/nspcc-dev/neofs-api-go/v2/netmap/grpc" netmapGRPC "github.com/nspcc-dev/neofs-api-go/v2/netmap/grpc"
morphconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/morph"
"github.com/nspcc-dev/neofs-node/pkg/core/netmap" "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/nspcc-dev/neofs-node/pkg/morph/event"
netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap" netmapEvent "github.com/nspcc-dev/neofs-node/pkg/morph/event/netmap"
@ -148,8 +147,6 @@ func initNetmapService(c *cfg) {
}) })
if c.cfgMorph.notaryEnabled { if c.cfgMorph.notaryEnabled {
c.cfgMorph.notaryDepositDuration = morphconfig.Notary(c.appCfg).Duration()
addNewEpochAsyncNotificationHandler(c, func(ev event.Event) { addNewEpochAsyncNotificationHandler(c, func(ev event.Event) {
_, err := makeNotaryDeposit(c) _, err := makeNotaryDeposit(c)
if err != nil { if err != nil {