From c2842c6840c0c323620d3c5dcfa75cd254c2d57b Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 20 Dec 2024 09:21:38 +0100 Subject: [PATCH] chore: prepare v2 beta (2/3) --- runtime/v2/go.mod | 18 +++++++++--------- runtime/v2/go.sum | 6 ++++++ server/v2/cometbft/go.mod | 4 ++-- server/v2/go.mod | 15 +++++++-------- server/v2/go.sum | 4 ++++ simapp/v2/go.mod | 19 ++++++++----------- tests/go.mod | 6 +++--- 7 files changed, 39 insertions(+), 33 deletions(-) diff --git a/runtime/v2/go.mod b/runtime/v2/go.mod index 30ccd55d863..864280a7c5c 100644 --- a/runtime/v2/go.mod +++ b/runtime/v2/go.mod @@ -2,12 +2,12 @@ module cosmossdk.io/runtime/v2 go 1.23 -// server v2 integration -replace ( - cosmossdk.io/server/v2/appmanager => ../../server/v2/appmanager - cosmossdk.io/server/v2/stf => ../../server/v2/stf - cosmossdk.io/store/v2 => ../../store/v2 -) +// server v2 integration (uncomment during development, but comment before release) +// replace ( +// cosmossdk.io/server/v2/appmanager => ../../server/v2/appmanager +// cosmossdk.io/server/v2/stf => ../../server/v2/stf +// cosmossdk.io/store/v2 => ../../store/v2 +// ) require ( cosmossdk.io/api v0.8.0-rc.1 @@ -15,9 +15,9 @@ require ( cosmossdk.io/depinject v1.1.0 cosmossdk.io/log v1.5.0 cosmossdk.io/schema v1.0.0 - cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000 - cosmossdk.io/server/v2/stf v0.0.0-00010101000000-000000000000 - cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000 + cosmossdk.io/server/v2/appmanager v1.0.0-beta.1 + cosmossdk.io/server/v2/stf v1.0.0-beta.1 + cosmossdk.io/store/v2 v2.0.0-beta.1 cosmossdk.io/x/tx v1.0.0-alpha.3 github.com/cosmos/gogoproto v1.7.0 github.com/stretchr/testify v1.10.0 diff --git a/runtime/v2/go.sum b/runtime/v2/go.sum index 09abd49cc75..95972eec166 100644 --- a/runtime/v2/go.sum +++ b/runtime/v2/go.sum @@ -16,6 +16,12 @@ cosmossdk.io/log v1.5.0 h1:dVdzPJW9kMrnAYyMf1duqacoidB9uZIl+7c6z0mnq0g= cosmossdk.io/log v1.5.0/go.mod h1:Tr46PUJjiUthlwQ+hxYtUtPn4D/oCZXAkYevBeh5+FI= cosmossdk.io/schema v1.0.0 h1:/diH4XJjpV1JQwuIozwr+A4uFuuwanFdnw2kKeiXwwQ= cosmossdk.io/schema v1.0.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= +cosmossdk.io/server/v2/appmanager v1.0.0-beta.1 h1:EISWki+z9SDAt3OJnUl2y5Ow4qjOb+epYjLb1C7CN/E= +cosmossdk.io/server/v2/appmanager v1.0.0-beta.1/go.mod h1:RVYxIaEdIT10nWSRqbwKDLFWfvCVx+cwAorCyPAQg9A= +cosmossdk.io/server/v2/stf v1.0.0-beta.1 h1:s+nRgjhKVC08/qpr51eFVodLhyyQ9ASvJBanLBfQVNI= +cosmossdk.io/server/v2/stf v1.0.0-beta.1/go.mod h1:nfjihbofEF2GGadkYSFmgy5tqrAnSrmGcXUDZmmWyi8= +cosmossdk.io/store/v2 v2.0.0-beta.1 h1:p1fdZ9uNijhpXZXdqs0QS6NmXNDVPNyT4DHV4yQnF64= +cosmossdk.io/store/v2 v2.0.0-beta.1/go.mod h1:qHQmf/9mnsXwo/Ypp2u2Zs6BmkYcx1R/Jrpyn9Ro13A= cosmossdk.io/x/tx v1.0.0-alpha.3 h1:+55/JFH5QRqnFhOI2heH3DKsaNL0RpXcJOQNzUvHiaQ= cosmossdk.io/x/tx v1.0.0-alpha.3/go.mod h1:h4pQ/j6Gfu8goB1R3Jbl4qY4RjYVNAsoylcleTXdSRg= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= diff --git a/server/v2/cometbft/go.mod b/server/v2/cometbft/go.mod index 2cb6b2b1565..915f42c6acc 100644 --- a/server/v2/cometbft/go.mod +++ b/server/v2/cometbft/go.mod @@ -22,9 +22,9 @@ require ( cosmossdk.io/log v1.5.0 cosmossdk.io/schema v1.0.0 cosmossdk.io/server/v2 v2.0.0-00010101000000-000000000000 - cosmossdk.io/server/v2/appmanager v0.0.0-20240802110823-cffeedff643d + cosmossdk.io/server/v2/appmanager v1.0.0-beta.1 cosmossdk.io/server/v2/stf v0.0.0-20240708142107-25e99c54bac1 - cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000 + cosmossdk.io/store/v2 v2.0.0-beta.1 cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000 github.com/cometbft/cometbft v1.0.0 github.com/cometbft/cometbft/api v1.0.0 diff --git a/server/v2/go.mod b/server/v2/go.mod index 5d66e2e20e1..6816b30ee2c 100644 --- a/server/v2/go.mod +++ b/server/v2/go.mod @@ -2,20 +2,19 @@ module cosmossdk.io/server/v2 go 1.23 -replace ( - cosmossdk.io/server/v2/appmanager => ./appmanager - cosmossdk.io/server/v2/stf => ./stf - cosmossdk.io/store/v2 => ../../store/v2 - cosmossdk.io/store/v2/db => ../../store/v2/db -) +// server v2 integration (uncomment during development, but comment before release) +// replace ( +// cosmossdk.io/server/v2/appmanager => ./appmanager +// cosmossdk.io/store/v2 => ../../store/v2 +// ) require ( cosmossdk.io/api v0.8.0-rc.1 cosmossdk.io/core v1.0.0-alpha.6 cosmossdk.io/core/testing v0.0.1 cosmossdk.io/log v1.5.0 - cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000 - cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000 + cosmossdk.io/server/v2/appmanager v1.0.0-beta.1 + cosmossdk.io/store/v2 v2.0.0-beta.1 github.com/cosmos/cosmos-proto v1.0.0-beta.5 github.com/cosmos/gogogateway v1.2.0 github.com/cosmos/gogoproto v1.7.0 diff --git a/server/v2/go.sum b/server/v2/go.sum index 171655ba2a8..85bda6f5dd8 100644 --- a/server/v2/go.sum +++ b/server/v2/go.sum @@ -12,6 +12,10 @@ cosmossdk.io/log v1.5.0 h1:dVdzPJW9kMrnAYyMf1duqacoidB9uZIl+7c6z0mnq0g= cosmossdk.io/log v1.5.0/go.mod h1:Tr46PUJjiUthlwQ+hxYtUtPn4D/oCZXAkYevBeh5+FI= cosmossdk.io/schema v1.0.0 h1:/diH4XJjpV1JQwuIozwr+A4uFuuwanFdnw2kKeiXwwQ= cosmossdk.io/schema v1.0.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ= +cosmossdk.io/server/v2/appmanager v1.0.0-beta.1 h1:EISWki+z9SDAt3OJnUl2y5Ow4qjOb+epYjLb1C7CN/E= +cosmossdk.io/server/v2/appmanager v1.0.0-beta.1/go.mod h1:RVYxIaEdIT10nWSRqbwKDLFWfvCVx+cwAorCyPAQg9A= +cosmossdk.io/store/v2 v2.0.0-beta.1 h1:p1fdZ9uNijhpXZXdqs0QS6NmXNDVPNyT4DHV4yQnF64= +cosmossdk.io/store/v2 v2.0.0-beta.1/go.mod h1:qHQmf/9mnsXwo/Ypp2u2Zs6BmkYcx1R/Jrpyn9Ro13A= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v4.8.3+incompatible h1:fNGaYSuObuQb5nzeTQqowRAd9bpDIRRV4/gUtIBjh8Q= diff --git a/simapp/v2/go.mod b/simapp/v2/go.mod index 8e62fd71d47..5c247ae9502 100644 --- a/simapp/v2/go.mod +++ b/simapp/v2/go.mod @@ -7,14 +7,19 @@ require ( cosmossdk.io/client/v2 v2.0.0-beta.6 cosmossdk.io/core v1.0.0-alpha.6 cosmossdk.io/depinject v1.1.0 + cosmossdk.io/indexer/postgres v0.1.0 cosmossdk.io/log v1.5.0 cosmossdk.io/math v1.4.0 cosmossdk.io/runtime/v2 v2.0.0-00010101000000-000000000000 cosmossdk.io/server/v2 v2.0.0-20240718121635-a877e3e8048a cosmossdk.io/server/v2/cometbft v0.0.0-20241015140036-ee3d320eaa55 cosmossdk.io/store/v2 v2.0.0 + cosmossdk.io/tools/benchmark v0.0.0-00010101000000-000000000000 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 + cosmossdk.io/x/accounts/defaults/lockup v0.0.0-00010101000000-000000000000 + cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000 cosmossdk.io/x/authz v0.0.0-00010101000000-000000000000 cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 cosmossdk.io/x/circuit v0.0.0-20230613133644-0a778132a60f @@ -34,6 +39,7 @@ require ( github.com/cometbft/cometbft v1.0.0 // this version is not used as it is always replaced by the latest Cosmos SDK version github.com/cosmos/cosmos-sdk v0.53.0 + github.com/jackc/pgx/v5 v5.7.1 github.com/spf13/cast v1.7.1 // indirect github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 @@ -42,15 +48,6 @@ require ( google.golang.org/protobuf v1.36.0 ) -require ( - cosmossdk.io/indexer/postgres v0.1.0 - cosmossdk.io/tools/benchmark v0.0.0-00010101000000-000000000000 - cosmossdk.io/x/accounts/defaults/base v0.0.0-00010101000000-000000000000 - cosmossdk.io/x/accounts/defaults/lockup v0.0.0-00010101000000-000000000000 - cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000 - github.com/jackc/pgx/v5 v5.7.1 -) - require ( buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.0-20241120201313-68e42a58b301.1 // indirect buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.0-20240130113600-88ef6483f90f.1 // indirect @@ -65,8 +62,8 @@ require ( cosmossdk.io/errors v1.0.1 // indirect cosmossdk.io/errors/v2 v2.0.0 // indirect cosmossdk.io/schema v1.0.0 // indirect - cosmossdk.io/server/v2/appmanager v0.0.0-20240802110823-cffeedff643d // indirect - cosmossdk.io/server/v2/stf v0.0.0-20240708142107-25e99c54bac1 // indirect + cosmossdk.io/server/v2/appmanager v1.0.0-beta.1 // indirect + cosmossdk.io/server/v2/stf v1.0.0-beta.1 // indirect cosmossdk.io/store v1.10.0-rc.1 // indirect cosmossdk.io/x/tx v1.0.0-alpha.3 // indirect filippo.io/edwards25519 v1.1.0 // indirect diff --git a/tests/go.mod b/tests/go.mod index 948f6bf3503..12bbc8a43f3 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -32,8 +32,8 @@ require ( require ( cosmossdk.io/core/testing v0.0.1 cosmossdk.io/runtime/v2 v2.0.0-20240911143651-72620a577660 - cosmossdk.io/server/v2/stf v0.0.0-00010101000000-000000000000 - cosmossdk.io/store/v2 v2.0.0-00010101000000-000000000000 + cosmossdk.io/server/v2/stf v1.0.0-beta.1 + cosmossdk.io/store/v2 v2.0.0-beta.1 cosmossdk.io/x/accounts v0.0.0-20240913065641-0064ccbce64e cosmossdk.io/x/accounts/defaults/base v0.0.0-00010101000000-000000000000 cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5 @@ -70,7 +70,7 @@ require ( cosmossdk.io/errors v1.0.1 // indirect cosmossdk.io/errors/v2 v2.0.0 // indirect cosmossdk.io/schema v1.0.0 // indirect - cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000 // indirect + cosmossdk.io/server/v2/appmanager v1.0.0-beta.1 // indirect cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337 // indirect filippo.io/edwards25519 v1.1.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect