From 330c4b42d9fc09a17be1b4b6a97a6585f760f972 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 27 Oct 2020 13:49:34 +0300 Subject: [PATCH] [#122] Use balance precision converter in inner ring Signed-off-by: Alex Vanin --- pkg/innerring/innerring.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkg/innerring/innerring.go b/pkg/innerring/innerring.go index 8f725f219..bfa1dfa52 100644 --- a/pkg/innerring/innerring.go +++ b/pkg/innerring/innerring.go @@ -17,6 +17,7 @@ import ( "github.com/nspcc-dev/neofs-node/pkg/morph/client" "github.com/nspcc-dev/neofs-node/pkg/morph/event" "github.com/nspcc-dev/neofs-node/pkg/morph/subscriber" + "github.com/nspcc-dev/neofs-node/pkg/util/precision" "github.com/pkg/errors" "github.com/spf13/viper" "go.uber.org/atomic" @@ -39,6 +40,7 @@ type ( mainnetClient *client.Client epochCounter atomic.Uint64 innerRingIndex atomic.Int32 + precision precision.Fixed8Converter // internal variables key *ecdsa.PrivateKey @@ -213,6 +215,7 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper) (*Server, error BalanceContract: server.contracts.balance, MainnetClient: server.mainnetClient, ActiveState: server, + Converter: &server.precision, }) if err != nil { return nil, err @@ -235,6 +238,7 @@ func New(ctx context.Context, log *zap.Logger, cfg *viper.Viper) (*Server, error MorphClient: server.morphClient, EpochState: server, ActiveState: server, + Converter: &server.precision, }) if err != nil { return nil, err @@ -377,12 +381,20 @@ func (s *Server) initConfigFromBlockchain() error { return errors.Wrap(err, "can't read inner ring list") } + // get balance precision + balancePrecision, err := invoke.BalancePrecision(s.morphClient, s.contracts.balance) + if err != nil { + return errors.Wrap(err, "can't read balance contract precision") + } + s.epochCounter.Store(uint64(epoch)) s.innerRingIndex.Store(index) + s.precision.SetBalancePrecision(balancePrecision) s.log.Debug("read config from blockchain", zap.Bool("active", s.IsActive()), zap.Int64("epoch", epoch), + zap.Uint32("precision", balancePrecision), ) return nil