From b9a62f0528af7e8f2a6b07e2366a6c444281ee2a Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Thu, 14 May 2026 23:43:13 +0300 Subject: [PATCH] go.mod: upgrade to NeoGo 0.119.0 It has some relevant fixes. Signed-off-by: Roman Khimov --- CHANGELOG.md | 1 + go.mod | 2 +- go.sum | 4 ++-- pkg/core/metachain/contracts.go | 3 +-- pkg/core/metachain/gas/gas.go | 3 +++ pkg/morph/client/static.go | 4 +--- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 047c40d2762..548701d6419 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ Changelog for NeoFS Node - Internal conversions of node addresses received from network map (#3981) ### Updated +- NeoGo dependency to 0.119.0 (#3993) ### Updating from v0.52.0 Drop `policer.max_workers` configuration, it's no-op since 0.52.0. diff --git a/go.mod b/go.mod index 304fcccea05..49ca0856351 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/nspcc-dev/bbolt v0.0.0-20260404200350-24f70ceb2bd9 github.com/nspcc-dev/hrw/v2 v2.0.4 github.com/nspcc-dev/locode-db v0.8.2 - github.com/nspcc-dev/neo-go v0.118.0 + github.com/nspcc-dev/neo-go v0.119.0 github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea github.com/nspcc-dev/neofs-contract v0.26.1 github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.18.0.20260417090255-d6b86c01a5af diff --git a/go.sum b/go.sum index 8ca96d45e11..d15264d946d 100644 --- a/go.sum +++ b/go.sum @@ -183,8 +183,8 @@ github.com/nspcc-dev/hrw/v2 v2.0.4 h1:o3Zh/2aF+IgGpvt414f46Ya20WG9u9vWxVd16ErFI8 github.com/nspcc-dev/hrw/v2 v2.0.4/go.mod h1:dUjOx27zTTvoPmT5EG25vSSWL2tKS7ndAa2TPTiZwFo= github.com/nspcc-dev/locode-db v0.8.2 h1:+9+1Z7ppG+ISDLHzMND7PZ8+R4H3d04doVRyNevOpz0= github.com/nspcc-dev/locode-db v0.8.2/go.mod h1:PtAASXSG4D4Oz0js9elzTyTr8GLpOJO20qFL881Nims= -github.com/nspcc-dev/neo-go v0.118.0 h1:3zTSBbAtT4qosubVzLLOWzEky2GLZ/LUzf9nZTu5sx0= -github.com/nspcc-dev/neo-go v0.118.0/go.mod h1:6f+QLr3wg4p1xoVLxy4tyUwYOnx4mL5ashd+jCPA3iY= +github.com/nspcc-dev/neo-go v0.119.0 h1:eZSklXiu0488Agkl8koGbU7paVRKgOUpGv8BDW1A2Qo= +github.com/nspcc-dev/neo-go v0.119.0/go.mod h1:GZvy88WE9ZuXEj5iqP1Z5rmkNqoKQY7RYxLxOO22610= github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20260303143317-87ace720748a h1:bxVOVb1lBg5N6pc4WGfaFOM+nZ2L3hc/cleTSxoDEmA= github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20260303143317-87ace720748a/go.mod h1:+nqk9W9KbuvjqA2bQfGTuRKn7FQwcVyhlIDz8hB3f2c= github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea h1:mK0EMGLvunXcFyq7fBURS/CsN4MH+4nlYiqn6pTwWAU= diff --git a/pkg/core/metachain/contracts.go b/pkg/core/metachain/contracts.go index cc6ae46ab7d..c2b2a65720e 100644 --- a/pkg/core/metachain/contracts.go +++ b/pkg/core/metachain/contracts.go @@ -23,10 +23,9 @@ func NewCustomNatives(cfg neogoconfig.ProtocolConfiguration) []interop.Contract ledger := native.NewLedger() g := gas.NewGAS() - n := native.NewNEO(cfg) + n := native.NewNEO(cfg, g) p := native.NewPolicy() - n.GAS = g n.Policy = p mgmt.NEO = n diff --git a/pkg/core/metachain/gas/gas.go b/pkg/core/metachain/gas/gas.go index db782d09534..4de838a5219 100644 --- a/pkg/core/metachain/gas/gas.go +++ b/pkg/core/metachain/gas/gas.go @@ -166,5 +166,8 @@ func (g *GAS) balanceOf(ic *interop.Context, args []stackitem.Item) stackitem.It func (g *GAS) Mint(ic *interop.Context, h util.Uint160, amount *big.Int, callOnPayment bool) { } +func (g *GAS) MintDeferrable(ic *interop.Context, h util.Uint160, amount *big.Int, callOnPayment bool, continuation func()) { +} + func (g *GAS) Burn(ic *interop.Context, h util.Uint160, amount *big.Int) { } diff --git a/pkg/morph/client/static.go b/pkg/morph/client/static.go index 70d9dda481b..11e8cfc0b9f 100644 --- a/pkg/morph/client/static.go +++ b/pkg/morph/client/static.go @@ -4,13 +4,11 @@ import ( "context" "errors" "fmt" - "strings" "time" "github.com/cenkalti/backoff/v4" "github.com/nspcc-dev/neo-go/pkg/encoding/fixedn" "github.com/nspcc-dev/neo-go/pkg/neorpc" - "github.com/nspcc-dev/neo-go/pkg/rpcclient/actor" "github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "go.uber.org/zap" @@ -209,7 +207,7 @@ func (s StaticClient) execWithBackoff(invokeFunc func() error) error { return backoff.RetryNotify(func() error { err := invokeFunc() if err != nil { - if errors.Is(err, neorpc.ErrMempoolCapReached) || errors.Is(err, neorpc.GASLimitExceededException) || (errors.Is(err, actor.ErrExecFailed) && strings.Contains(err.Error(), neorpc.GASLimitExceededException.Message)) { + if errors.Is(err, neorpc.ErrMempoolCapReached) || errors.Is(err, neorpc.GASLimitExceededException) { return err } return backoff.Permanent(err)