Skip to content

Commit 6308091

Browse files
authored
*: update contracts (#3604)
2 parents 42a946a + b80ca4a commit 6308091

File tree

5 files changed

+19
-27
lines changed

5 files changed

+19
-27
lines changed

cmd/neofs-node/object.go

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ func initObjectService(c *cfg) {
240240

241241
os := &objectSource{get: sGet}
242242
sPut := putsvc.NewService(&transport{clients: putConstructor}, c, c.metaService,
243-
initQuotas(c.cCli, c.nCli, c.cfgObject.quotasTTL),
243+
initQuotas(c.cCli, c.cfgObject.quotasTTL),
244244
putsvc.WithNetworkMagic(mNumber),
245245
putsvc.WithKeyStorage(keyStorage),
246246
putsvc.WithClientConstructor(putConstructor),
@@ -786,13 +786,12 @@ func (c *cfg) GetContainerNodes(cnrID cid.ID) (putsvc.ContainerNodes, error) {
786786
}, nil
787787
}
788788

789-
func initQuotas(cnrCli *containerClient.Client, nmCli *netmapClient.Client, ttl time.Duration) *quotas {
789+
func initQuotas(cnrCli *containerClient.Client, ttl time.Duration) *quotas {
790790
return &quotas{
791-
cnrCli: cnrCli,
792-
netmapCli: nmCli,
793-
ttl: ttl,
794-
cnrs: make(map[cid.ID]cachedQuotaState),
795-
users: make(map[user.ID]cachedQuotaState),
791+
cnrCli: cnrCli,
792+
ttl: ttl,
793+
cnrs: make(map[cid.ID]cachedQuotaState),
794+
users: make(map[user.ID]cachedQuotaState),
796795
}
797796
}
798797

@@ -802,8 +801,7 @@ type cachedQuotaState struct {
802801
}
803802

804803
type quotas struct {
805-
cnrCli *containerClient.Client
806-
netmapCli *netmapClient.Client
804+
cnrCli *containerClient.Client
807805

808806
m sync.RWMutex
809807
ttl time.Duration
@@ -822,16 +820,11 @@ func (q *quotas) AvailableQuotasLeft(cID cid.ID, owner user.ID) (uint64, uint64,
822820
q.m.RUnlock()
823821

824822
if !cnrOk || needRefresh {
825-
epoch, err := q.netmapCli.Epoch()
826-
if err != nil {
827-
return 0, 0, fmt.Errorf("get current epoch: %w", err)
828-
}
829-
830823
cnrQ, err := q.cnrCli.GetContainerQuota(cID)
831824
if err != nil {
832825
return 0, 0, fmt.Errorf("get container quota: %w", err)
833826
}
834-
cnrState, err := q.cnrCli.GetReportsSummary(epoch, cID)
827+
cnrState, err := q.cnrCli.GetReportsSummary(cID)
835828
if err != nil {
836829
return 0, 0, fmt.Errorf("get report summary: %w", err)
837830
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/nspcc-dev/locode-db v0.8.1
2222
github.com/nspcc-dev/neo-go v0.112.0
2323
github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea
24-
github.com/nspcc-dev/neofs-contract v0.23.1-0.20250923094803-bf67baf7e5c4
24+
github.com/nspcc-dev/neofs-contract v0.23.1-0.20250928071444-e2ff883a3999
2525
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.14.0.20250909131532-07fa82695f26
2626
github.com/nspcc-dev/tzhash v1.8.3
2727
github.com/panjf2000/ants/v2 v2.11.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20250918092801-ae9c0aa1deed h1:sO
196196
github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20250918092801-ae9c0aa1deed/go.mod h1:3byneDNT60tiD8MSyGSyjpI1uVp9v+coySegJoQPF8c=
197197
github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea h1:mK0EMGLvunXcFyq7fBURS/CsN4MH+4nlYiqn6pTwWAU=
198198
github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea/go.mod h1:YzhD4EZmC9Z/PNyd7ysC7WXgIgURc9uCG1UWDeV027Y=
199-
github.com/nspcc-dev/neofs-contract v0.23.1-0.20250923094803-bf67baf7e5c4 h1:77FMXMCdguCHUHbooWTNCK12vwJ7GQB01hpjTlS7854=
200-
github.com/nspcc-dev/neofs-contract v0.23.1-0.20250923094803-bf67baf7e5c4/go.mod h1:PPxjwRiK6hhXPXduvyojEqLMHNpgPaF+rULPhdFlzDg=
199+
github.com/nspcc-dev/neofs-contract v0.23.1-0.20250928071444-e2ff883a3999 h1:0U+0bO74WAc0B3pmRFoQMtlwJfqhf4yRdkEKoKqEIo4=
200+
github.com/nspcc-dev/neofs-contract v0.23.1-0.20250928071444-e2ff883a3999/go.mod h1:PPxjwRiK6hhXPXduvyojEqLMHNpgPaF+rULPhdFlzDg=
201201
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.14.0.20250909131532-07fa82695f26 h1:GBzunGu1m9WO5cKNbPXyU6dO7r1O4FJNhSSWZfKe5co=
202202
github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.14.0.20250909131532-07fa82695f26/go.mod h1:0KUJG36JsjXxJzpals+jYMWpjSGINuja147K2OfmP4Q=
203203
github.com/nspcc-dev/rfc6979 v0.2.3 h1:QNVykGZ3XjFwM/88rGfV3oj4rKNBy+nYI6jM7q19hDI=

pkg/innerring/processors/settlement/calls.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (p *Processor) HandleBasicIncomeEvent(e event.Event) {
7979

8080
l.Info("start basic income calculation...")
8181

82-
payments := p.calculatePayments(l, rate, epoch, cnrs)
82+
payments := p.calculatePayments(l, rate, cnrs)
8383

8484
l.Info("basic income calculated, transfer tokens...", zap.Int("numberOfRecievers", len(payments.nodes)))
8585

@@ -88,7 +88,7 @@ func (p *Processor) HandleBasicIncomeEvent(e event.Event) {
8888
l.Debug("finished basic income distribution")
8989
}
9090

91-
func (p *Processor) calculatePayments(l *zap.Logger, paymentRate, epoch uint64, cnrs []cid.ID) *incomeReceivers {
91+
func (p *Processor) calculatePayments(l *zap.Logger, paymentRate uint64, cnrs []cid.ID) *incomeReceivers {
9292
var (
9393
wg errgroup.Group
9494
transferTable = incomeReceivers{nodes: make(map[string][]payment)}
@@ -104,7 +104,7 @@ func (p *Processor) calculatePayments(l *zap.Logger, paymentRate, epoch uint64,
104104
}
105105
owner := cnr.Owner()
106106

107-
reports, err := p.cnrClient.NodeReports(epoch, cID)
107+
reports, err := p.cnrClient.NodeReports(cID)
108108
if err != nil {
109109
l.Warn("failed to get container reports, container will be skipped", zap.Stringer("cID", cID), zap.Error(err))
110110
return nil

pkg/morph/client/container/load.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ func (c *Client) PutReport(cID cid.ID, storageSize, objsNumber uint64, key []byt
7070
return nil
7171
}
7272

73-
// NodeReports returns a list of container load reports for to the
74-
// specified epoch.
73+
// NodeReports returns a list of container load reports.
7574
// The list is composed through Container contract call.
76-
func (c *Client) NodeReports(epoch uint64, cID cid.ID) ([]Report, error) {
77-
rr, err := c.client.TestInvokeIterator(fschaincontracts.IterateContainerReportsMethod, iteratorPrefetchNumber, epoch, cID[:])
75+
func (c *Client) NodeReports(cID cid.ID) ([]Report, error) {
76+
rr, err := c.client.TestInvokeIterator(fschaincontracts.IterateContainerReportsMethod, iteratorPrefetchNumber, cID[:])
7877
if err != nil {
7978
return nil, fmt.Errorf("could not perform test invocation (%s): %w", fschaincontracts.IterateContainerReportsMethod, err)
8079
}
@@ -128,10 +127,10 @@ func (s *Summary) FromStackItem(item stackitem.Item) error {
128127

129128
// GetReportsSummary returns summary report based on preceding [PutReport]
130129
// calls made by storage nodes.
131-
func (c *Client) GetReportsSummary(epoch uint64, cID cid.ID) (Summary, error) {
130+
func (c *Client) GetReportsSummary(cID cid.ID) (Summary, error) {
132131
prm := client.TestInvokePrm{}
133132
prm.SetMethod(fschaincontracts.GetReportsSummaryMethod)
134-
prm.SetArgs(epoch, cID[:])
133+
prm.SetArgs(cID[:])
135134

136135
res, err := c.client.TestInvoke(prm)
137136
if err != nil {

0 commit comments

Comments
 (0)