Skip to content

Commit 8d19e34

Browse files
authored
Merge pull request #1036 from neutron-org/releases/v10.x
Releases: v10.0.0 release
2 parents adf6d32 + 1cfea81 commit 8d19e34

File tree

4 files changed

+181
-151
lines changed

4 files changed

+181
-151
lines changed

app/upgrades/v10.0.0/upgrades.go

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ import (
55
"fmt"
66

77
upgradetypes "cosmossdk.io/x/upgrade/types"
8+
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
89
"github.com/cosmos/cosmos-sdk/codec"
910
sdk "github.com/cosmos/cosmos-sdk/types"
1011
"github.com/cosmos/cosmos-sdk/types/module"
12+
"github.com/cosmos/cosmos-sdk/x/auth/types"
1113

1214
"github.com/neutron-org/neutron/v10/app/upgrades"
1315
)
1416

1517
func CreateUpgradeHandler(
1618
mm *module.Manager,
1719
configurator module.Configurator,
18-
_ *upgrades.UpgradeKeepers,
20+
keepers *upgrades.UpgradeKeepers,
1921
_ upgrades.StoreKeys,
2022
_ codec.Codec,
2123
) upgradetypes.UpgradeHandler {
@@ -29,7 +31,26 @@ func CreateUpgradeHandler(
2931
return vm, err
3032
}
3133

34+
err = wasmBurnerPerms(c, keepers)
35+
if err != nil {
36+
return vm, err
37+
}
38+
3239
ctx.Logger().Info(fmt.Sprintf("Migration {%s} applied", UpgradeName))
3340
return vm, nil
3441
}
3542
}
43+
44+
func wasmBurnerPerms(c context.Context, k *upgrades.UpgradeKeepers) error {
45+
// read module acc from storage or create new one
46+
accI := k.AccountKeeper.GetModuleAccount(c, wasmtypes.ModuleName)
47+
moduleAcc, ok := accI.(*types.ModuleAccount)
48+
if !ok {
49+
return fmt.Errorf("account is not a ModuleAccount")
50+
}
51+
// update permissions
52+
moduleAcc.Permissions = []string{types.Burner}
53+
54+
k.AccountKeeper.SetModuleAccount(c, moduleAcc)
55+
return nil
56+
}

app/upgrades/v10.0.0/upgrades_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@ func (suite *UpgradeTestSuite) TestUpgrade() {
3333
Info: "some text here",
3434
Height: 100,
3535
}
36+
3637
require.NoError(t, app.UpgradeKeeper.ApplyUpgrade(ctx, upgrade))
3738
}

go.mod

