Skip to content

Commit

Permalink
chore: update to latest SDK
Browse files Browse the repository at this point in the history
There was one small import conflict. Tests still pass.
  • Loading branch information
mark-rushakoff committed Oct 10, 2024
1 parent 4cd6702 commit a297dc6
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion gcosmos/_cosmosvendor/COSMOS_SDK.commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file may contain any number of comments (lines containing a # symbol)
# and must otherwise contain exactly ONE line with a cosmos-sdk commit to check out
# when the user calls the scripts/sync_sdk.bash script.
8e34382463937e19321316c9777def28855d5952
dd2369daf2dce11d4d234ee11590a03e57812096
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 61ad671e0b49b702308889a3c717173bbb85b311 Mon Sep 17 00:00:00 2001
From 071894cec813c49bba6421ca8ab97f8413bc32a7 Mon Sep 17 00:00:00 2001
From: Mark Rushakoff <[email protected]>
Date: Wed, 17 Jul 2024 10:03:22 -0400
Subject: [PATCH 1/6] chore: allow injecting a server component into simd root
Expand All @@ -10,15 +10,15 @@ Subject: [PATCH 1/6] chore: allow injecting a server component into simd root
2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/simapp/v2/simdv2/cmd/commands.go b/simapp/v2/simdv2/cmd/commands.go
index addc7eeb76..55d3d5ace0 100644
index 3fcbed114d..e72f08affb 100644
--- a/simapp/v2/simdv2/cmd/commands.go
+++ b/simapp/v2/simdv2/cmd/commands.go
@@ -16,7 +16,6 @@ import (
serverv2 "cosmossdk.io/server/v2"
"cosmossdk.io/server/v2/api/grpc"
"cosmossdk.io/server/v2/api/telemetry"
- "cosmossdk.io/server/v2/cometbft"
"cosmossdk.io/server/v2/store"
serverstore "cosmossdk.io/server/v2/store"
"cosmossdk.io/simapp/v2"
confixcmd "cosmossdk.io/tools/confix/cmd"
@@ -42,8 +41,9 @@ func newApp[T transaction.Tx](logger log.Logger, viper *viper.Viper) serverv2.Ap
Expand All @@ -43,10 +43,10 @@ index addc7eeb76..55d3d5ace0 100644
- ),
+ makeComponent(clientCtx),
grpc.New[T](),
store.New[T](newApp),
serverstore.New[T](),
telemetry.New[T](),
diff --git a/simapp/v2/simdv2/cmd/root_di.go b/simapp/v2/simdv2/cmd/root_di.go
index 1ad834b53a..f9464d9cd0 100644
index 6b13b72013..43f81ca158 100644
--- a/simapp/v2/simdv2/cmd/root_di.go
+++ b/simapp/v2/simdv2/cmd/root_di.go
@@ -13,6 +13,8 @@ import (
Expand All @@ -58,7 +58,7 @@ index 1ad834b53a..f9464d9cd0 100644
"cosmossdk.io/simapp/v2"

"github.com/cosmos/cosmos-sdk/client"
@@ -26,8 +28,26 @@ import (
@@ -25,8 +27,26 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/types"
)

Expand All @@ -85,7 +85,7 @@ index 1ad834b53a..f9464d9cd0 100644
var (
autoCliOpts autocli.AppOptions
moduleManager *runtime.MM[T]
@@ -83,12 +103,11 @@ func NewRootCmd[T transaction.Tx]() *cobra.Command {
@@ -71,12 +91,11 @@ func NewRootCmd[T transaction.Tx]() *cobra.Command {
},
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From a8cb06b6e339a889e89c0d76f2c8ca95ad9aa16c Mon Sep 17 00:00:00 2001
From 5bd5d6194984be22c41b72d4e3f70172667661ee Mon Sep 17 00:00:00 2001
From: Mark Rushakoff <[email protected]>
Date: Tue, 9 Jul 2024 14:12:55 -0400
Subject: [PATCH 2/6] chore: use slog for server v2 logging
Expand All @@ -11,7 +11,7 @@ This just plugs in easier with gcosmos tests, for now at least.
create mode 100644 server/v2/slog.go

diff --git a/server/v2/commands.go b/server/v2/commands.go
index da8e0ec6e5..43aa6bc8c8 100644
index 0357fe180d..c92bc3e13f 100644
--- a/server/v2/commands.go
+++ b/server/v2/commands.go
@@ -3,6 +3,7 @@ package serverv2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 735948cc43f7278ef4481b14e97ffb5688733155 Mon Sep 17 00:00:00 2001
From aa593539b1165d636bf33346ea03a75ee7e88f0e Mon Sep 17 00:00:00 2001
From: Mark Rushakoff <[email protected]>
Date: Wed, 17 Jul 2024 10:49:18 -0400
Subject: [PATCH 3/6] fix: respect command context in server start
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH 3/6] fix: respect command context in server start
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/v2/commands.go b/server/v2/commands.go
index 43aa6bc8c8..98405e98c1 100644
index c92bc3e13f..98a01b108e 100644
--- a/server/v2/commands.go
+++ b/server/v2/commands.go
@@ -121,9 +121,13 @@ func createStartCommand[T transaction.Tx](
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 2505fae64724bdb82b2ea57d709c65be69ae6ef8 Mon Sep 17 00:00:00 2001
From 38aa6738ac552748f2804705473edfb81702d36a Mon Sep 17 00:00:00 2001
From: Mark Rushakoff <[email protected]>
Date: Mon, 29 Jul 2024 11:57:21 -0400
Subject: [PATCH 4/6] feat: add (AppManager[T]).SimulateWithState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c85c9c82283b091e16c96177d78da0c1abcb49e8 Mon Sep 17 00:00:00 2001
From d021a8b10a95066c6c49969e2c4a79508eab1727 Mon Sep 17 00:00:00 2001
From: Mark Rushakoff <[email protected]>
Date: Fri, 16 Aug 2024 10:01:38 -0400
Subject: [PATCH 5/6] fix: don't directly set viper home
Expand All @@ -11,7 +11,7 @@ running in the same process.
1 file changed, 2 deletions(-)

diff --git a/simapp/v2/simdv2/cmd/commands.go b/simapp/v2/simdv2/cmd/commands.go
index 55d3d5ace0..b089ee5cb0 100644
index e72f08affb..7d67773fc3 100644
--- a/simapp/v2/simdv2/cmd/commands.go
+++ b/simapp/v2/simdv2/cmd/commands.go
@@ -35,7 +35,6 @@ import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From b33391c6bbf9e7399ec3353696e784a16a18c812 Mon Sep 17 00:00:00 2001
From d4ff282a28dc3745911968df0c06689945b6624e Mon Sep 17 00:00:00 2001
From: Mark Rushakoff <[email protected]>
Date: Fri, 16 Aug 2024 15:39:48 -0400
Subject: [PATCH 6/6] fix: default client context's output to cmd.OutOrStdout
Expand Down

0 comments on commit a297dc6

Please sign in to comment.