From 4a34d0d40e6dcedd8da9a64ac6d9a53613498697 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Wed, 29 May 2024 11:01:01 +0300 Subject: [PATCH] [#1149] go.mod: Bump neo-go up to v0.106.0 Required to work with neo-go v0.106.0 node with default hardfork configuration. Without neo-go client version bump, it throws error. failed to get network magic: unexpected hardfork: Cockatrice Signed-off-by: Alex Vanin --- .../modules/morph/helper/local_client.go | 2 +- .../internal/modules/morph/helper/n3client.go | 2 +- go.mod | 19 +++++++++--------- go.sum | Bin 43495 -> 43159 bytes pkg/ape/chainbase/boltdb.go | 8 ++++---- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/cmd/frostfs-adm/internal/modules/morph/helper/local_client.go b/cmd/frostfs-adm/internal/modules/morph/helper/local_client.go index 31203dde6..44d1b4ecf 100644 --- a/cmd/frostfs-adm/internal/modules/morph/helper/local_client.go +++ b/cmd/frostfs-adm/internal/modules/morph/helper/local_client.go @@ -113,7 +113,7 @@ func (l *LocalClient) GetBlockCount() (uint32, error) { return l.bc.BlockHeight(), nil } -func (l *LocalClient) GetNativeContracts() ([]state.NativeContract, error) { +func (l *LocalClient) GetNativeContracts() ([]state.Contract, error) { return l.bc.GetNatives(), nil } diff --git a/cmd/frostfs-adm/internal/modules/morph/helper/n3client.go b/cmd/frostfs-adm/internal/modules/morph/helper/n3client.go index 84dd69c79..55449b435 100644 --- a/cmd/frostfs-adm/internal/modules/morph/helper/n3client.go +++ b/cmd/frostfs-adm/internal/modules/morph/helper/n3client.go @@ -27,7 +27,7 @@ type Client interface { invoker.RPCInvoke GetBlockCount() (uint32, error) - GetNativeContracts() ([]state.NativeContract, error) + GetNativeContracts() ([]state.Contract, error) GetApplicationLog(util.Uint256, *trigger.Type) (*result.ApplicationLog, error) GetVersion() (*result.Version, error) SendRawTransaction(*transaction.Transaction) (util.Uint256, error) diff --git a/go.mod b/go.mod index 81e2fa989..1335747aa 100644 --- a/go.mod +++ b/go.mod @@ -24,21 +24,21 @@ require ( github.com/mr-tron/base58 v1.2.0 github.com/multiformats/go-multiaddr v0.12.1 github.com/nats-io/nats.go v1.32.0 - github.com/nspcc-dev/neo-go v0.105.1 + github.com/nspcc-dev/neo-go v0.106.0 github.com/olekukonko/tablewriter v0.0.5 github.com/panjf2000/ants/v2 v2.9.0 github.com/paulmach/orb v0.11.0 - github.com/prometheus/client_golang v1.18.0 + github.com/prometheus/client_golang v1.19.0 github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.18.2 github.com/ssgreg/journald v1.0.0 - github.com/stretchr/testify v1.8.4 - go.etcd.io/bbolt v1.3.8 + github.com/stretchr/testify v1.9.0 + go.etcd.io/bbolt v1.3.9 go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 - go.uber.org/zap v1.26.0 + go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a golang.org/x/sync v0.6.0 golang.org/x/sys v0.18.0 @@ -78,7 +78,6 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect github.com/hashicorp/go-version v1.6.0 // indirect - github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/holiman/uint256 v1.2.4 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -99,13 +98,13 @@ require ( github.com/multiformats/go-varint v0.0.7 // indirect github.com/nats-io/nkeys v0.4.7 // indirect github.com/nats-io/nuid v1.0.1 // indirect - github.com/nspcc-dev/go-ordered-json v0.0.0-20240112074137-296698a162ae // indirect - github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20240122090917-ef99a7a9e33f // indirect - github.com/nspcc-dev/rfc6979 v0.2.0 // indirect + github.com/nspcc-dev/go-ordered-json v0.0.0-20240301084351-0246b013f8b2 // indirect + github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20240521091047-78685785716d // indirect + github.com/nspcc-dev/rfc6979 v0.2.1 // indirect github.com/pelletier/go-toml/v2 v2.1.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.46.0 // indirect + github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect diff --git a/go.sum b/go.sum index 5dd9b2423968e43a594ea7fccddff534989b5168..ce68ddb222cf47db3b18e9e1afefd5e5c0fd7b1f 100644 GIT binary patch delta 1400 zcmZvc%dXp07=_hVAV4kB5rZC3k*YE@J-)@aN+9gm@g;VAiybF3-<|lDIF1v$LckLo zkcHqC7=e^0=#&u^bEdoi5(5~J(~A_LN_)D#wf^<*z5o3E_7Bf*|MC}b{OQxbKjKgb zhR6Ym!H*$ifO`;(Mx=*4OyDOuOC=WC0G;F)0&V9)u^88=2mp0cpis=LkV-?e(qAZP z|E+kx|CfItznKQc`o-fs42J*g~d$!pe6eD6Wx2;vYK&PxwaWqBPg5vI5yuXkx``?7S z)Jb{fPNhV{Y&LorYP;3IM}`|^LhZECHaawWGo_kBA5|%bg)w<@$2kmvAqs{D#AAZQ zNsKrh7=JN`?R&&LUF6znOFv4QwiJ zW(qzrH{r24Pi(bq!=3NUzz~4h)MnJUU^vGbhVvI~e<|IA;G0s&{p^ssxiA~$DnUW~ zHr$)#*fOP+UC3~h2gbTgEzpP!<+YH2&y1%jkzi?S&C+Dms%U4$qfyer4btch$}~Dx z)NUHon`-7CpGjZ8i%>6@(Z)`*wqUxPz)BKyemViPmZfw_HQB*|NONbN6_H2dlGT4_ zeb__O3+g02b6ywF8}L8?alUPwz%n#|r5TYES4GYSYao3^c)M4vyZtTe zh>$Ns=qhO;!$9rK0%n+P?nq9sbKMyb%t1_-R}n*Qo7(KgWA23bggVL20zlw++higa zY5GvdL}WQJ>DgFYbj!)GF}4^t#6_8%X0+y?)R+Cw_WQ@g{^DN$kI(jhcpt#8su1eU zTC~|=wip!qn81Jtmz!-1?u8wIGNs86J%;wz)9ti>=05sg3l*~T!E6(DV8+#*Ozc&# z+PhfbnX+TE+Nh1lAq6i{+?^lcV0h=aOg_H@Q7=}1AY9teIA`g2LS9>YT5O2WMk0MA zRI=MRoz`802T~o!1Ca*S9HUIA|43rxR_UKZea=OzJLDx<&&FjpQYZE((I7) lrpV-USS^(UOqFq6aazUKtf!4}bfAw!U#1iP==^wn@gIKN#nAu& delta 1650 zcmZ{kJI~v66o*ACq!%bi45+0Pcnd7ZYW(-zu2ex1-xJ5L?bx|UNI14*CywL0V`o8p zf(}ON*8t@curh!UbCH->Ixv6)EReKC%1}PQ@Ao`9=jc58@!GFHUHkfXh`g+j4(Onl z0dn89FrS&jpLYDOlA)4m72-9CXX9z2i3e%y&- z_tdiLve9^#O2ZhB=5%j_v8YBu%-W?V3Q-EZx`8;lsg0P$Pc4Th&_B011VI6XBN%lL zWk`~tZG=Q^?^I{%mh+2D6QUiX%qbVfa&@W0W~Y&)~u+0FK@rTCh{DA-ML@ zxya@jzepWvn+nu=9i;h?+iphA(}tb+K8K(vU;u+q_q-*;*p$t97`8n5kOA2HnlNyU zLRY8yW)kdCcOGSf(1=tSk5_CC$gPSoQ|Z69;fveO6lGWmNoYIp2F3*6HGVkP_@PD` z;ZQY%DIwTEFUvA4INLv#egweD1oM!|sLnd)qxZsS8l@giAswaE*B~XpRo$OX|x2!2~?|v6gIg$Za-cE)1m}S!|V!UWC$CvG6<2B}(JcExRVH);B zVrR&Wnkv%X@~djivzt)WwuQeA<;fr$5kL*^JehbABm>tw;mxliDl;z3+DN~fV=QC#IVNN>D_ zd^EA)Ks!QjwSSv$91iBEufwNN_Z_QVFENe2Qa~h{1G(>RA#Xk}BBIfDUZ4|=XIPr% zm|^>^eYgE>A+)6X*5NPb^7=)!%8Jt7xb64+?avSjkSKys7y-b&1wwnIM^cze;U|o| zE4sxZp)#1#j7Heg(ZF2H(!RR;!2Bcs3?sC?fXNmX@J*x@~%9$_U^ z^!3wN;!e5nvQC`&@ZL^N|MGM|XDV*NZHl71+6h%G!_^v>c4E(f{b|mXa55)AWJ>y^ z6u`ASKKzn@_cDq