Lines changed: 50 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ require (
1515
cosmossdk.io/x/tx v0.14.0
1616
cosmossdk.io/x/upgrade v0.2.0
1717
github.com/CosmWasm/wasmd v0.61.0
18-
github.com/CosmWasm/wasmvm/v3 v3.0.2
18+
github.com/CosmWasm/wasmvm/v3 v3.0.3
1919
github.com/cometbft/cometbft v0.38.21
2020
github.com/cosmos/admin-module/v2 v2.0.0
2121
github.com/cosmos/cosmos-db v1.1.3
2222
github.com/cosmos/cosmos-proto v1.0.0-beta.5
23-
github.com/cosmos/cosmos-sdk v0.53.4
23+
github.com/cosmos/cosmos-sdk v0.53.5
2424
github.com/cosmos/go-bip39 v1.0.0
25-
github.com/cosmos/gogoproto v1.7.0
25+
github.com/cosmos/gogoproto v1.7.2
2626
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10 v10.1.0
27-
github.com/cosmos/ibc-go/v10 v10.4.0
27+
github.com/cosmos/ibc-go/v10 v10.5.0
2828
github.com/cosmos/ics23/go v0.11.0
2929
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0
3030
github.com/gogo/protobuf v1.3.3
3131
github.com/golang/mock v1.6.0
3232
github.com/golang/protobuf v1.5.4
3333
github.com/gorilla/mux v1.8.1
3434
github.com/grpc-ecosystem/grpc-gateway v1.16.0
35-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1
35+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1
3636
github.com/hashicorp/go-metrics v0.5.4
3737
github.com/pkg/errors v0.9.1
3838
github.com/prometheus/client_golang v1.23.2
@@ -41,27 +41,27 @@ require (
4141
github.com/skip-mev/feemarket v1.1.1
4242
github.com/skip-mev/slinky v1.2.0
4343
github.com/spf13/cast v1.10.0
44-
github.com/spf13/cobra v1.10.1
44+
github.com/spf13/cobra v1.10.2
4545
github.com/spf13/pflag v1.0.10
4646
github.com/spf13/viper v1.21.0
4747
github.com/stretchr/testify v1.11.1
48-
golang.org/x/crypto v0.41.0
48+
golang.org/x/crypto v0.45.0
4949
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
5050
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7
5151
google.golang.org/grpc v1.75.0
52-
google.golang.org/protobuf v1.36.8
52+
google.golang.org/protobuf v1.36.10
5353
gopkg.in/yaml.v2 v2.4.0
5454
)
5555

5656
require (
5757
cel.dev/expr v0.24.0 // indirect
58-
cloud.google.com/go v0.116.0 // indirect
59-
cloud.google.com/go/auth v0.15.0 // indirect
60-
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
61-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
62-
cloud.google.com/go/iam v1.2.2 // indirect
63-
cloud.google.com/go/monitoring v1.21.2 // indirect
64-
cloud.google.com/go/storage v1.49.0 // indirect
58+
cloud.google.com/go v0.120.0 // indirect
59+
cloud.google.com/go/auth v0.16.4 // indirect
60+
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
61+
cloud.google.com/go/compute/metadata v0.8.0 // indirect
62+
cloud.google.com/go/iam v1.5.2 // indirect
63+
cloud.google.com/go/monitoring v1.24.2 // indirect
64+
cloud.google.com/go/storage v1.50.0 // indirect
6565
cosmossdk.io/collections v1.3.1 // indirect
6666
cosmossdk.io/depinject v1.2.1 // indirect
6767
cosmossdk.io/schema v1.1.0 // indirect
@@ -71,20 +71,22 @@ require (
7171
github.com/DataDog/datadog-go v4.8.3+incompatible // indirect
7272
github.com/DataDog/zstd v1.5.7 // indirect
7373
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
74-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
75-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
74+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
75+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
7676
github.com/Microsoft/go-winio v0.6.2 // indirect
77+
github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251001021608-1fe7b43fc4d6 // indirect
7778
github.com/aws/aws-sdk-go v1.49.0 // indirect
7879
github.com/beorn7/perks v1.0.1 // indirect
7980
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
8081
github.com/bgentry/speakeasy v0.2.0 // indirect
81-
github.com/bits-and-blooms/bitset v1.22.0 // indirect
82-
github.com/bytedance/sonic v1.14.0 // indirect
83-
github.com/bytedance/sonic/loader v0.3.0 // indirect
82+
github.com/bits-and-blooms/bitset v1.24.3 // indirect
83+
github.com/bytedance/gopkg v0.1.3 // indirect
84+
github.com/bytedance/sonic v1.14.2 // indirect
85+
github.com/bytedance/sonic/loader v0.4.0 // indirect
8486
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
8587
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8688
github.com/chzyer/readline v1.5.1 // indirect
87-
github.com/cloudwego/base64x v0.1.5 // indirect
89+
github.com/cloudwego/base64x v0.1.6 // indirect
8890
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
8991
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
9092
github.com/cockroachdb/errors v1.12.0 // indirect
@@ -99,23 +101,23 @@ require (
99101
github.com/cosmos/iavl v1.2.6 // indirect
100102
github.com/cosmos/ibc-go/modules/capability v1.0.1 // indirect
101103
github.com/cosmos/interchain-security/v7 v7.0.1 // indirect
102-
github.com/cosmos/ledger-cosmos-go v0.14.0 // indirect
104+
github.com/cosmos/ledger-cosmos-go v0.16.0 // indirect
103105
github.com/danieljoos/wincred v1.2.1 // indirect
104106
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
105107
github.com/desertbit/timer v1.0.1 // indirect
106108
github.com/dgraph-io/badger/v4 v4.3.0 // indirect
107-
github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91 // indirect
109+
github.com/dgraph-io/ristretto v0.2.0 // indirect
108110
github.com/distribution/reference v0.5.0 // indirect
109111
github.com/dustin/go-humanize v1.0.1 // indirect
110112
github.com/dvsekhvalnov/jose2go v1.7.0 // indirect
111113
github.com/emicklei/dot v1.6.2 // indirect
112114
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
113115
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
114-
github.com/ethereum/go-ethereum v1.15.11 // indirect
116+
github.com/ethereum/go-ethereum v1.16.8 // indirect
115117
github.com/fatih/color v1.18.0 // indirect
116118
github.com/felixge/httpsnoop v1.0.4 // indirect
117119
github.com/fsnotify/fsnotify v1.9.0 // indirect
118-
github.com/getsentry/sentry-go v0.33.0 // indirect
120+
github.com/getsentry/sentry-go v0.35.0 // indirect
119121
github.com/ghodss/yaml v1.0.0 // indirect
120122
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
121123
github.com/go-kit/kit v0.13.0 // indirect
@@ -127,17 +129,17 @@ require (
127129
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
128130
github.com/gogo/googleapis v1.4.1 // indirect
129131
github.com/golang/glog v1.2.5 // indirect
130-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
131-
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e // indirect
132+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
133+
github.com/golang/snappy v1.0.0 // indirect
132134
github.com/google/btree v1.1.3 // indirect
133135
github.com/google/flatbuffers v24.3.25+incompatible // indirect
134136
github.com/google/go-cmp v0.7.0 // indirect
135137
github.com/google/gofuzz v1.2.0 // indirect
136138
github.com/google/orderedcode v0.0.1 // indirect
137139
github.com/google/s2a-go v0.1.9 // indirect
138140
github.com/google/uuid v1.6.0 // indirect
139-
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
140-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
141+
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
142+
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
141143
github.com/gorilla/handlers v1.5.2 // indirect
142144
github.com/gorilla/websocket v1.5.3 // indirect
143145
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
@@ -201,35 +203,36 @@ require (
201203
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
202204
github.com/ulikunitz/xz v0.5.14 // indirect
203205
github.com/zeebo/errs v1.4.0 // indirect
206+
github.com/zondax/golem v0.27.0 // indirect
204207
github.com/zondax/hid v0.9.2 // indirect
205-
github.com/zondax/ledger-go v0.14.3 // indirect
208+
github.com/zondax/ledger-go v1.0.1 // indirect
206209
go.etcd.io/bbolt v1.4.0-alpha.1 // indirect
207210
go.opencensus.io v0.24.0 // indirect
208211
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
209212
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
210-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
211-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
213+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
214+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
212215
go.opentelemetry.io/otel v1.37.0 // indirect
213216
go.opentelemetry.io/otel/metric v1.37.0 // indirect
214217
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
215218
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
216219
go.opentelemetry.io/otel/trace v1.37.0 // indirect
217-
go.uber.org/mock v0.5.2 // indirect
220+
go.uber.org/mock v0.6.0 // indirect
218221
go.uber.org/multierr v1.11.0 // indirect
219222
go.uber.org/zap v1.27.0 // indirect
220223
go.yaml.in/yaml/v2 v2.4.2 // indirect
221224
go.yaml.in/yaml/v3 v3.0.4 // indirect
222225
golang.org/x/arch v0.17.0 // indirect
223-
golang.org/x/net v0.43.0 // indirect
226+
golang.org/x/net v0.47.0 // indirect
224227
golang.org/x/oauth2 v0.30.0 // indirect
225-
golang.org/x/sync v0.17.0 // indirect
226-
golang.org/x/sys v0.35.0 // indirect
227-
golang.org/x/term v0.34.0 // indirect
228-
golang.org/x/text v0.28.0 // indirect
229-
golang.org/x/time v0.10.0 // indirect
230-
google.golang.org/api v0.223.0 // indirect
231-
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
232-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
228+
golang.org/x/sync v0.19.0 // indirect
229+
golang.org/x/sys v0.38.0 // indirect
230+
golang.org/x/term v0.37.0 // indirect
231+
golang.org/x/text v0.31.0 // indirect
232+
golang.org/x/time v0.12.0 // indirect
233+
google.golang.org/api v0.247.0 // indirect
234+
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
235+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
233236
gopkg.in/yaml.v3 v3.0.1 // indirect
234237
gotest.tools/v3 v3.5.2 // indirect
235238
nhooyr.io/websocket v1.8.17 // indirect
@@ -240,15 +243,15 @@ require (
240243

241244
replace (
242245
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
243-
github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.61.7-0.20260130145109-755720853b97
246+
github.com/CosmWasm/wasmd => github.com/neutron-org/wasmd v0.61.8-neutron
244247
github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.2
245-
github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.0.4-0.20251203133557-9b4c59c3151f
246-
github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.50.13-neutron.0.20251125163820-71ff8c91e59f
248+
github.com/cosmos/admin-module/v2 => github.com/neutron-org/admin-module/v2 v2.1.0
249+
github.com/cosmos/cosmos-sdk => github.com/neutron-org/cosmos-sdk v0.53.4-neutron
247250
// explicitely replace iavl to v1.2.0 cause sometimes go mod tidy uses not right version
248251
github.com/cosmos/iavl => github.com/cosmos/iavl v1.2.0
249252
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
250253
github.com/prometheus/procfs => github.com/prometheus/procfs v0.12.0
251-
github.com/skip-mev/feemarket => github.com/neutron-org/feemarket v0.0.0-20251208121040-765fc3366074
252-
github.com/skip-mev/slinky => github.com/neutron-org/connect v1.2.3-0.20251203181514-a2a22987f99d
254+
github.com/skip-mev/feemarket => github.com/neutron-org/feemarket v1.2.0
255+
github.com/skip-mev/slinky => github.com/neutron-org/connect v1.3.0
253256
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
254257
)

0 commit comments

Comments
 (0)