Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(store/v2): full iavl/v2 support [WIP] #22838

Closed
wants to merge 37 commits into from
Closed

feat(store/v2): full iavl/v2 support [WIP] #22838

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f4834de
initial x/benchmark
kocubinski Dec 4, 2024
e4331b5
build works
kocubinski Dec 5, 2024
9a846dc
fix import
kocubinski Dec 5, 2024
e605381
add provider
kocubinski Dec 5, 2024
747802c
do not test migrations for x/benchmark
kocubinski Dec 5, 2024
07d3c37
Merge branch 'main' of github.com:cosmos/cosmos-sdk into kocu/x-bench…
kocubinski Dec 5, 2024
c481721
cleaner filter
kocubinski Dec 5, 2024
4b0dbdc
Add README and CHANGELOG
kocubinski Dec 5, 2024
ca47403
mv x/benchmark -> tools/
kocubinski Dec 5, 2024
554408d
fix proto gen
kocubinski Dec 5, 2024
f9c3575
go mod tidy all
kocubinski Dec 5, 2024
611e9d1
add CI entries
kocubinski Dec 5, 2024
ba608a3
fix(confix): correctly distinguish server/v2 config
kocubinski Dec 5, 2024
777966e
Merge branch 'kocu/server-v2-config' into kocu/x-benchmark-v2
kocubinski Dec 5, 2024
ac0080a
latest iavl/v2 work with test suite passing
kocubinski Dec 5, 2024
746abef
commit store with concurrent commit
kocubinski Dec 5, 2024
e157e37
iavl v2 integration tests passing
kocubinski Dec 8, 2024
c18378d
Merge branch 'main' of github.com:cosmos/cosmos-sdk into kocu/x-bench…
kocubinski Dec 8, 2024
f2e9c0d
improve rate logging
kocubinski Dec 8, 2024
ec91784
improve rate logging
kocubinski Dec 8, 2024
4b43c99
rm mutex and iavlv import/export
kocubinski Dec 10, 2024
5d0e511
Merge branch 'main' of github.com:cosmos/cosmos-sdk into kocu/x-bench…
kocubinski Dec 10, 2024
0693d8c
go mod tidy all
kocubinski Dec 10, 2024
91d4291
add comments, some review fixes
kocubinski Dec 11, 2024
1d25773
fix init genesis order
kocubinski Dec 11, 2024
616b952
Merge branch 'main' of github.com:cosmos/cosmos-sdk into kocu/x-bench…
kocubinski Dec 11, 2024
7a086b1
Merge branch 'main' of github.com:cosmos/cosmos-sdk into kocu/x-bench…
kocubinski Dec 11, 2024
256ca93
a store/v1 replace directive is required
kocubinski Dec 11, 2024
0e38799
Merge branch 'main' of github.com:cosmos/cosmos-sdk into kocu/bench-i…
kocubinski Dec 11, 2024
944ac1f
go mod tidy
kocubinski Dec 11, 2024
a3d4808
Merge branch 'kocu/x-benchmark-v2' into kocu/bench-iavlv2
kocubinski Dec 11, 2024
372373a
Merge branch 'main' of github.com:cosmos/cosmos-sdk into kocu/bench-i…
kocubinski Dec 12, 2024
8626463
tx async
kocubinski Dec 12, 2024
d469c30
integrate with config
kocubinski Dec 30, 2024
15a7c38
almost done
kocubinski Dec 30, 2024
d1b1193
Merge branch 'main' of github.com:cosmos/cosmos-sdk into kocu/bench-i…
kocubinski Dec 30, 2024
31c9a6d
iavl/v2 alpha candidate
kocubinski Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
iavl/v2 alpha candidate
  • Loading branch information
