From 8c41166524b52a3f1acd86f46c064cd6639d4b30 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Fri, 7 Jul 2023 14:24:34 +0300 Subject: [PATCH 1/2] [#109] Bump neo-go version Synced version with frostfs-node, see frostfs-node#417 Signed-off-by: Alex Vanin --- go.mod | 6 +++--- go.sum | Bin 73060 -> 72928 bytes ns/nns.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index bdb3df5..1148630 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/google/uuid v1.3.0 github.com/hashicorp/golang-lru/v2 v2.0.2 github.com/mr-tron/base58 v1.2.0 - github.com/nspcc-dev/neo-go v0.101.1 + github.com/nspcc-dev/neo-go v0.101.2-0.20230601131642-a0117042e8fc github.com/stretchr/testify v1.8.3 go.uber.org/zap v1.24.0 google.golang.org/grpc v1.55.0 @@ -28,11 +28,11 @@ require ( github.com/gorilla/websocket v1.5.0 // indirect github.com/hashicorp/golang-lru v0.6.0 // indirect github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22 // indirect - github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20221202075445-cb5c18dc73eb // indirect + github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20230420112658-c50ab951645a // indirect github.com/nspcc-dev/rfc6979 v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/twmb/murmur3 v1.1.8 // indirect - go.uber.org/atomic v1.9.0 // indirect + go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.2.1 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.9.0 // indirect diff --git a/go.sum b/go.sum index bd0d791123f88610acbba68d9175dd6ba31a0704..3376954ef0a373a7eede76abc8925b57960c98b4 100644 GIT binary patch delta 531 zcmajb%Z`&!0LJmnth^+%GTk&b#+aCBC(#xc^}P?cU2bDlq^U0SFQ> z074Qn6fv;dH3SslvA)|2;WNLUN*7y0FQQVRJvz6faXJ%tvzn~0nug`3q9IDP1z~|6 zhL0==Aoias9%R@mTOQ&Cr-!l14_QjR$Y;juY^yr8wX7uBWtmmVZ>pWEMkk)Lc2O_v zq9<_&eU09Z$QIZ-35I3|E)8slqgy;}ADRqVgcOtb$_Nh#NrVk9&RPDIsPOaEsccTC zW3U+KGvSm+w%0+uxO@Ju+%4(Cs7x(cmg7ZW^N?(8yio(w*GH+l0P$Jl>oc#f6@pd< z=y%dZACu!fnXDh9U+;x$yUbRR+uK460t_6GT+R;(Jp_GH&1=~?Nm+j8-aCF zQZ5A|GfUf_>o4xKe^rjR!Lm(&|DC!8JTrEV)HqriX_u-J%W*yN*O%0`KT(bq!abK$ V4r;m+X0im(_nXfC`OVXJe*l*vrzijb delta 433 zcmZ|IyH3JT007X%IEYRrqML(*hQPhIFN#}%OL@O-tudP3wzL!qm4`(gOx%6t`XL$y zqd(yMH5@jppvr3POm&FlTss}Ie_$RZI@m}wl@COC|o_6Uq!rQfI_&fm`1_R zgBY1L((Q6HP%#^;2dpc&pcvRwTqWt2EXiGyK6sn-+Fsd55G4?>hY4?JhD4E@jQyD! zB;DTN5DK}N(yEM0=Y?+7*W`}UCQM&^V>GH_rQu(Sh9EsDc8k6Xw7yWfN|1;^A zQ>P#9`uy1ScR)DcjEBYa0I0dP7GM<+zm#PwqB3cM%Z5Vqb7`peGpMdzVES@*O26+{ J=CAjAw?7$IjbQ)) diff --git a/ns/nns.go b/ns/nns.go index 3c40ab0..cb8dbd4 100644 --- a/ns/nns.go +++ b/ns/nns.go @@ -51,7 +51,7 @@ func (n *NNS) Dial(address string) error { uri, err := url.Parse(address) if err == nil && (uri.Scheme == "ws" || uri.Scheme == "wss") { - multiSchemeClient, err = rpcclient.NewWS(context.Background(), address, rpcclient.Options{}) + multiSchemeClient, err = rpcclient.NewWS(context.Background(), address, rpcclient.WSOptions{}) if err != nil { return fmt.Errorf("create Neo WebSocket client: %w", err) } -- 2.45.2 From ccbe069f6a9ee5fb3ad5663025c3e839f04d9b4c Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Fri, 7 Jul 2023 14:56:01 +0300 Subject: [PATCH 2/2] [#104] Update neo-go/pkg/interop version neo-go module uses broken commit of interop package. Signed-off-by: Alex Vanin --- go.mod | 2 +- go.sum | Bin 72928 -> 72928 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1148630..fc96fa4 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/gorilla/websocket v1.5.0 // indirect github.com/hashicorp/golang-lru v0.6.0 // indirect github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22 // indirect - github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20230420112658-c50ab951645a // indirect + github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20230615193820-9185820289ce // indirect github.com/nspcc-dev/rfc6979 v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/twmb/murmur3 v1.1.8 // indirect diff --git a/go.sum b/go.sum index 3376954ef0a373a7eede76abc8925b57960c98b4..11f92d0c79463342810f7eb05badebe3fbd8cc75 100644 GIT binary patch delta 119 zcmaE`ljXrqmJJ!1u4aa&hL*+_Mh3c;h8Ctk+Q`B(IaMLU(5lSGy)@L%B|A5;DBL&E zq^QWGEF{IS)FRZUFf}W@A}rUh%FxF=KRLwJbMnMo@yYe+Y?J*nCB?9txcO)1^GyH^ CC?@*= delta 119 zcmaE`ljXrqmJJ!1t|mqXhK5FFrWU%%rUr>gmZpYgCZ>rB8HQG7#>E*XX4z@pZu;p) zp00*f`mSLX&Q7l0&SAOkUJ=2;9tKe!g&{8P&XJQR=88|QPiLF#pD8JZ-Nem5GoNn) E0GuWzP5=M^ -- 2.45.2