From e98f6905e103ea46f7bc24a6c1bf846ee5be88da Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 22:44:16 +0100 Subject: [PATCH] refactor(server/v2/cometbft): integrate appmanager changes (partial backport #22729) (#22738) Co-authored-by: Julien Robert --- server/v2/cometbft/abci_test.go | 4 ++-- server/v2/cometbft/go.mod | 8 ++++---- server/v2/cometbft/go.sum | 16 ++++++++-------- simapp/v2/go.mod | 10 +++++----- simapp/v2/go.sum | 20 ++++++++++---------- x/genutil/module.go | 1 + 6 files changed, 30 insertions(+), 29 deletions(-) diff --git a/server/v2/cometbft/abci_test.go b/server/v2/cometbft/abci_test.go index c2bd81d65f23..b7bc427d13b4 100644 --- a/server/v2/cometbft/abci_test.go +++ b/server/v2/cometbft/abci_test.go @@ -701,10 +701,10 @@ func setUpConsensus(t *testing.T, gasLimit uint64, mempool mempool.Mempool[mock. }, mockStore, s, - func(ctx context.Context, src io.Reader, txHandler func(json.RawMessage) error) (store.WriterMap, error) { + func(ctx context.Context, src io.Reader, txHandler func(json.RawMessage) error) (store.WriterMap, []appmodulev2.ValidatorUpdate, error) { _, st, err := mockStore.StateLatest() require.NoError(t, err) - return branch.DefaultNewWriterMap(st), nil + return branch.DefaultNewWriterMap(st), nil, nil }, nil, ) diff --git a/server/v2/cometbft/go.mod b/server/v2/cometbft/go.mod index 4c749ad58a31..3b17de4b2ba1 100644 --- a/server/v2/cometbft/go.mod +++ b/server/v2/cometbft/go.mod @@ -20,10 +20,10 @@ require ( cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5 cosmossdk.io/log v1.5.0 cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b //main - cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5 // main - cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5 // main - cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5 // main - cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5 // main + cosmossdk.io/server/v2 v2.0.0-20241203212527-7d117425d880 // main + cosmossdk.io/server/v2/appmanager v0.0.0-20241203212527-7d117425d880 // main + cosmossdk.io/server/v2/stf v0.0.0-20241203212527-7d117425d880 // main + cosmossdk.io/store/v2 v2.0.0-20241203212527-7d117425d880 // main cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000 github.com/cometbft/cometbft v1.0.0-rc2.0.20241127125717-4ce33b646ac9 github.com/cometbft/cometbft/api v1.0.0-rc2 diff --git a/server/v2/cometbft/go.sum b/server/v2/cometbft/go.sum index e7059b6cb4b7..71ee29561de7 100644 --- a/server/v2/cometbft/go.sum +++ b/server/v2/cometbft/go.sum @@ -24,16 +24,16 @@ cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b h1:svpFdulZRrYz+RTHu2u9CeKkMKrIHx5354vjiHerovo= cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= -cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5 h1:TGvCN7MYep68o1X3/mgEt+raIf5x6m9wHC3erLMWfr0= -cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5/go.mod h1:NT1O+DPv2bWxqX8QTtvBbjXpeXFw5doT2hoRRNr8ob4= -cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5 h1:uQk1cl7ZvDud6FkZgbGj4LMQ2jKZe6wfqrjSwuLDABw= -cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5/go.mod h1:elhlrldWtm+9U4PxE0G3wjz83yQwVVGVAOncXJPY1Xc= -cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5 h1:K5stPleqQZGWZuvPJdlMWNgddkUeT55hw1R6ZXnXEqk= -cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5/go.mod h1:4e9SzLyeGptQ3tSR6nKCNwCu7Ye4uUS2WIJih29dG2c= +cosmossdk.io/server/v2 v2.0.0-20241203212527-7d117425d880 h1:B/8gRehsQg7ewpg9wrnzIogYfxKioH52hs8TSp7hkNE= +cosmossdk.io/server/v2 v2.0.0-20241203212527-7d117425d880/go.mod h1:rHeg391S9rUcPlF/1WRpGUaw0AJ0CGUVGlxUVaNhSGk= +cosmossdk.io/server/v2/appmanager v0.0.0-20241203212527-7d117425d880 h1:0mtB8fSvDjD835WwWF4rGk9qy5TjVjk2jsW14L37v0E= +cosmossdk.io/server/v2/appmanager v0.0.0-20241203212527-7d117425d880/go.mod h1:elhlrldWtm+9U4PxE0G3wjz83yQwVVGVAOncXJPY1Xc= +cosmossdk.io/server/v2/stf v0.0.0-20241203212527-7d117425d880 h1:DWpt/apUddpsKmoVOCRLMcVVkZ9r5ENjGuyYuj3LP1w= +cosmossdk.io/server/v2/stf v0.0.0-20241203212527-7d117425d880/go.mod h1:4e9SzLyeGptQ3tSR6nKCNwCu7Ye4uUS2WIJih29dG2c= cosmossdk.io/store v1.0.0-rc.0.0.20241202115147-f350775d0ed2 h1:UCe04NMBR+1M5JRpZJvM+I0EZzD3zXrk9YOm2RZdKDg= cosmossdk.io/store v1.0.0-rc.0.0.20241202115147-f350775d0ed2/go.mod h1:oZBBY4BrkYnghr6MFL0MP5mGqpkPedHcWkXwXddd6tU= -cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5 h1:pITcGoEspRSWxCpCaAkSoMDuikoapkfo7eg1OYFE2M8= -cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5/go.mod h1:1DbksNgjyQ1XxlCYqkU82WqBGWcxmgciO5dBf6dRhKM= +cosmossdk.io/store/v2 v2.0.0-20241203212527-7d117425d880 h1:oQiiB1e2yg6/ttUCKLBAdbLuyUp9UYW2K8QGnCs7dWg= +cosmossdk.io/store/v2 v2.0.0-20241203212527-7d117425d880/go.mod h1:1DbksNgjyQ1XxlCYqkU82WqBGWcxmgciO5dBf6dRhKM= cosmossdk.io/x/tx v1.0.0-alpha.2 h1:UW80FMm7B0fiAMsrfe5+HabSJ3XBg+tQa6/GK9prqWk= cosmossdk.io/x/tx v1.0.0-alpha.2/go.mod h1:r4yTKSJ7ZCCR95YbBfY3nfvbgNw6m9F6f25efWYYQWo= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= diff --git a/simapp/v2/go.mod b/simapp/v2/go.mod index d64009906591..dd0a0bba3ffb 100644 --- a/simapp/v2/go.mod +++ b/simapp/v2/go.mod @@ -10,10 +10,10 @@ require ( cosmossdk.io/depinject v1.1.0 cosmossdk.io/log v1.5.0 cosmossdk.io/math v1.4.0 - cosmossdk.io/runtime/v2 v2.0.0-20241203161819-94cfcc11aaf5 // main - cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5 // main + cosmossdk.io/runtime/v2 v2.0.0-20241203212527-7d117425d880 // main + cosmossdk.io/server/v2 v2.0.0-20241203212527-7d117425d880 // main cosmossdk.io/server/v2/cometbft v0.0.0-00010101000000-000000000000 - cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5 // main + cosmossdk.io/store/v2 v2.0.0-20241203212527-7d117425d880 // main cosmossdk.io/tools/confix v0.0.0-00010101000000-000000000000 cosmossdk.io/x/accounts v0.0.0-20240913065641-0064ccbce64e cosmossdk.io/x/accounts/defaults/base v0.0.0-00010101000000-000000000000 @@ -58,8 +58,8 @@ require ( cosmossdk.io/errors v1.0.1 // indirect cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5 // indirect cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b // indirect - cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5 // indirect; main - cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5 // indirect; main + cosmossdk.io/server/v2/appmanager v0.0.0-20241203212527-7d117425d880 // indirect; main + cosmossdk.io/server/v2/stf v0.0.0-20241203212527-7d117425d880 // indirect; main cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6 // indirect; main cosmossdk.io/x/tx v1.0.0-alpha.2 // indirect; main filippo.io/edwards25519 v1.1.0 // indirect diff --git a/simapp/v2/go.sum b/simapp/v2/go.sum index 30cc00d2f702..d391adf8366d 100644 --- a/simapp/v2/go.sum +++ b/simapp/v2/go.sum @@ -210,20 +210,20 @@ cosmossdk.io/log v1.5.0 h1:dVdzPJW9kMrnAYyMf1duqacoidB9uZIl+7c6z0mnq0g= cosmossdk.io/log v1.5.0/go.mod h1:Tr46PUJjiUthlwQ+hxYtUtPn4D/oCZXAkYevBeh5+FI= cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ= cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk= -cosmossdk.io/runtime/v2 v2.0.0-20241203161819-94cfcc11aaf5 h1:g8rsvk80KaR5SNIr9cs0RnRM+yFgkKV5OjCu0ARHTJo= -cosmossdk.io/runtime/v2 v2.0.0-20241203161819-94cfcc11aaf5/go.mod h1:7DCLOq3Xzyq+DA0WoMD5HcZUuflShDmq6g2qgh2yVdI= +cosmossdk.io/runtime/v2 v2.0.0-20241203212527-7d117425d880 h1:yWHpq5jgg3fWhMj/bUk0KBgZxJlqHvLbNS0VBrmxrVI= +cosmossdk.io/runtime/v2 v2.0.0-20241203212527-7d117425d880/go.mod h1:7DCLOq3Xzyq+DA0WoMD5HcZUuflShDmq6g2qgh2yVdI= cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b h1:svpFdulZRrYz+RTHu2u9CeKkMKrIHx5354vjiHerovo= cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= -cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5 h1:TGvCN7MYep68o1X3/mgEt+raIf5x6m9wHC3erLMWfr0= -cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5/go.mod h1:NT1O+DPv2bWxqX8QTtvBbjXpeXFw5doT2hoRRNr8ob4= -cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5 h1:uQk1cl7ZvDud6FkZgbGj4LMQ2jKZe6wfqrjSwuLDABw= -cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5/go.mod h1:elhlrldWtm+9U4PxE0G3wjz83yQwVVGVAOncXJPY1Xc= -cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5 h1:K5stPleqQZGWZuvPJdlMWNgddkUeT55hw1R6ZXnXEqk= -cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5/go.mod h1:4e9SzLyeGptQ3tSR6nKCNwCu7Ye4uUS2WIJih29dG2c= +cosmossdk.io/server/v2 v2.0.0-20241203212527-7d117425d880 h1:B/8gRehsQg7ewpg9wrnzIogYfxKioH52hs8TSp7hkNE= +cosmossdk.io/server/v2 v2.0.0-20241203212527-7d117425d880/go.mod h1:rHeg391S9rUcPlF/1WRpGUaw0AJ0CGUVGlxUVaNhSGk= +cosmossdk.io/server/v2/appmanager v0.0.0-20241203212527-7d117425d880 h1:0mtB8fSvDjD835WwWF4rGk9qy5TjVjk2jsW14L37v0E= +cosmossdk.io/server/v2/appmanager v0.0.0-20241203212527-7d117425d880/go.mod h1:elhlrldWtm+9U4PxE0G3wjz83yQwVVGVAOncXJPY1Xc= +cosmossdk.io/server/v2/stf v0.0.0-20241203212527-7d117425d880 h1:DWpt/apUddpsKmoVOCRLMcVVkZ9r5ENjGuyYuj3LP1w= +cosmossdk.io/server/v2/stf v0.0.0-20241203212527-7d117425d880/go.mod h1:4e9SzLyeGptQ3tSR6nKCNwCu7Ye4uUS2WIJih29dG2c= cosmossdk.io/store v1.0.0-rc.0.0.20241119134933-d697a3de0f95 h1:5hIgRL6VsicdJ7FVK6AG7cSy1C8tiVbCp6W3Y+QQ5ko= cosmossdk.io/store v1.0.0-rc.0.0.20241119134933-d697a3de0f95/go.mod h1:ceNwMZIU8ZIDoeUdA9+sGxz3GVt0orEGoVpkBfa/UtU= -cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5 h1:pITcGoEspRSWxCpCaAkSoMDuikoapkfo7eg1OYFE2M8= -cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5/go.mod h1:1DbksNgjyQ1XxlCYqkU82WqBGWcxmgciO5dBf6dRhKM= +cosmossdk.io/store/v2 v2.0.0-20241203212527-7d117425d880 h1:oQiiB1e2yg6/ttUCKLBAdbLuyUp9UYW2K8QGnCs7dWg= +cosmossdk.io/store/v2 v2.0.0-20241203212527-7d117425d880/go.mod h1:1DbksNgjyQ1XxlCYqkU82WqBGWcxmgciO5dBf6dRhKM= cosmossdk.io/x/tx v1.0.0-alpha.2 h1:UW80FMm7B0fiAMsrfe5+HabSJ3XBg+tQa6/GK9prqWk= cosmossdk.io/x/tx v1.0.0-alpha.2/go.mod h1:r4yTKSJ7ZCCR95YbBfY3nfvbgNw6m9F6f25efWYYQWo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= diff --git a/x/genutil/module.go b/x/genutil/module.go index ba33eab26b1f..18ebc6a06c6c 100644 --- a/x/genutil/module.go +++ b/x/genutil/module.go @@ -19,6 +19,7 @@ var ( _ appmodule.AppModule = AppModule{} _ appmodulev2.GenesisDecoder = AppModule{} + _ appmodulev2.HasABCIGenesis = AppModule{} ) // AppModule implements an application module for the genutil module.