@kocubinski
kocubinski committed Dec 30, 2024
commit 31c9a6d392344d1a978f8012b9781d4a3ac5fdca
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ require (
cosmossdk.io/math v1.4.0
cosmossdk.io/schema v1.0.0
cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43
cosmossdk.io/tools/benchmark v0.2.0-rc.1
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000
cosmossdk.io/x/tx v1.0.0-alpha.3
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ cosmossdk.io/schema v1.0.0 h1:/diH4XJjpV1JQwuIozwr+A4uFuuwanFdnw2kKeiXwwQ=
cosmossdk.io/schema v1.0.0/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43 h1:glZ6MpmD+5AhwJYV4jzx+rn7cgUB2owHgk9o+93luz0=
cosmossdk.io/store v1.10.0-rc.1.0.20241218084712-ca559989da43/go.mod h1:XCWpgfueHSBY+B7Cf2Aq/CcsU+6XoFH+EmseCKglFrU=
cosmossdk.io/tools/benchmark v0.2.0-rc.1 h1:Jgk0FLvnMQJrivrSMhKQBwaTiJz6MGq5ZbaHag7Sqq0=
cosmossdk.io/tools/benchmark v0.2.0-rc.1/go.mod h1:tnGa8L7xHFMp26FbLvU5MRlS89BFrCxSOKR8jCi7kVU=
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=
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MOCKS_DIR = $(CURDIR)/tests/mocks
HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git
DOCKER := $(shell which docker)
PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
COSMOS_BUILD_OPTIONS := v2
COSMOS_BUILD_OPTIONS += ' v2'

rocksdb_version=v9.6.1

Expand Down
2 changes: 1 addition & 1 deletion server/v2/cometbft/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ require (
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/iavl v1.3.4 // indirect
github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690 // indirect
github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186 // indirect
github.com/cosmos/ics23/go v0.11.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.14.0 // indirect
github.com/danieljoos/wincred v1.2.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions server/v2/cometbft/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ github.com/cosmos/iavl v1.3.4 h1:A0RUAms7TZ0L6EFrrBIPg4Dy7qD9vvD5lJKUxEXURLM=
github.com/cosmos/iavl v1.3.4/go.mod h1:T6SfBcyhulVIY2G/ZtAtQm/QiJvsuhIos52V4dWYk88=
github.com/cosmos/iavl-bench/bench v0.0.4 h1:J6zQPiBqF4CXMM3QBsLqZgQEBGY0taX85vLIZMhmAfQ=
github.com/cosmos/iavl-bench/bench v0.0.4/go.mod h1:j2rLae77EffacWcp7mmj3Uaa4AOAmZA7ymvhsuBQKKI=
github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690 h1:9J9VLOdacwrJkuyEt1fOxIOQ+0jrgKf0L2SlwkHNYQ8=
github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690/go.mod h1:7RSm0aeApe3S1x4TrLffvUL6pjOtMYV4glYnpAhr2lw=
github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186 h1:9lOhgjRYdAEAkHZW6smbp8vDtvpikQrrNVhHZoZNMGk=
github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186/go.mod h1:7RSm0aeApe3S1x4TrLffvUL6pjOtMYV4glYnpAhr2lw=
github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=
github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0=
github.com/cosmos/ledger-cosmos-go v0.14.0 h1:WfCHricT3rPbkPSVKRH+L4fQGKYHuGOK9Edpel8TYpE=
Expand Down
39 changes: 0 additions & 39 deletions simapp/benchmark.go
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion simapp/v2/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
_ "embed"
"fmt"

iavlv2 "github.com/cosmos/iavl/v2"
_ "github.com/jackc/pgx/v5/stdlib" // Import and register pgx driver

"cosmossdk.io/core/registry"
Expand All @@ -17,6 +18,7 @@ import (
serverstore "cosmossdk.io/server/v2/store"
"cosmossdk.io/store/v2"
"cosmossdk.io/store/v2/root"
_ "cosmossdk.io/tools/benchmark"
basedepinject "cosmossdk.io/x/accounts/defaults/base/depinject"
lockupdepinject "cosmossdk.io/x/accounts/defaults/lockup/depinject"
multisigdepinject "cosmossdk.io/x/accounts/defaults/multisig/depinject"
Expand All @@ -28,7 +30,6 @@ import (
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/std"
_ "github.com/cosmos/cosmos-sdk/x/genutil"
iavlv2 "github.com/cosmos/iavl/v2"
)

// SimApp extends an ABCI application, but with most of its parameters exported.
Expand Down
1 change: 0 additions & 1 deletion simapp/v2/benchmark.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
benchmarkmodulev1 "cosmossdk.io/api/cosmos/benchmark/module/v1"
"cosmossdk.io/depinject/appconfig"
benchmark "cosmossdk.io/tools/benchmark/module"
"fmt"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion simapp/v2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ require (
google.golang.org/protobuf v1.36.0
)

require github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690
require github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186

require (
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.0-20241120201313-68e42a58b301.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions simapp/v2/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ github.com/cosmos/iavl v1.3.4 h1:A0RUAms7TZ0L6EFrrBIPg4Dy7qD9vvD5lJKUxEXURLM=
github.com/cosmos/iavl v1.3.4/go.mod h1:T6SfBcyhulVIY2G/ZtAtQm/QiJvsuhIos52V4dWYk88=
github.com/cosmos/iavl-bench/bench v0.0.4 h1:J6zQPiBqF4CXMM3QBsLqZgQEBGY0taX85vLIZMhmAfQ=
github.com/cosmos/iavl-bench/bench v0.0.4/go.mod h1:j2rLae77EffacWcp7mmj3Uaa4AOAmZA7ymvhsuBQKKI=
github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690 h1:9J9VLOdacwrJkuyEt1fOxIOQ+0jrgKf0L2SlwkHNYQ8=
github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690/go.mod h1:7RSm0aeApe3S1x4TrLffvUL6pjOtMYV4glYnpAhr2lw=
github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186 h1:9lOhgjRYdAEAkHZW6smbp8vDtvpikQrrNVhHZoZNMGk=
github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186/go.mod h1:7RSm0aeApe3S1x4TrLffvUL6pjOtMYV4glYnpAhr2lw=
github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=
github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0=
github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo=
Expand Down
2 changes: 1 addition & 1 deletion store/v2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/gogoproto v1.7.0
github.com/cosmos/iavl v1.3.4
github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690
github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186
github.com/cosmos/ics23/go v0.11.0
github.com/google/btree v1.1.3
github.com/hashicorp/go-metrics v0.5.3
Expand Down
4 changes: 2 additions & 2 deletions store/v2/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ github.com/cosmos/iavl v1.3.4 h1:A0RUAms7TZ0L6EFrrBIPg4Dy7qD9vvD5lJKUxEXURLM=
github.com/cosmos/iavl v1.3.4/go.mod h1:T6SfBcyhulVIY2G/ZtAtQm/QiJvsuhIos52V4dWYk88=
github.com/cosmos/iavl-bench/bench v0.0.4 h1:J6zQPiBqF4CXMM3QBsLqZgQEBGY0taX85vLIZMhmAfQ=
github.com/cosmos/iavl-bench/bench v0.0.4/go.mod h1:j2rLae77EffacWcp7mmj3Uaa4AOAmZA7ymvhsuBQKKI=
github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690 h1:9J9VLOdacwrJkuyEt1fOxIOQ+0jrgKf0L2SlwkHNYQ8=
github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690/go.mod h1:7RSm0aeApe3S1x4TrLffvUL6pjOtMYV4glYnpAhr2lw=
github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186 h1:9lOhgjRYdAEAkHZW6smbp8vDtvpikQrrNVhHZoZNMGk=
github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186/go.mod h1:7RSm0aeApe3S1x4TrLffvUL6pjOtMYV4glYnpAhr2lw=
github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=
github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ require (
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/iavl v1.3.4 // indirect
github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690 // indirect
github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186 // indirect
github.com/cosmos/ics23/go v0.11.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.14.0 // indirect
github.com/danieljoos/wincred v1.2.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,8 @@ github.com/cosmos/iavl v1.3.4 h1:A0RUAms7TZ0L6EFrrBIPg4Dy7qD9vvD5lJKUxEXURLM=
github.com/cosmos/iavl v1.3.4/go.mod h1:T6SfBcyhulVIY2G/ZtAtQm/QiJvsuhIos52V4dWYk88=
github.com/cosmos/iavl-bench/bench v0.0.4 h1:J6zQPiBqF4CXMM3QBsLqZgQEBGY0taX85vLIZMhmAfQ=
github.com/cosmos/iavl-bench/bench v0.0.4/go.mod h1:j2rLae77EffacWcp7mmj3Uaa4AOAmZA7ymvhsuBQKKI=
github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690 h1:9J9VLOdacwrJkuyEt1fOxIOQ+0jrgKf0L2SlwkHNYQ8=
github.com/cosmos/iavl/v2 v2.0.0-20241230201056-64573f084690/go.mod h1:7RSm0aeApe3S1x4TrLffvUL6pjOtMYV4glYnpAhr2lw=
github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186 h1:9lOhgjRYdAEAkHZW6smbp8vDtvpikQrrNVhHZoZNMGk=
github.com/cosmos/iavl/v2 v2.0.0-20241230202043-079dc2f54186/go.mod h1:7RSm0aeApe3S1x4TrLffvUL6pjOtMYV4glYnpAhr2lw=
github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=
github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0=
github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo=
Expand Down
1 change: 0 additions & 1 deletion tools/benchmark/client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
clienttx "github.com/cosmos/cosmos-sdk/client/tx"
"github.com/spf13/cobra"
)

func NewTxCmd(params *modulev1.GeneratorParams) *cobra.Command {
Expand Down
2 changes: 0 additions & 2 deletions tools/benchmark/module/depinject.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package module
import (
"unsafe"

"cosmossdk.io/depinject"

modulev1 "cosmossdk.io/api/cosmos/benchmark/module/v1"
"cosmossdk.io/core/appmodule"
"cosmossdk.io/core/store"
Expand Down
Loading