diff --git a/client/v2/go.mod b/client/v2/go.mod index d2817dfb76..31a1a525cf 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -179,7 +179,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ./../../x/accounts diff --git a/client/v2/go.sum b/client/v2/go.sum index 9743c1d0ec..5014b4d4a5 100644 --- a/client/v2/go.sum +++ b/client/v2/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/go.mod b/go.mod index 0cb5ff17a0..b466805da7 100644 --- a/go.mod +++ b/go.mod @@ -187,7 +187,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ./x/accounts diff --git a/go.sum b/go.sum index 3915e6eb02..8e3cd37ef4 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/runtime/module.go b/runtime/module.go index 43da40efb2..99d4ff53da 100644 --- a/runtime/module.go +++ b/runtime/module.go @@ -12,10 +12,10 @@ import ( runtimev1alpha1 "cosmossdk.io/api/cosmos/app/runtime/v1alpha1" autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" - "cosmossdk.io/core/app" "cosmossdk.io/core/appmodule" "cosmossdk.io/core/comet" "cosmossdk.io/core/legacy" + "cosmossdk.io/core/server" "cosmossdk.io/core/store" "cosmossdk.io/depinject" "cosmossdk.io/depinject/appconfig" @@ -288,7 +288,7 @@ func ProvideTransientStoreService( return transientStoreService{key: storeKey} } -func ProvideAppVersionModifier(app *AppBuilder) app.VersionModifier { +func ProvideAppVersionModifier(app *AppBuilder) server.VersionModifier { return app.app } diff --git a/server/v2/cometbft/abci.go b/server/v2/cometbft/abci.go index 9d3bf595b1..5a625a1efe 100644 --- a/server/v2/cometbft/abci.go +++ b/server/v2/cometbft/abci.go @@ -11,10 +11,10 @@ import ( abciproto "github.com/cometbft/cometbft/api/cometbft/abci/v1" gogoproto "github.com/cosmos/gogoproto/proto" - coreappmgr "cosmossdk.io/core/app" "cosmossdk.io/core/comet" corecontext "cosmossdk.io/core/context" "cosmossdk.io/core/event" + "cosmossdk.io/core/server" "cosmossdk.io/core/store" "cosmossdk.io/core/transaction" errorsmod "cosmossdk.io/errors" @@ -134,10 +134,6 @@ func (c *Consensus[T]) CheckTx(ctx context.Context, req *abciproto.CheckTxReques GasWanted: uint64ToInt64(resp.GasWanted), GasUsed: uint64ToInt64(resp.GasUsed), Events: intoABCIEvents(resp.Events, c.indexedEvents), - Info: resp.Info, - Data: resp.Data, - Log: resp.Log, - Codespace: resp.Codespace, } if resp.Error != nil { cometResp.Code = 1 @@ -268,7 +264,7 @@ func (c *Consensus[T]) InitChain(ctx context.Context, req *abciproto.InitChainRe // populate hash with empty byte slice instead of nil bz := sha256.Sum256([]byte{}) - br := &coreappmgr.BlockRequest[T]{ + br := &server.BlockRequest[T]{ Height: uint64(req.InitialHeight - 1), Time: req.Time, Hash: bz[:], @@ -289,7 +285,7 @@ func (c *Consensus[T]) InitChain(ctx context.Context, req *abciproto.InitChainRe // TODO necessary? where should this WARN live if it all. helpful for testing for _, txRes := range blockresponse.TxResults { if txRes.Error != nil { - c.logger.Warn("genesis tx failed", "code", txRes.Code, "log", txRes.Log, "error", txRes.Error) + c.logger.Warn("genesis tx failed", "code", txRes.Code, "error", txRes.Error) } } @@ -441,7 +437,7 @@ func (c *Consensus[T]) FinalizeBlock( return nil, err } - blockReq := &coreappmgr.BlockRequest[T]{ + blockReq := &server.BlockRequest[T]{ Height: uint64(req.Height), Time: req.Time, Hash: req.Hash, diff --git a/server/v2/cometbft/go.mod b/server/v2/cometbft/go.mod index 1872dfccd5..7f131220d4 100644 --- a/server/v2/cometbft/go.mod +++ b/server/v2/cometbft/go.mod @@ -6,7 +6,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../../../x/accounts @@ -23,8 +23,8 @@ require ( cosmossdk.io/core v1.0.0 // main cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.4.1 - cosmossdk.io/server/v2 v2.0.0-20240802142126-a26970e547ab // main - cosmossdk.io/server/v2/appmanager v0.0.0-20240816111545-aeeaca64da2c // main + cosmossdk.io/server/v2 v2.0.0-20240827095516-355f748add9e // main + cosmossdk.io/server/v2/appmanager v0.0.0-20240827095516-355f748add9e // main cosmossdk.io/store/v2 v2.0.0-20240731205446-aee9803a0af6 // main cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000 github.com/cometbft/cometbft v1.0.0-rc1 @@ -72,7 +72,7 @@ require ( github.com/cosmos/cosmos-db v1.0.2 // indirect github.com/cosmos/crypto v0.1.2 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/iavl v1.2.1-0.20240725141113-7adc688cf179 // indirect + github.com/cosmos/iavl v1.2.1-0.20240731145221-594b181f427e // indirect github.com/cosmos/ics23/go v0.10.0 // indirect github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect github.com/danieljoos/wincred v1.2.1 // indirect @@ -133,7 +133,7 @@ require ( github.com/petermattis/goid v0.0.0-20240327183114-c42a807a84ba // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_golang v1.20.0 // indirect + github.com/prometheus/client_golang v1.20.2 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect diff --git a/server/v2/cometbft/go.sum b/server/v2/cometbft/go.sum index 78fff779c7..64b4795ec5 100644 --- a/server/v2/cometbft/go.sum +++ b/server/v2/cometbft/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= @@ -24,10 +24,10 @@ cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= cosmossdk.io/schema v0.1.1 h1:I0M6pgI7R10nq+/HCQfbO6BsGBZA8sQy+duR1Y3aKcA= cosmossdk.io/schema v0.1.1/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= -cosmossdk.io/server/v2 v2.0.0-20240802142126-a26970e547ab h1:6IGp/R/6D4NZT+MKIoM2OkmxZG4UFh32HgwN7mYynvk= -cosmossdk.io/server/v2 v2.0.0-20240802142126-a26970e547ab/go.mod h1:alRmtz2gedZe+goFHbNjkBPNTkShFW6HEeXiyT7hdHM= -cosmossdk.io/server/v2/appmanager v0.0.0-20240816111545-aeeaca64da2c h1:sxMoOFQvf5g1Wl1D2HidVtLpQhK1YCVq0YiDeT6qTNQ= -cosmossdk.io/server/v2/appmanager v0.0.0-20240816111545-aeeaca64da2c/go.mod h1:fJDDnWJCBRxLLIyu2byqtf3KTRYIVS4OxKwdZozJi20= +cosmossdk.io/server/v2 v2.0.0-20240827095516-355f748add9e h1:5B5vereMsxfQsk8eXchBQPB1sc5POgYxZOBaUlST6WQ= +cosmossdk.io/server/v2 v2.0.0-20240827095516-355f748add9e/go.mod h1:rUve692/2QXV8ulpAG1mlytqiyW5nhZySY4ngmgJyQA= +cosmossdk.io/server/v2/appmanager v0.0.0-20240827095516-355f748add9e h1:9eB2si1gT6c5ea8Jsh498Ei6E3Th1yMyuJgSLiT6D4Y= +cosmossdk.io/server/v2/appmanager v0.0.0-20240827095516-355f748add9e/go.mod h1:fJDDnWJCBRxLLIyu2byqtf3KTRYIVS4OxKwdZozJi20= cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 h1:o024zaPHYtmUGL2BCX1ns9rfZmMc19U4hQ2CAPt2Xgg= cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897/go.mod h1:Ma4uny4RFegWTbU71fBmkSIoHrWHlLC/JwwgWgehZm4= cosmossdk.io/store/v2 v2.0.0-20240731205446-aee9803a0af6 h1:/ffIfMKzoCVUI38t5Vq3BNW9U8exRMxK5QgS/ujn0lA= @@ -123,8 +123,8 @@ github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiK github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro= github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0= -github.com/cosmos/iavl v1.2.1-0.20240725141113-7adc688cf179 h1:wmwDn7V3RodN9auB3FooSQxs46nHVE3u0mb87TJkZFE= -github.com/cosmos/iavl v1.2.1-0.20240725141113-7adc688cf179/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw= +github.com/cosmos/iavl v1.2.1-0.20240731145221-594b181f427e h1:5bxw1E0peLMrr8ZO9mYT0d9sxy0WgR1ZEWb92yjKnnk= +github.com/cosmos/iavl v1.2.1-0.20240731145221-594b181f427e/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/ledger-cosmos-go v0.13.3 h1:7ehuBGuyIytsXbd4MP43mLeoN2LTOEnk5nvue4rK+yM= @@ -405,8 +405,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= -github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= +github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= diff --git a/server/v2/cometbft/handlers/defaults.go b/server/v2/cometbft/handlers/defaults.go index c16064974b..3470125d64 100644 --- a/server/v2/cometbft/handlers/defaults.go +++ b/server/v2/cometbft/handlers/defaults.go @@ -9,14 +9,14 @@ import ( "github.com/cosmos/gogoproto/proto" consensusv1 "cosmossdk.io/api/cosmos/consensus/v1" - appmanager "cosmossdk.io/core/app" + "cosmossdk.io/core/server" "cosmossdk.io/core/store" "cosmossdk.io/core/transaction" "cosmossdk.io/server/v2/cometbft/mempool" ) type AppManager[T transaction.Tx] interface { - ValidateTx(ctx context.Context, tx T) (appmanager.TxResult, error) + ValidateTx(ctx context.Context, tx T) (server.TxResult, error) Query(ctx context.Context, version uint64, request transaction.Msg) (response transaction.Msg, err error) } diff --git a/server/v2/cometbft/streaming.go b/server/v2/cometbft/streaming.go index 1ac9991b9f..0c8af07aa5 100644 --- a/server/v2/cometbft/streaming.go +++ b/server/v2/cometbft/streaming.go @@ -3,8 +3,8 @@ package cometbft import ( "context" - coreappmgr "cosmossdk.io/core/app" "cosmossdk.io/core/event" + "cosmossdk.io/core/server" "cosmossdk.io/core/store" "cosmossdk.io/server/v2/streaming" ) @@ -14,7 +14,7 @@ func (c *Consensus[T]) streamDeliverBlockChanges( ctx context.Context, height int64, txs [][]byte, - txResults []coreappmgr.TxResult, + txResults []server.TxResult, events []event.Event, stateChanges []store.StateChanges, ) error { @@ -23,13 +23,9 @@ func (c *Consensus[T]) streamDeliverBlockChanges( for i, txResult := range txResults { streamingTxResults[i] = &streaming.ExecTxResult{ Code: txResult.Code, - Data: txResult.Data, - Log: txResult.Log, - Info: txResult.Info, GasWanted: uint64ToInt64(txResult.GasWanted), GasUsed: uint64ToInt64(txResult.GasUsed), Events: streaming.IntoStreamingEvents(txResult.Events), - Codespace: txResult.Codespace, } } diff --git a/server/v2/cometbft/utils.go b/server/v2/cometbft/utils.go index 594e046ad1..b8470c79e7 100644 --- a/server/v2/cometbft/utils.go +++ b/server/v2/cometbft/utils.go @@ -17,10 +17,10 @@ import ( "google.golang.org/protobuf/types/known/anypb" v1beta1 "cosmossdk.io/api/cosmos/base/abci/v1beta1" - appmanager "cosmossdk.io/core/app" appmodulev2 "cosmossdk.io/core/appmodule/v2" "cosmossdk.io/core/comet" "cosmossdk.io/core/event" + "cosmossdk.io/core/server" "cosmossdk.io/core/transaction" errorsmod "cosmossdk.io/errors" consensus "cosmossdk.io/x/consensus/types" @@ -68,7 +68,7 @@ func splitABCIQueryPath(requestPath string) (path []string) { } func finalizeBlockResponse( - in *appmanager.BlockResponse, + in *server.BlockResponse, cp *cmtproto.ConsensusParams, appHash []byte, indexSet map[string]struct{}, @@ -99,7 +99,7 @@ func intoABCIValidatorUpdates(updates []appmodulev2.ValidatorUpdate) []abci.Vali return valsetUpdates } -func intoABCITxResults(results []appmanager.TxResult, indexSet map[string]struct{}) []*abci.ExecTxResult { +func intoABCITxResults(results []server.TxResult, indexSet map[string]struct{}) []*abci.ExecTxResult { res := make([]*abci.ExecTxResult, len(results)) for i := range results { if results[i].Error != nil { @@ -146,7 +146,7 @@ func intoABCIEvents(events []event.Event, indexSet map[string]struct{}) []abci.E return abciEvents } -func intoABCISimulationResponse(txRes appmanager.TxResult, indexSet map[string]struct{}) ([]byte, error) { +func intoABCISimulationResponse(txRes server.TxResult, indexSet map[string]struct{}) ([]byte, error) { indexAll := len(indexSet) == 0 abciEvents := make([]*abciv1.Event, len(txRes.Events)) for i, e := range txRes.Events { diff --git a/simapp/go.mod b/simapp/go.mod index ab15f26c8d..be4b4266c3 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -243,7 +243,7 @@ replace ( cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main cosmossdk.io/client/v2 => ../client/v2 // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/tools/confix => ../tools/confix diff --git a/simapp/go.sum b/simapp/go.sum index 696f83100f..1775c88923 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -196,8 +196,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/simapp/v2/app_di.go b/simapp/v2/app_di.go index 4e87bcc305..839cfb1ac3 100644 --- a/simapp/v2/app_di.go +++ b/simapp/v2/app_di.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/viper" clienthelpers "cosmossdk.io/client/v2/helpers" - coreapp "cosmossdk.io/core/app" "cosmossdk.io/core/legacy" + "cosmossdk.io/core/server" "cosmossdk.io/core/transaction" "cosmossdk.io/depinject" "cosmossdk.io/log" @@ -212,7 +212,7 @@ func (app *SimApp[T]) AppCodec() codec.Codec { } // InterfaceRegistry returns SimApp's InterfaceRegistry. -func (app *SimApp[T]) InterfaceRegistry() coreapp.InterfaceRegistry { +func (app *SimApp[T]) InterfaceRegistry() server.InterfaceRegistry { return app.interfaceRegistry } diff --git a/simapp/v2/app_test.go b/simapp/v2/app_test.go index a2ffdcee4e..d99164d8f1 100644 --- a/simapp/v2/app_test.go +++ b/simapp/v2/app_test.go @@ -11,9 +11,9 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - app2 "cosmossdk.io/core/app" "cosmossdk.io/core/comet" context2 "cosmossdk.io/core/context" + "cosmossdk.io/core/server" "cosmossdk.io/core/store" "cosmossdk.io/core/transaction" "cosmossdk.io/log" @@ -80,7 +80,7 @@ func NewTestApp(t *testing.T) (*SimApp[transaction.Tx], context.Context) { _, newState, err := app.InitGenesis( ctx, - &app2.BlockRequest[transaction.Tx]{ + &server.BlockRequest[transaction.Tx]{ Time: time.Now(), Hash: bz[:], ChainId: "theChain", @@ -123,7 +123,7 @@ func MoveNextBlock(t *testing.T, app *SimApp[transaction.Tx], ctx context.Contex _, newState, err := app.DeliverBlock( ctx, - &app2.BlockRequest[transaction.Tx]{ + &server.BlockRequest[transaction.Tx]{ Height: height + 1, Time: time.Now(), Hash: bz[:], diff --git a/simapp/v2/go.mod b/simapp/v2/go.mod index 6f6c555c82..be47671e82 100644 --- a/simapp/v2/go.mod +++ b/simapp/v2/go.mod @@ -10,8 +10,8 @@ require ( cosmossdk.io/depinject v1.0.0 cosmossdk.io/log v1.4.1 cosmossdk.io/math v1.3.0 - cosmossdk.io/runtime/v2 v2.0.0-20240823213806-a554a21a0e84 // main - cosmossdk.io/server/v2 v2.0.0-20240815194237-858ec2fcb897 // main + cosmossdk.io/runtime/v2 v2.0.0-20240827095516-355f748add9e // main + cosmossdk.io/server/v2 v2.0.0-20240827095516-355f748add9e // main cosmossdk.io/server/v2/cometbft v0.0.0-00010101000000-000000000000 cosmossdk.io/store/v2 v2.0.0-20240815194237-858ec2fcb897 // main cosmossdk.io/tools/confix v0.0.0-00010101000000-000000000000 @@ -56,8 +56,8 @@ require ( cosmossdk.io/errors v1.0.1 // indirect cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5 // indirect cosmossdk.io/schema v0.1.1 // indirect - cosmossdk.io/server/v2/appmanager v0.0.0-20240816111545-aeeaca64da2c // indirect; main - cosmossdk.io/server/v2/stf v0.0.0-20240823213806-a554a21a0e84 // indirect; main + cosmossdk.io/server/v2/appmanager v0.0.0-20240827095516-355f748add9e // indirect; main + cosmossdk.io/server/v2/stf v0.0.0-20240827095516-355f748add9e // indirect; main cosmossdk.io/store v1.1.1-0.20240815194237-858ec2fcb897 // indirect; main cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5 // indirect cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000 // indirect @@ -183,7 +183,7 @@ require ( github.com/petermattis/goid v0.0.0-20240327183114-c42a807a84ba // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_golang v1.20.1 // indirect + github.com/prometheus/client_golang v1.20.2 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect @@ -252,7 +252,7 @@ replace ( cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main cosmossdk.io/client/v2 => ../../client/v2 // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main cosmossdk.io/server/v2/cometbft => ../../server/v2/cometbft // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main diff --git a/simapp/v2/go.sum b/simapp/v2/go.sum index ce1c8cacdb..882b7b26a8 100644 --- a/simapp/v2/go.sum +++ b/simapp/v2/go.sum @@ -196,8 +196,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= @@ -210,16 +210,16 @@ cosmossdk.io/log v1.4.1 h1:wKdjfDRbDyZRuWa8M+9nuvpVYxrEOwbD/CA8hvhU8QM= cosmossdk.io/log v1.4.1/go.mod h1:k08v0Pyq+gCP6phvdI6RCGhLf/r425UT6Rk/m+o74rU= cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= -cosmossdk.io/runtime/v2 v2.0.0-20240823213806-a554a21a0e84 h1:LW6gh9tS1gF0O8s29DjukYXobAcL7Qe78xFOTpXXsio= -cosmossdk.io/runtime/v2 v2.0.0-20240823213806-a554a21a0e84/go.mod h1:YkwJ41+DM7INqLziPRFqudlqzRly29F1m3Yb8VemLMk= +cosmossdk.io/runtime/v2 v2.0.0-20240827095516-355f748add9e h1:JMGfe9Nj1lEjMjyPRyjSoehBYnCvaZMjuam9Fa4wCk8= +cosmossdk.io/runtime/v2 v2.0.0-20240827095516-355f748add9e/go.mod h1:SoCx1xyZn+tVPAtTAuLSEYjocVtZips+O2QLGBj99/c= cosmossdk.io/schema v0.1.1 h1:I0M6pgI7R10nq+/HCQfbO6BsGBZA8sQy+duR1Y3aKcA= cosmossdk.io/schema v0.1.1/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= -cosmossdk.io/server/v2 v2.0.0-20240815194237-858ec2fcb897 h1:0+G0h2TUKqZdtr36Xse+HABj6clPQjYCB6afAefc5BA= -cosmossdk.io/server/v2 v2.0.0-20240815194237-858ec2fcb897/go.mod h1:fVFP3ER/Wwg69A2YzGyBLwBD/xNJLrjtaoJhW+WIjAI= -cosmossdk.io/server/v2/appmanager v0.0.0-20240816111545-aeeaca64da2c h1:sxMoOFQvf5g1Wl1D2HidVtLpQhK1YCVq0YiDeT6qTNQ= -cosmossdk.io/server/v2/appmanager v0.0.0-20240816111545-aeeaca64da2c/go.mod h1:fJDDnWJCBRxLLIyu2byqtf3KTRYIVS4OxKwdZozJi20= -cosmossdk.io/server/v2/stf v0.0.0-20240823213806-a554a21a0e84 h1:w2yxPzzwltor54uV6mHuJ788yhmrbN+EV1zLAJDJBzI= -cosmossdk.io/server/v2/stf v0.0.0-20240823213806-a554a21a0e84/go.mod h1:lAejzCkeM9z7WGrWoDzv7peXtyghW84Sys4hE3LlVXs= +cosmossdk.io/server/v2 v2.0.0-20240827095516-355f748add9e h1:5B5vereMsxfQsk8eXchBQPB1sc5POgYxZOBaUlST6WQ= +cosmossdk.io/server/v2 v2.0.0-20240827095516-355f748add9e/go.mod h1:rUve692/2QXV8ulpAG1mlytqiyW5nhZySY4ngmgJyQA= +cosmossdk.io/server/v2/appmanager v0.0.0-20240827095516-355f748add9e h1:9eB2si1gT6c5ea8Jsh498Ei6E3Th1yMyuJgSLiT6D4Y= +cosmossdk.io/server/v2/appmanager v0.0.0-20240827095516-355f748add9e/go.mod h1:fJDDnWJCBRxLLIyu2byqtf3KTRYIVS4OxKwdZozJi20= +cosmossdk.io/server/v2/stf v0.0.0-20240827095516-355f748add9e h1:A2JxCwJuoMRiBF8ZjpxRf+JO5cTSYw8Vc2iHImfHoKg= +cosmossdk.io/server/v2/stf v0.0.0-20240827095516-355f748add9e/go.mod h1:Y0cRRjdM5JcXqFsGYgZgWkiG7fA4eN8oNBP1vSEE8Gc= cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 h1:o024zaPHYtmUGL2BCX1ns9rfZmMc19U4hQ2CAPt2Xgg= cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897/go.mod h1:Ma4uny4RFegWTbU71fBmkSIoHrWHlLC/JwwgWgehZm4= cosmossdk.io/store/v2 v2.0.0-20240815194237-858ec2fcb897 h1:i2KoUy2254WwK671eROhHyRGk60W7Omv7nax6gybCKQ= @@ -754,8 +754,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.20.1 h1:IMJXHOD6eARkQpxo8KkhgEVFlBNm+nkrFUyGlIu7Na8= -github.com/prometheus/client_golang v1.20.1/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= +github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= diff --git a/tests/go.mod b/tests/go.mod index c26a648414..e9e64a6ae7 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -240,7 +240,7 @@ replace ( cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main cosmossdk.io/client/v2 => ../client/v2 // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../x/accounts diff --git a/tests/go.sum b/tests/go.sum index ad4d75b534..2378ec90a6 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -196,8 +196,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/accounts/defaults/lockup/go.mod b/x/accounts/defaults/lockup/go.mod index 484d74218c..b48af4496e 100644 --- a/x/accounts/defaults/lockup/go.mod +++ b/x/accounts/defaults/lockup/go.mod @@ -153,7 +153,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../../. diff --git a/x/accounts/defaults/lockup/go.sum b/x/accounts/defaults/lockup/go.sum index 7f755e804d..0b17432f54 100644 --- a/x/accounts/defaults/lockup/go.sum +++ b/x/accounts/defaults/lockup/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/accounts/defaults/multisig/go.mod b/x/accounts/defaults/multisig/go.mod index c328cff697..f34d468cfc 100644 --- a/x/accounts/defaults/multisig/go.mod +++ b/x/accounts/defaults/multisig/go.mod @@ -176,7 +176,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../../. diff --git a/x/accounts/defaults/multisig/go.sum b/x/accounts/defaults/multisig/go.sum index 3cb84a727f..4ff2b04c40 100644 --- a/x/accounts/defaults/multisig/go.sum +++ b/x/accounts/defaults/multisig/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/accounts/go.mod b/x/accounts/go.mod index 02c6846cd2..f01f127a50 100644 --- a/x/accounts/go.mod +++ b/x/accounts/go.mod @@ -180,7 +180,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts/defaults/lockup => ./defaults/lockup diff --git a/x/accounts/go.sum b/x/accounts/go.sum index 01cd011642..7c8b7a7a3a 100644 --- a/x/accounts/go.sum +++ b/x/accounts/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/auth/go.mod b/x/auth/go.mod index daad89692a..cab928e5f7 100644 --- a/x/auth/go.mod +++ b/x/auth/go.mod @@ -176,7 +176,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/auth/go.sum b/x/auth/go.sum index 01cd011642..7c8b7a7a3a 100644 --- a/x/auth/go.sum +++ b/x/auth/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/authz/go.mod b/x/authz/go.mod index cd03167ebf..baa2f35bcb 100644 --- a/x/authz/go.mod +++ b/x/authz/go.mod @@ -177,7 +177,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/authz/go.sum b/x/authz/go.sum index 01cd011642..7c8b7a7a3a 100644 --- a/x/authz/go.sum +++ b/x/authz/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/bank/go.mod b/x/bank/go.mod index 733dbf245d..a57f162b11 100644 --- a/x/bank/go.mod +++ b/x/bank/go.mod @@ -176,7 +176,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/bank/go.sum b/x/bank/go.sum index 01cd011642..7c8b7a7a3a 100644 --- a/x/bank/go.sum +++ b/x/bank/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/circuit/go.mod b/x/circuit/go.mod index 4e61863ec2..b0a5726c8b 100644 --- a/x/circuit/go.mod +++ b/x/circuit/go.mod @@ -177,7 +177,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/circuit/go.sum b/x/circuit/go.sum index 01cd011642..7c8b7a7a3a 100644 --- a/x/circuit/go.sum +++ b/x/circuit/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/consensus/go.mod b/x/consensus/go.mod index 2cb54a2937..9e821496cf 100644 --- a/x/consensus/go.mod +++ b/x/consensus/go.mod @@ -174,7 +174,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/consensus/go.sum b/x/consensus/go.sum index 3cb84a727f..4ff2b04c40 100644 --- a/x/consensus/go.sum +++ b/x/consensus/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/distribution/go.mod b/x/distribution/go.mod index 871c689c40..eb970bee7c 100644 --- a/x/distribution/go.mod +++ b/x/distribution/go.mod @@ -178,7 +178,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/distribution/go.sum b/x/distribution/go.sum index 01cd011642..7c8b7a7a3a 100644 --- a/x/distribution/go.sum +++ b/x/distribution/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/epochs/go.mod b/x/epochs/go.mod index 5c9096eae4..9026a35b61 100644 --- a/x/epochs/go.mod +++ b/x/epochs/go.mod @@ -176,7 +176,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/epochs/go.sum b/x/epochs/go.sum index 3cb84a727f..4ff2b04c40 100644 --- a/x/epochs/go.sum +++ b/x/epochs/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/evidence/go.mod b/x/evidence/go.mod index 5081cb6630..1bdc64c8fe 100644 --- a/x/evidence/go.mod +++ b/x/evidence/go.mod @@ -177,7 +177,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/evidence/go.sum b/x/evidence/go.sum index 01cd011642..7c8b7a7a3a 100644 --- a/x/evidence/go.sum +++ b/x/evidence/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/feegrant/go.mod b/x/feegrant/go.mod index 4824aa7e66..dad78d45bc 100644 --- a/x/feegrant/go.mod +++ b/x/feegrant/go.mod @@ -181,7 +181,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/feegrant/go.sum b/x/feegrant/go.sum index b44797a7a3..f5e9404fc3 100644 --- a/x/feegrant/go.sum +++ b/x/feegrant/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/gov/go.mod b/x/gov/go.mod index 3d9ece18f8..48e3973558 100644 --- a/x/gov/go.mod +++ b/x/gov/go.mod @@ -180,7 +180,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/gov/go.sum b/x/gov/go.sum index 9743c1d0ec..5014b4d4a5 100644 --- a/x/gov/go.sum +++ b/x/gov/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/group/go.mod b/x/group/go.mod index ff2f9037e5..d257956d00 100644 --- a/x/group/go.mod +++ b/x/group/go.mod @@ -188,7 +188,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/group/go.sum b/x/group/go.sum index 9ae678e9a7..c532063e6b 100644 --- a/x/group/go.sum +++ b/x/group/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/mint/go.mod b/x/mint/go.mod index c28c1239db..809b000777 100644 --- a/x/mint/go.mod +++ b/x/mint/go.mod @@ -181,7 +181,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/mint/go.sum b/x/mint/go.sum index 722adfe30c..23db6249d5 100644 --- a/x/mint/go.sum +++ b/x/mint/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/nft/go.mod b/x/nft/go.mod index 816f132b48..de4df01d57 100644 --- a/x/nft/go.mod +++ b/x/nft/go.mod @@ -176,7 +176,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/nft/go.sum b/x/nft/go.sum index 01cd011642..7c8b7a7a3a 100644 --- a/x/nft/go.sum +++ b/x/nft/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/params/go.mod b/x/params/go.mod index 6c6310900d..34bdaedfa1 100644 --- a/x/params/go.mod +++ b/x/params/go.mod @@ -177,7 +177,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/params/go.sum b/x/params/go.sum index 01cd011642..7c8b7a7a3a 100644 --- a/x/params/go.sum +++ b/x/params/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/protocolpool/go.mod b/x/protocolpool/go.mod index b66daaff66..bafc21ec09 100644 --- a/x/protocolpool/go.mod +++ b/x/protocolpool/go.mod @@ -177,7 +177,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/protocolpool/go.sum b/x/protocolpool/go.sum index 01cd011642..7c8b7a7a3a 100644 --- a/x/protocolpool/go.sum +++ b/x/protocolpool/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/slashing/go.mod b/x/slashing/go.mod index 252d369249..fac6ee41a6 100644 --- a/x/slashing/go.mod +++ b/x/slashing/go.mod @@ -178,7 +178,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/slashing/go.sum b/x/slashing/go.sum index 034ed68a9e..8949ce0884 100644 --- a/x/slashing/go.sum +++ b/x/slashing/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/staking/go.mod b/x/staking/go.mod index 84478000d8..baa669c52a 100644 --- a/x/staking/go.mod +++ b/x/staking/go.mod @@ -176,7 +176,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/staking/go.sum b/x/staking/go.sum index 01cd011642..7c8b7a7a3a 100644 --- a/x/staking/go.sum +++ b/x/staking/go.sum @@ -8,8 +8,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/upgrade/depinject.go b/x/upgrade/depinject.go index be1187c3f6..ef056c668a 100644 --- a/x/upgrade/depinject.go +++ b/x/upgrade/depinject.go @@ -6,8 +6,8 @@ import ( modulev1 "cosmossdk.io/api/cosmos/upgrade/module/v1" "cosmossdk.io/core/address" - "cosmossdk.io/core/app" "cosmossdk.io/core/appmodule" + coreserver "cosmossdk.io/core/server" "cosmossdk.io/depinject" "cosmossdk.io/depinject/appconfig" authtypes "cosmossdk.io/x/auth/types" @@ -40,7 +40,7 @@ type ModuleInputs struct { Environment appmodule.Environment Cdc codec.Codec AddressCodec address.Codec - AppVersionModifier app.VersionModifier + AppVersionModifier coreserver.VersionModifier AppOpts servertypes.AppOptions `optional:"true"` // server v0 Viper *viper.Viper `optional:"true"` // server v2 diff --git a/x/upgrade/go.mod b/x/upgrade/go.mod index db875c6349..e39d9528e4 100644 --- a/x/upgrade/go.mod +++ b/x/upgrade/go.mod @@ -208,7 +208,7 @@ replace ( // pseudo version lower than the latest tag cosmossdk.io/api => cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 // main // pseudo version lower than the latest tag - cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c // main + cosmossdk.io/core => cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e // main // pseudo version lower than the latest tag cosmossdk.io/store => cosmossdk.io/store v1.0.0-rc.0.0.20240815194237-858ec2fcb897 // main cosmossdk.io/x/accounts => ../accounts diff --git a/x/upgrade/go.sum b/x/upgrade/go.sum index a63772b6a3..aa25c1052f 100644 --- a/x/upgrade/go.sum +++ b/x/upgrade/go.sum @@ -196,8 +196,8 @@ cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897 h1:YV9M+9pClbzPncO5XMSc3kI cosmossdk.io/api v0.7.3-0.20240815194237-858ec2fcb897/go.mod h1:oqpDMZQpEgSo0Cm4F+0yxoC9UQbo/SlodZR4zeOqBsE= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab h1:E/IWad76v1Nc4Atswaccpt7twJ0VwHkbY94/PhmZfTo= cosmossdk.io/collections v0.4.1-0.20240802064046-23fac2f1b8ab/go.mod h1:Or+5eVAo1aiS1DnPK90eQykGc59LGBWtqwBoJcxXTmw= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c h1:NhVJ8mH5JnOBV/b1mR3NO8PJhUi6VND8S9FI1wO7hIU= -cosmossdk.io/core v0.12.1-0.20240826100755-28c792bcd06c/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e h1:pi4KA2O6SJqq2AZ/DlOEgv7F/WEeHSSkGASPUqzfPtg= +cosmossdk.io/core v0.12.1-0.20240827095516-355f748add9e/go.mod h1:abgLjeFLhtuKIYZWSPlVUgQBrKObO7ULV35KYfexE90= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c h1:JabqeaOY2EJ3+uH5K+bNRWOFO9dOKXBueMyHtGIEg0E= cosmossdk.io/core/testing v0.0.0-20240826100755-28c792bcd06c/go.mod h1:+k84x9hU54Ckuc/JtppTSSQ+niEOU3CWcQghNz5NJWY= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= diff --git a/x/upgrade/keeper/keeper.go b/x/upgrade/keeper/keeper.go index bafd410e94..6ca6a53d26 100644 --- a/x/upgrade/keeper/keeper.go +++ b/x/upgrade/keeper/keeper.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/go-metrics" - "cosmossdk.io/core/app" "cosmossdk.io/core/appmodule" + "cosmossdk.io/core/server" errorsmod "cosmossdk.io/errors" "cosmossdk.io/store/prefix" storetypes "cosmossdk.io/store/types" @@ -34,7 +34,7 @@ type Keeper struct { skipUpgradeHeights map[int64]bool // map of heights to skip for an upgrade cdc codec.BinaryCodec // App-wide binary codec upgradeHandlers map[string]types.UpgradeHandler // map of plan name to upgrade handler - versionModifier app.VersionModifier // implements setting the protocol version field on BaseApp + versionModifier server.VersionModifier // implements setting the protocol version field on BaseApp downgradeVerified bool // tells if we've already sanity checked that this binary version isn't being used against an old state. authority string // the address capable of executing and canceling an upgrade. Usually the gov module account initVersionMap appmodule.VersionMap // the module version map at init genesis @@ -51,7 +51,7 @@ func NewKeeper( skipUpgradeHeights map[int64]bool, cdc codec.BinaryCodec, homePath string, - vs app.VersionModifier, + vs server.VersionModifier, authority string, ) *Keeper { k := &Keeper{